abeck70
7a61c381c6
Merge branch 'kfinisterre/Xplane10_plugin' of ssh://git.openpilot.org/OpenPilot into kfinisterre/Xplane10_plugin
2015-05-18 17:46:14 +10:00
Kevin Finisterre
266128d5a6
This closes https://progress.openpilot.org/browse/OP-1888
2015-05-17 19:15:45 -04:00
James Duley
5048ece1b7
Merge remote-tracking branch 'dev/next' into parched/OP-1853_Ground_build_tidy_TEST
2015-05-17 22:52:01 +01:00
James Duley
28a42dade6
OP-1853 Ground build tidy: Make consistent uavobjgenerator output dir.
...
Because on windows its normally different for release and debug
2015-05-17 21:27:16 +01:00
abeck70
4f78483f17
Merge branch 'laurent/OP-1887_PFD_update' into rel-15.05
2015-05-17 20:29:56 +10:00
abeck70
add7fe8502
Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1887_PFD_update
2015-05-17 20:28:54 +10:00
abeck70
2a70c702f8
Merge branch 'abeck/OP-1847-gps-assist-fixes' into rel-15.05
2015-05-17 19:58:29 +10:00
abeck70
c6178ddb34
Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1847-gps-assist-fixes
2015-05-17 19:57:45 +10:00
abeck70
f76fee6810
OP-1884 New defaults for GyroTau and Lowpass mpu filter
2015-05-16 22:47:34 +10:00
abeck70
8cb7aeacf7
OP-1882 set thrust control to auto as default
2015-05-16 22:32:22 +10:00
abeck70
1e9f7d9892
OP-1847 update vertical velicity Kp
2015-05-16 22:31:42 +10:00
abeck70
7d603bc6cb
OP-1847 gpsassist fix
...
Set assisted control state to HOLD when Brake controller transitions to HOLD. This impacts throttle stick behavior as it is different during braking and on brake completion in the hold state.
Also cleanuped and removed unused/old code that triggered HOLD in plans.c
2015-05-16 20:33:03 +10:00
abeck70
5d923c4125
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1847-gps-assist-fixes
2015-05-16 19:57:41 +10:00
Laurent Lalanne
d4b0541bc9
OP-1337 Translations updates for rel-15.05
2015-05-15 11:13:40 +02:00
abeck70
6f43f285d6
rel-15.05 RC1 update whatsnew
2015-05-15 09:00:26 +10:00
Laurent Lalanne
bbe98d1147
OP-1887 Oups, QuadH resurrected...
2015-05-14 17:52:09 +02:00
Laurent Lalanne
3ea01e0fb9
OP-1887 GPS tooltip info : Remove decimals
2015-05-14 14:41:29 +02:00
Laurent Lalanne
888df0cb30
OP-1887 Add Receiver quality
2015-05-14 14:16:42 +02:00
Laurent Lalanne
76b8450333
Merge branch 'next' into laurent/OP-1887_PFD_update
2015-05-14 13:25:24 +02:00
abeck70
112a79cfbe
Merge branch 'kfinisterre/Xplane10_plugin' into next
2015-05-14 21:08:50 +10:00
abeck70
f74300c96d
Merge branch 'next' into kfinisterre/Xplane10_plugin
2015-05-14 20:46:44 +10:00
Alex Beck
d6751172ae
OP-1848 altvario fix simposix build
2015-05-14 20:34:32 +10:00
Laurent Lalanne
a941a1aa04
OP-1887 Hide bat tooltips when battery panel not displayed
2015-05-14 12:32:41 +02:00
abeck70
87f19dc474
Merge branch 'laurent/OP-1869_Analog_airspeed_scaling' into next
2015-05-14 20:22:45 +10:00
abeck70
2c3fcd64d1
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1869_Analog_airspeed_scaling
2015-05-14 20:21:40 +10:00
abeck70
f4d1fc13ec
OP-1847 gps assist fixes
...
1. Update vtol vertical pids
2. Reduce deadband on throttle in gpsassist auto throttle to avoid large deviations in throttle change from neutral
3. Reinitialise assisted control state on mode change where the flight is the same but only gpsassist is going from disabled to enabled or enabled to disabled.
2015-05-14 20:07:07 +10:00
Laurent Lalanne
08536f3a01
Merge branch 'next' into laurent/OP-1887_PFD_update
2015-05-14 11:31:37 +02:00
abeck70
c51bca44be
Merge branch 'steve/OP-1849_flexio_com_bridge' into next
2015-05-14 17:25:21 +10:00
abeck70
5b11dbbf67
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into next
2015-05-14 17:24:58 +10:00
abeck70
fd42beeb6d
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into steve/OP-1849_flexio_com_bridge
2015-05-14 17:24:05 +10:00
abeck70
479d0b2df5
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into steve/OP-1803_s.bus_dropped_frames
2015-05-14 17:20:43 +10:00
Cliff Geerdes
ecc88208d6
Merge branch 'theothercliff/OP-1840_GPS_serial_port_needed_features' into next
2015-05-14 02:40:36 -04:00
Cliff Geerdes
4c794ff9ab
OP-1840 set ubx autoconfig default to disabled
2015-05-14 02:35:59 -04:00
Cliff Geerdes
73da4ea480
Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features
2015-05-14 02:34:00 -04:00
Laurent Lalanne
5767b3b2dc
OP-1887 Missing file, again
2015-05-14 03:01:19 +02:00
Laurent Lalanne
3a49ba6f45
OP-1887 Missing file for tooltips
2015-05-14 02:54:51 +02:00
Laurent Lalanne
10aba62bc8
OP-1887 Add tooltips over links, extended GPS info
2015-05-14 02:48:08 +02:00
Laurent Lalanne
8af77902c2
OP-1887 Hide battery links when battery panel not displayed
2015-05-14 01:00:21 +02:00
Laurent Lalanne
295e0870ef
OP-1887 Gps display, 12bars - Add text
2015-05-13 23:39:41 +02:00
Laurent Lalanne
f5160f64b0
OP-1887 New panel behavior, open/close animation
2015-05-13 23:38:58 +02:00
Laurent Lalanne
8e8d08c4a1
OP-1869 "scale" lower case
2015-05-13 21:55:18 +02:00
Steve Evans
1771d347bb
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge
2015-05-13 20:36:06 +01:00
Steve Evans
fd00cd8210
Merge branch 'next' into steve/OP-1803_s.bus_dropped_frames
2015-05-13 20:29:54 +01:00
James Duley
d7cdc540b0
OP-1853 Ground build tidy: removed now unneeded uavobject-synthetics.pro
2015-05-13 12:47:29 +01:00
James Duley
2610a4c463
OP-1853 Ground build tidy: make the gcs build handle generating its own
...
UAVOs.
This removes warnings and better handles dependencies to speed up rebuilds
New file uavobjgenerator.pri define a qmake compiler of the
uavobjgenerator
2015-05-13 12:47:28 +01:00
James Duley
060d8f1cc1
OP-1853 Ground build tidy: make non PHONY target UAVOBJGENERATOR
2015-05-13 12:47:28 +01:00
James Duley
90420dd164
OP-1853 Ground build tidy: unquote UAVOBJGENERATOR
2015-05-13 12:47:28 +01:00
James Duley
5ab283677f
OP-1853 Ground build tidy: Make UAVO_BUILD_CONF use GCS_BUILD_CONF to match qtcreator builds and make things easier later
2015-05-13 12:47:28 +01:00
James Duley
24a270772e
OP-1853 Ground build tidy: Remove old android line
2015-05-13 12:47:27 +01:00
James Duley
5a2806c3c0
OP-1853 Ground build tidy: Remove hardcoded prefix from uavobjgenerator output
2015-05-13 12:47:27 +01:00
