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
James Duley
9d31ca939c
OP-1853 Ground build tidy: remove targetPath as not needed.
...
Could be replaced with builtin $$shell_path but that appears
to be buggy on windows git bash
2015-05-13 12:46:04 +01:00
abeck70
cb70fa8846
Merge branch 'kfinisterre/GMapsAndGeoCodeSearchFix' into next
2015-05-13 17:49:32 +10:00
abeck70
e8c948c45b
Merge branch 'next' into kfinisterre/GMapsAndGeoCodeSearchFix
2015-05-13 17:46:05 +10:00
abeck70
525aabe54c
uncrustify flight gps updates
2015-05-13 17:36:52 +10:00
abeck70
c6024573e3
Merge branch 'abeck/OP-1848r-altvario' into next
2015-05-13 17:34:53 +10:00
abeck70
3784357a18
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-13 17:33:11 +10:00
abeck70
92e50c2ead
OP-1810 FOC
...
Squashed commit for clean commit as discussed in code review
Uncrustify
2015-05-13 17:19:51 +10:00
Alessio Morale
f6f6991432
Merge branch 'master' into next
...
Conflicts:
WHATSNEW.txt
2015-05-13 01:59:54 +02:00
Alessio Morale
29b9265531
Merge branch 'rel-15.02.02_fixed'
2015-05-13 01:55:10 +02:00
Kevin Finisterre
0377c3f333
Work through debugging faulty map rendering. Fix OpenStreetOSM option.
2015-05-12 17:35:16 -04:00
abeck70
3367313432
OP-1848 altvario gcs fix ranges
2015-05-12 22:48:49 +10:00
abeck70
65ecec8af8
OP-1848 altvario ui fix for Ki on altvario
2015-05-12 22:34:18 +10:00
abeck70
858354391d
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-12 22:07:21 +10:00
abeck70
794605b3d9
OP-1848 altvario fixes
...
1. CC compile fix
2. on reinit calculate a new thrustdemand after which gyro updates will retrigger subsequent calcs
2015-05-12 22:02:03 +10:00
abeck70
e0919542e7
OP-1848r-altvario updated Kp, Ki, Kd
2015-05-12 17:45:07 +10:00
abeck70
8d2f4722d7
OP-1848 altvario improvements
...
1. Disable velocity pid loop when altvario is not active
2. Add sanity boundf to ensure max min are inforced.
2015-05-12 17:40:28 +10:00
Cliff Geerdes
131fd81f50
Merge branch 'theothercliff/OP-1840_GPS_serial_port_needed_features' into next
2015-05-12 01:28:09 -04:00
Cliff Geerdes
f1ec9dea33
Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features
2015-05-12 01:25:45 -04:00
Kevin Finisterre
9fe4fb7216
Remove depreciated Yahoo maps (now uses "Here" - https://developer.here.com/rest-apis which requires an API key we don't have) No desire to implement new Here interface.
...
Fix Yandex.ru interface to reference Yandex.net
2015-05-10 22:31:48 -04:00