abeck70
9bfc68ca62
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kfinisterre/WiresharkPlugin
2015-05-18 23:00:29 +10:00
abeck70
f5547c6cd5
Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into kfinisterre/Xplane10_plugin
2015-05-18 17:46:48 +10:00
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
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
Laurent Lalanne
d4b0541bc9
OP-1337 Translations updates for rel-15.05
2015-05-15 11:13:40 +02: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
f74300c96d
Merge branch 'next' into kfinisterre/Xplane10_plugin
2015-05-14 20:46:44 +10:00
Laurent Lalanne
a941a1aa04
OP-1887 Hide bat tooltips when battery panel not displayed
2015-05-14 12:32:41 +02:00
Laurent Lalanne
08536f3a01
Merge branch 'next' into laurent/OP-1887_PFD_update
2015-05-14 11:31:37 +02: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
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
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
e8c948c45b
Merge branch 'next' into kfinisterre/GMapsAndGeoCodeSearchFix
2015-05-13 17:46:05 +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
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
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
Kevin Finisterre
390a8cccb5
Add search coloring back to the location search. Google Maps should be functional again. Some locations on the extents of map do not render 'North Pole, South Pole, Antarctica, etc.' currently a *non issue*
2015-05-10 16:36:01 -04:00
Kevin Finisterre
38f0a609da
Fix Google Map tiles, https://maps.google.com/maps?output=classic is now depreciated. Legacy view temporarily available via https://www.google.com/lochp
...
Need to update to Google Maps v3 soon. New URL will be https://www.google.com/maps/@0,-0,7z?dg=dbrw&newdg=1 (tile retrieval is completely different)
Fix location search. Updated to v3 Google GeoCoder. CSV is no longer an option for output. Updated to XML parsed output. (needs a more robust parser!)
New Geocode search urls are as follows:
https://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address=california
https://maps.googleapis.com/maps/api/geocode/xml?latlng=0.000000,-0.000000
Need to fix response after SetCurrentPositionByKeywords() all responses shade the box Green currently.
2015-05-10 15:59:08 -04:00
James Duley
7967480c74
OP-1853 Ground build tidy: remove unneeded line in translations.pro
2015-05-10 20:47:50 +12:00
James Duley
f07dddc965
OP-1853 Ground build tidy: remove old vcproj stuff we don't support and wouldn't work anyway
2015-05-10 20:47:50 +12:00
James Duley
e675ae7f7b
OP-1853 Ground build tidy: remove old qt stuff from translations.pro
2015-05-10 20:47:50 +12:00
abeck70
d6123c018d
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-09 14:31:57 +10:00
abeck70
78acf10f6b
OP-1791 updated warning message
2015-05-08 21:36:39 +10:00
Daniël Koek
549f0c2f60
OP-1852
2015-05-08 21:31:03 +10:00
abeck70
ddefd11b7f
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-07 11:28:24 +10:00
James Duley
d39639ca68
Remove old pro.user file
2015-05-06 18:23:12 +12:00
abeck70
143f09d216
Merge remote-tracking branch 'origin/rel-15.02.02' into next
...
Conflicts:
flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
abeck70
48f3922a8d
OP-1848 altvario fix default stab page
2015-05-05 22:14:18 +10:00
abeck70
a9ad3c5ec1
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-04 08:42:54 +10:00
RS2K
77eacb2294
OP-1835 - Motor Constraints 15.02.02 100% throttle curves default
2015-05-02 17:41:47 -05:00
Laurent Lalanne
93ff480b7a
15.02.02 hotfix for tricopter servo on wizard
2015-05-02 21:02:14 +02:00
Philippe Renon
9a312ef115
uncrustified
2015-05-02 16:46:35 +02:00
