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
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
abeck70
04c42bd316
OP-1760 autotakeoff
...
1. Make autotakeoff height configurable
2. Fix the pidcontroldown transfer to solve the rough transition between pid controllers for landing, takeoff, braking etc.
2015-04-16 21:22:37 +10:00
James Duley
80f5a83b39
Merge branch 'parched/OP-1792_makefile_tidy' into next
2015-04-16 09:35:04 +12:00
abeck70
a8c6a19784
OP-1760 code review fixes
2015-04-15 08:39:13 +10:00
Rodney Grainger
aa9ed6a62a
OP-1843 - uncrustify
2015-04-14 22:00:11 +12:00
Rodney Grainger
115b206032
OP-1834 - Disable pirouette compensation in self level modes
2015-04-14 21:55:57 +12:00
abeck70
a52969a76b
OP-1760 Autotakeoff
...
Squashed commit as code reviews impossible otherwise due to dependencing on OP-1696
2015-04-12 21:39:31 +10:00
Steve Evans
8c949385cb
Merge branch 'steve/OP-1289_two_telemetry_streams' of ssh://git.openpilot.org/OpenPilot into steve/OP-1289_two_telemetry_streams
2015-04-11 12:58:57 +01:00
Steve Evans
32a25e7044
OP-1289 Only create local telemetry queues/tasks if needed
2015-04-11 12:58:14 +01:00
James Duley
24defde93b
OP-1792 Makefile tidy: fix addCopyDirTarget on windows because directory timestamps are not updated when a file is modified
2015-04-11 23:20:30 +12:00
Steve Evans
50ce26bd80
OP-1803 Only create local telemetry queues/tasks if needed
2015-04-11 10:06:19 +01:00
Alessio Morale
4afd644018
OP-1828 - Revolution: Maps Servo 3-6 to ADC2-5
2015-04-10 01:16:59 +02:00
James Duley
acdba01d4d
OP-1792 Maefile tidy: Rewrote ground build so qmake is only run by defualt on first build
2015-04-09 13:01:24 +12:00
James Duley
2c241da639
OP-1792 Makefile tidy: Create a rule for all directories in Makefile
2015-04-09 13:01:23 +12:00
James Duley
68e6231ba1
OP-1792 Makefile tidy: removed incorrect alignment space
2015-04-09 13:01:23 +12:00
James Duley
ccdd8e2263
OP-1667 removed old firmware line from windows package
2015-04-09 13:01:23 +12:00
James Duley
5ea8a990df
OP-1792 Makefile tidy: removed repeated Qt5OpenGL.dll
2015-04-09 13:01:23 +12:00
James Duley
af06960482
OP-1792 Makefile tidy: set dependencies for copydata by using new
...
functions addCopyFileTarget and addCopyDirTarget
2015-04-09 13:01:22 +12:00
Alessio Morale
e1bc8914e8
OP-1828 - Raise the number of ADC inputs supported
2015-04-09 00:26:04 +02:00