Cliff Geerdes
d9ab9e4f27
Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features
...
Conflicts:
flight/modules/GPS/GPS.c
2015-05-05 17:05:11 -04:00
abeck70
7bad2f8163
Merge branch 'abeck/OP-1867-pathplanner-autoland' into next
2015-05-05 21:35:25 +10:00
abeck70
0bdec71020
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1867-pathplanner-autoland
2015-05-05 21:34:26 +10:00
abeck70
30a70ca3ec
Merge branch 'abeck/OP-1863-rate-maxpitch' into next
2015-05-05 21:28:56 +10:00
abeck70
5c13db221b
OP-1867 autoland/takeoff
...
Allow takeoff after land on abort when in takeoff flight mode without having to change flight mode.
2015-05-04 21:48:24 +10:00
abeck70
2ec40072ab
OP-1863 ratetrainer fix coding error. ratetrainer should now work.
2015-05-04 17:36:04 +10:00
abeck70
d4561e9cd8
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch
2015-05-04 08:41:12 +10:00
abeck70
ca03092fb4
OP-1863 ratetrainer update stab handler to support new outerloop directwithlimits mode
2015-05-04 08:40:06 +10:00
Philippe Renon
9a312ef115
uncrustified
2015-05-02 16:46:35 +02:00
Philippe Renon
b4b93bee93
Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next
2015-05-02 16:34:15 +02:00
abeck70
b4d727db98
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch
2015-05-01 21:53:35 +10:00
m_thread
c4c60c897b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2015-05-01 09:53:35 +02:00
abeck70
174c0e8363
Merge branch 'abeck/OP-1867-pathplanner-autoland' into next
2015-05-01 17:46:44 +10:00
m_thread
b8653d44da
Merge branch 'thread/OP-1837_SRXL_Cleanup' into next
2015-05-01 09:46:32 +02:00
Cliff Geerdes
dad8f40c4d
OP-1840 Remove reference to unreleased hardware
2015-05-01 02:49:15 -04:00
Cliff Geerdes
c365bd3032
OP-1840 Removed unused debug .h and update comments
2015-05-01 02:46:38 -04:00
abeck70
87f521bde3
OP-1867 autoland
...
build fix
2015-04-30 23:11:32 +10:00
abeck70
0eb84cd8f6
OP-1867 pathplanner autoland
...
Setup land with descent rate set from flight mode settings.
2015-04-30 22:54:38 +10:00
abeck70
13375ff0f5
Merge branch 'abeck/OP-1858-autotakeoff' into next
2015-04-30 17:35:33 +10:00
abeck70
17b8ccd6bb
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-04-30 17:34:33 +10:00
Cliff Geerdes
f331ca0daf
OP-1840 CC3D wouldn't build and update some comments
2015-04-30 01:27:19 -04:00
Cliff Geerdes
48bea16ab9
OP-1840 GPS serial improvements initial coding
2015-04-29 23:46:47 -04:00
Alessio Morale
82c0cba664
Merge remote-tracking branch 'origin/amorale/OP-1841_serial_telemetry_issue' into next
2015-04-29 19:45:11 +02:00
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
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
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
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
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
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
David Ankers
00cbf7e2ea
Add Revo hardware files
2015-04-26 05:47:40 +10: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
David Ankers
52759ff91c
Merge remote-tracking branch 'origin/Spedix_Derivative_CC3D' into next
2015-04-24 23:14:59 +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
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
James Duley
bf527f741d
OP-1843 Makefile bugs: split qmake CONFIG variables as a temporary solution to broken qmake quoting on windows
2015-04-22 21:04:00 +12:00
James Duley
989d09803c
OP-1843 Makefile bugs: make opfw_resource before gcs_qmake to ensure it is included
2015-04-22 21:01:08 +12:00
James Duley
7f27570fce
Merge branch 'parched/OP-1851_missing_static_keyword' into next
2015-04-22 20:51:50 +12:00
James Duley
00818f3161
OP-1851 Missing static keyword:
...
Added static to header functions that were missing it
2015-04-22 11:27:47 +12:00
Richard von Lehe
604585f74e
OP-1740: GetSet use enums. Need to pack the enums to retain byte compatibility.
2015-04-20 08:31:26 -05:00
Alessio Morale
ab36dcbdee
Merge remote-tracking branch 'origin/rel-15.02.02' into next
2015-04-20 14:54:07 +02:00
Alessio Morale
1162c0afb2
Merge remote-tracking branch 'origin/master' into next
2015-04-20 14:53:13 +02:00