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
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
Steve Evans
79339d677f
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_update_minimosd_via_usb
2015-04-21 07:44:50 +01:00
Steve Evans
d28831008f
OP-1803 Return link quality of zero rather than throw an exception if no receiver if the receiver port is undefined
2015-04-20 21:40:42 +01: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
Alessio Morale
3128127392
OP-1841 - Check available size at each step to avoid overrun
2015-04-20 05:48:39 +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
Steve Evans
b87a1c1fa6
OP-1803 Enable DSM link quality so testers have something to work with
2015-04-19 18:41:04 +01: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