Alessio Morale
a76c41a1ef
Merge remote-tracking branch 'origin/dwillis/OP-1832' into next
2015-04-29 19:36:17 +02:00
abeck70
d6de7803e1
OP-1858 autotakeoff pathplanner fixes
2015-04-29 20:27:30 +10:00
Alessio Morale
099a48d411
Fix WhatsNew for release
2015-04-28 23:56:56 +02:00
Alessio Morale
3be43d9c9e
Merge remote-tracking branch 'origin/samguns/OP-1821_Tricopter_wrong_servo_speed' into rel-15.02.02
2015-04-28 23:47:12 +02:00
Kevin Finisterre
6ee9eda7fb
Fix the error "Err Field '0' (actuatorcommand.Channel.0) is signed (FT_INT16) but is being displayed unsigned (BASE_DEC_HEX)"
...
Stop attempting to display in hex
2015-04-28 15:31:27 -04:00
Kevin Finisterre
d591ec7117
dissector_add() was depreciated and replaced with dissector_add_uint()
2015-04-28 14:49:30 -04:00
Kevin Finisterre
25a91bc5fc
Fix some minor issues with the old Wireshark Plugin. It won't compile past Wireshark 1.8 which is way outdated.
...
added void *data _U_ to the dissecor definition per - https://ask.wireshark.org/questions/22590/dissector-handle
2015-04-28 14:21:37 -04:00
abeck70
09e2c6f00e
OP-1863 RateTrainer
...
Initial commit for code review
2015-04-28 21:54:58 +10:00
abeck70
b14a966088
OP-1858 autotakeoff and pathplanner
...
1. Allow arming in pathplanner
2. Typo in comment
2015-04-28 20:54:44 +10:00
Kevin Finisterre
7f2aeb371b
Cosmetic changes to get the X-Plane 10 plugin to compile
2015-04-27 16:10:33 -04:00
Kevin Finisterre
996d8a8f48
Change the plugin names to match inclusion of both X-Plane 9 & 10
2015-04-27 15:47:48 -04:00
Kevin Finisterre
0f9218d3af
X-Plane 10 HITL & SITL protocol changes that should have been in place long ago!
2015-04-27 15:45:45 -04:00
abeck70
ba59c9085e
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-04-27 23:02:50 +10:00
abeck70
210b15db4d
OP-1858 autotakeoff in pathplanner
...
1. Allowing arming in pathplanner
2. Takeoff activation requires throttle to be above 30%
3. Takeoff occurs at the current/actual position and rises vertical to the settings altititude.
4. The details of the takeoff waypoint are effectively ignored - this is a simplicifcation to avoid having to have pathplanner inject a flyvector command from the current location to the waypoint
5. We hard code the condition check for autotakeoff as only one mode is supported.
2015-04-27 23:01:47 +10:00
samguns
11a8268949
Merge branch 'samguns/zh_CN_GCS' of ssh://git.openpilot.org/OpenPilot into samguns/zh_CN_GCS
2015-04-27 13:18:05 +08:00
samguns
c71d51b093
OP-1751 Modify some improper CN translations
2015-04-27 13:16:17 +08:00
samguns
09a00f8990
Merge branch 'rel-15.02.02' into samguns/zh_CN_GCS
2015-04-27 11:56:25 +08:00
samguns
69b404daa1
OP-1821 Commit bug fix
2015-04-27 08:45:35 +08:00
m_thread
1f7a8d7ef1
OP-1837 Fixed a wrongly named config.
2015-04-27 01:05:47 +02:00
Richard von Lehe
d22b96d24b
OP-1740: Force latest Pathfollower changes to use uavobj enums.
2015-04-26 17:46:49 -05:00
Richard von Lehe
f3611591e0
Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
...
Conflicts:
flight/modules/PathFollower/inc/vtollandcontroller.h
flight/modules/PathFollower/vtollandcontroller.cpp
flight/modules/PathFollower/vtollandfsm.cpp
2015-04-26 17:45:36 -05:00
Steve Evans
55f2b2fabb
OP-1849 Fix GCS HW Settings tab to only display receiver port com-bridge if available
2015-04-26 22:19:51 +01:00
Steve Evans
5c5c8b5947
OP-1849 Uncrustify
2015-04-26 21:45:43 +01:00
m_thread
8d4fe80388
OP-1837 Uncrustify
2015-04-26 21:08:54 +02:00
Laurent Lalanne
6e6e2b1b9b
OP-1337 Translations : input wizard update
2015-04-26 18:25:56 +02:00
Steve Evans
e89356deb2
OP-1849 Invert DTR and initialise
2015-04-26 14:18:40 +01:00
m_thread
b0b1a42aec
OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols.
...
Protocol version is autodetected and 12 or 16 channels are supported.
SRXL is available on Flexiport of Revolution board.
2015-04-26 15:04:52 +02:00
m_thread
f11285ea16
Added new helper macros to performance counters.
2015-04-26 14:33:25 +02:00
Steve Evans
25b0b3df0f
OP-1849 For Revo put DTR on pin 9 of FlexIO port
2015-04-26 11:26:04 +01:00
Steve Evans
7445add280
OP-1849 Hooks all in place for CDC line state changes to drive port GPIO for DTR
2015-04-26 03:05:47 +01:00
David Ankers
00cbf7e2ea
Add Revo hardware files
2015-04-26 05:47:40 +10:00
Alessio Morale
6d9bb8a287
OP-1857 - Enable PPM On Flexi Port
2015-04-25 20:21:56 +02:00
Philippe Renon
38682f38f4
Merge remote-tracking branch 'origin/filnet/OP-1818_update_OP_toolchain_for_compiling_osgearth' into next
...
Conflicts:
make/tools.mk
2015-04-25 17:24:31 +02:00
Philippe Renon
5b660a1fe0
Merge remote-tracking branch 'origin/filnet/OP-1796_upgrade_gcs_to_qt_5_4_1' into next
...
Conflicts:
make/tools.mk
2015-04-25 17:21:33 +02:00
Steve Evans
0aede91547
Merge branch 'next' into steve/OP-1849_update_minimosd_via_usb
2015-04-24 22:49:02 +01:00
Steve Evans
7f93340f7f
OP-1849 Initial commit
2015-04-24 22:46:07 +01:00
abeck70
45ceada471
OP-1848 altvario ui fixes
2015-04-24 23:34:03 +10:00
David Ankers
52759ff91c
Merge remote-tracking branch 'origin/Spedix_Derivative_CC3D' into next
2015-04-24 23:14:59 +10:00
abeck70
b9a77d7e85
OP-1848 altvario ui scaling
2015-04-24 22:42:54 +10:00
m_thread
95574494af
OP-1848 Updated Ki ranges and scale.
2015-04-24 14:06:47 +02:00
abeck70
57ba5280ef
OP-1848 altvario
...
UI scaling fixes and help text edits.
2015-04-24 17:29:19 +10:00
Kevin Finisterre
9390f955e0
Derivative 'CC3D V2' from Spedix-RC Altium files and README.txt including *nuances* added
2015-04-23 11:04:34 -07:00
abeck70
e36ab50040
OP-1838 altvario
...
Fixes and tidyup.
TODO:
1. Fix UI for sliders
2. Disable vtol tuning on stabi input
3. Altitude loss feedback
2015-04-23 22:49:12 +10:00
abeck70
443b3742cc
OP-1848 altvario
...
1. Build fixes
2. Additional UI components.
2015-04-23 21:54:20 +10:00
abeck70
0d77cd95d9
OP-1848 altvari0
...
1. build fixes
2. Updated ui to use updated uavo names in altitude settings that align to the naming in vtol settings
3. Moved call the thrust altvario to pre application of PIDs for 3d axes to allow for later coupling.
2015-04-23 21:13:00 +10:00
abeck70
d469a754bf
OP-1848 ready for review
...
AltVario:
1. Uses new PID scheme
2. Runs at the outer loop rate to save CPU cycles
2015-04-23 15:51:09 +10:00
abeck70
955f314541
OP-1848 altvario rewrite - initial checkin
...
TODO: 1) update uavos 2) check dT
2015-04-23 15:46:47 +10:00
James Duley
b73c88b188
OP-1806 version info escape strings for C.
...
Added option "--escape" which uses json.dumps to do escaping
2015-04-23 13:40:03 +12:00
James Duley
21b6160397
Merge branch 'parched/OP-1843_Makefile_bugs' into next
2015-04-22 21:07:11 +12:00
James Duley
580ae19983
Revert "OP-1792: make firmware_info.c depend on uavobjectdefition instead of FORCE so it isn't always updated"
...
This reverts commit 428bba0c09
.
On windows directory timestamps are not modified when a file is
modified.
2015-04-22 21:04:06 +12:00