1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Commit Graph

12922 Commits

Author SHA1 Message Date
Philippe Renon
b4b93bee93 Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next 2015-05-02 16:34:15 +02: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
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
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
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
Alessio Morale
6176f7a1d7 Uncrustify 2015-04-20 14:52:13 +02:00
Alessio Morale
4198be0bf1 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2015-04-20 14:47:19 +02:00
Alessio Morale
a5740f0a60 Merge branch 'mcarr/OP-1844_vagrant_dev' into next 2015-04-20 14:39:36 +02:00
Mike Carr
e0291fd969 OP-1844 - cleanup not needed items, based on code review suggestions 2015-04-20 14:38:55 +02:00
Mike Carr
a5556030de OP-1844 - fix typo 2015-04-20 14:38:39 +02:00
Mike Carr
a80795b4dd OP-1844 - vagrant dev workstation: initial push 2015-04-20 14:38:21 +02:00
Laurent Lalanne
f2a431aceb Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next 2015-04-20 14:35:08 +02:00
Alessio Morale
2571db4d96 Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next 2015-04-20 14:29:16 +02:00
Alessio Morale
19bb4d8016 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2015-04-20 12:10:31 +02:00
Alessio Morale
118a0ec66f Merge remote-tracking branch 'origin/amorale/OP-1802_throttle_fake_pos_vel' into next 2015-04-20 12:10:08 +02:00
abeck70
f68e1144ca OP-1760 fix compile issue for CC 2015-04-20 20:09:27 +10:00
Alessio Morale
061ef1e377 Merge remote-tracking branch 'origin/amorale/OP-1828_optional_analog_inputs' into next 2015-04-20 12:08:34 +02:00
Alessio Morale
9103b4de92 Merge remote-tracking branch 'origin/rodney/OP-1834_disable_piro_comp_in_self_level_modes' into next 2015-04-20 11:58:51 +02:00
Alessio Morale
107f807c92 Merge remote-tracking branch 'origin/rodney/OP-1794_dump_axis_lock_accumulators_on_low_throttle' into next 2015-04-20 11:52:35 +02:00
Alessio Morale
e12a595826 OP-1802 - (missing) change from review 2015-04-20 11:38:38 +02:00