1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00

6226 Commits

Author SHA1 Message Date
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
f74300c96d Merge branch 'next' into kfinisterre/Xplane10_plugin 2015-05-14 20:46:44 +10: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
Philippe Renon
b4b93bee93 Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next 2015-05-02 16:34:15 +02:00
abeck70
21c54c3a37 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-01 22:59:36 +10:00
m_thread
b8653d44da Merge branch 'thread/OP-1837_SRXL_Cleanup' into next 2015-05-01 09:46:32 +02:00
Alessio Morale
a76c41a1ef Merge remote-tracking branch 'origin/dwillis/OP-1832' into next 2015-04-29 19:36:17 +02:00
Alessio Morale
3be43d9c9e Merge remote-tracking branch 'origin/samguns/OP-1821_Tricopter_wrong_servo_speed' into rel-15.02.02 2015-04-28 23:47:12 +02:00
Kevin Finisterre
7f2aeb371b Cosmetic changes to get the X-Plane 10 plugin to compile 2015-04-27 16:10:33 -04:00
Kevin Finisterre
996d8a8f48 Change the plugin names to match inclusion of both X-Plane 9 & 10 2015-04-27 15:47:48 -04:00
Kevin Finisterre
0f9218d3af X-Plane 10 HITL & SITL protocol changes that should have been in place long ago! 2015-04-27 15:45:45 -04:00
samguns
c71d51b093 OP-1751 Modify some improper CN translations 2015-04-27 13:16:17 +08:00
samguns
09a00f8990 Merge branch 'rel-15.02.02' into samguns/zh_CN_GCS 2015-04-27 11:56:25 +08:00
samguns
69b404daa1 OP-1821 Commit bug fix 2015-04-27 08:45:35 +08:00
Richard von Lehe
f3611591e0 Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
Conflicts:
	flight/modules/PathFollower/inc/vtollandcontroller.h
	flight/modules/PathFollower/vtollandcontroller.cpp
	flight/modules/PathFollower/vtollandfsm.cpp
2015-04-26 17:45:36 -05:00
Steve Evans
55f2b2fabb OP-1849 Fix GCS HW Settings tab to only display receiver port com-bridge if available 2015-04-26 22:19:51 +01:00
Laurent Lalanne
6e6e2b1b9b OP-1337 Translations : input wizard update 2015-04-26 18:25:56 +02:00
m_thread
b0b1a42aec OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols.
Protocol version is autodetected and 12 or 16 channels are supported.
SRXL is available on Flexiport of Revolution board.
2015-04-26 15:04:52 +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
abeck70
45ceada471 OP-1848 altvario ui fixes 2015-04-24 23:34:03 +10:00
abeck70
b9a77d7e85 OP-1848 altvario ui scaling 2015-04-24 22:42:54 +10:00