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

12901 Commits

Author SHA1 Message Date
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
Laurent Lalanne
6e6e2b1b9b OP-1337 Translations : input wizard update 2015-04-26 18:25:56 +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
Alessio Morale
6c22ed3b69 OP-1802 - Changes from review 2015-04-20 11:35:40 +02:00
abeck70
d943f5a0ce OP-1760 autotakeoff
On landing stausvtolland state of DISARMED, armhandler  now detects this and disarms by force equivalent to a pathplanner alarm trigger.

To re-arm, one must leave the land flight mode.
2015-04-20 08:43:57 +10:00
abeck70
3a0c36f7d7 OP-1760 autotakeoff
Add sanity checks to protect from waypoint looping inpath planner.

If takeoff initiated and thrust > vtol_min, enter position hold, reflect copletion in pathstatus, and pathplanner will move to next waypoint in a very short period of time.
2015-04-19 18:46:40 +10:00
abeck70
b96379cf78 OP-1760 landing fixes : avoid false positives on ground detection from accel vibration
Viper found that a badly mounted FC can trigger ground detection.
2015-04-19 18:18:14 +10:00
abeck70
1e9bd43871 Merge branch 'next' into abeck/OP-1760-autotakeoff-squashed 2015-04-19 17:52:35 +10:00
Philippe Renon
77dfff1dac Merge remote-tracking branch 'origin/samguns/OP-1808_make_flight_mode_optional' into next 2015-04-18 20:13:09 +02:00
Alessio Morale
5c76c0ee07 Merge remote-tracking branch 'origin/steve/OP-1289_two_telemetry_streams' into next
Conflicts:
	flight/modules/Telemetry/telemetry.c
2015-04-18 19:10:13 +02:00
Laurent Lalanne
fe04a9b63c OP-1337 French translation update : Usage feedback 2015-04-18 13:55:50 +02:00
Laurent Lalanne
00ac0048ee Merge remote-tracking branch 'origin/laurent/OP-1822_Heli_tab_refresh' into next 2015-04-18 11:33:42 +02:00
abeck70
8490cd2e73 OP-1760 autotakeoff fix pathdesired mode display in pfd 2015-04-18 16:17:46 +10:00
abeck70
c4aa17a04c OP-1760 autotakeoff pathplanner now uses pathstatus in conditionLegRemaining 2015-04-17 23:06:02 +10:00
abeck70
eebbfcea64 OP-1760 autotakeoff - enable positional control pathplanner landing to fly to final waypoint during landing 2015-04-17 22:58:53 +10:00
abeck70
88b0c99087 OP-1760 autotakeoff in pathplaner: control to start location instead of end location in NE 2015-04-17 22:44:05 +10:00
abeck70
55cbc2cd9b OP-1760 autotakeoff - simplify pathplanner data input requirements to trigger autotakeoff 2015-04-17 22:21:08 +10:00
abeck70
db0dc0e552 OP-1760 indicate completion of takeoff when disarmed
This can be detected in pathplanner.
2015-04-17 21:26:24 +10:00
abeck70
71d1757bb0 OP-1760 autotakeoff
Fix the gcs defines for the pathaction modes.
2015-04-17 21:01:38 +10:00
Philippe Renon
33c569abf6 OP-1796 updated Qt download urls to new location 2015-04-17 08:38:10 +02:00
m_thread
ddb2025108 Merge branch 'thread/OP-1777_Usage_statistics' into next 2015-04-17 08:26:02 +02:00
Mathieu Rondonneau
9cb0926009 OP-1804: Add realloc. 2015-04-16 22:52:09 -07:00