1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Commit Graph

6542 Commits

Author SHA1 Message Date
m_thread
9b7e5b3ae2 LP-16 Fixed small errors. 2015-07-16 11:23:32 +02:00
a*morale
01a56796c3 Merge pull request #17 from f5soh/laurent/LP-03_Artwork_icons_splashscreen
Laurent/lp 03 artwork icons splashscreen
2015-07-16 11:18:29 +02:00
Laurent Lalanne
ef6b664ac8 LP-05 Add CC artwork for connection-diagram 2015-07-16 10:31:43 +02:00
a*morale
feee18134e Merge pull request #15 from skarlsso/skarlsso/LP-10_cleanup_build_warnings_on_osx
Skarlsso/lp 10 cleanup build warnings on osx
2015-07-16 09:27:16 +02:00
Alessio Morale
5e9a034e6e LP-5 - Uncrustification 2015-07-15 22:53:48 +02:00
m_thread
72938ec954 LP-16 Added code to delete 'local' vehicle templates. 2015-07-15 15:34:15 +02:00
m_thread
da6b0715f7 LP-16 Updated code to use new vehicle template path and extension. 2015-07-15 10:30:36 +02:00
m_thread
c193b53d3a LP-16 Moved vehicle template files. 2015-07-15 10:29:43 +02:00
Paul Jewell
ca8c7b6b96 Modified comments to remove openpilotgcs 2015-07-15 08:04:33 +01:00
a*morale
81ea0b9232 LP-5 Fix revert issue 2015-07-15 00:07:51 +02:00
a*morale
dd6c6054e9 Revert "OP-1810 FOC"
This reverts commit 92e50c2ead.

Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/setupwizard/pages/escpage.cpp
	ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
	ground/openpilotgcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
2015-07-15 00:07:50 +02:00
Laurent Lalanne
b6ef1e2256 LP-03 Refine OSX icons - OSX installer background 2015-07-14 22:56:00 +02:00
Stefan Karlsson
aea3fccf7b LP-10 Uncrustify 2015-07-13 12:51:49 +02:00
Stefan Karlsson
f3b091ebc9 LP-10 Use Q_UNUSED for unused parameters 2015-07-13 12:50:40 +02:00
Laurent Lalanne
50828e3dd4 LP-03 Missing new Osx icon 2015-07-13 12:46:14 +02:00
Laurent Lalanne
154e303bd8 LP-03 Better Win32 icons, OSX icon, Splash Screen text placement and colors 2015-07-13 12:39:20 +02:00
Stefan Karlsson
c5ed56226d LP-10 Update previous abs float fix to use fabs
Previous fix casted the float arguments to ints. Use a fabs instead,
since it gives easier code to read. The beSmooth check was also moved
to further enhance the readability of the code.
2015-07-12 23:54:37 +02:00
Stefan Karlsson
de07c028a9 LP-10 Turn on stricter warnings on OS X 2015-07-12 22:35:00 +02:00
Stefan Karlsson
dc08ca5949 LP-10 Fix missing swith enum value warning 2015-07-12 22:35:00 +02:00
Stefan Karlsson
1861ede9d7 LP-10 Fix unused parameter warnings 2015-07-12 22:34:59 +02:00
Stefan Karlsson
162dde2677 LP-10 Fix unitialized variable warning 2015-07-12 22:34:59 +02:00
Stefan Karlsson
257629dc3e LP-10 Fix signed/unsigned comparison 2015-07-12 22:34:59 +02:00
Stefan Karlsson
f55048eb22 LP-10 Remove unused static function 2015-07-12 22:34:59 +02:00
Stefan Karlsson
1a0f5f1bef LP-10 Fix bugs and warnings in USB_UPLOAD_TOOL 2015-07-12 22:34:59 +02:00
Stefan Karlsson
a28d668758 LP-10 Fix abs warning when floats are used 2015-07-12 22:34:59 +02:00
Stefan Karlsson
e6f88883d0 LP-10 Fix incorrect return type in generalsettings 2015-07-12 22:34:59 +02:00
Stefan Karlsson
e44bafaee5 LP-10 Fix shadowing warning in OPMapGadgetConfiguration 2015-07-12 22:33:38 +02:00
James Duley
e08feb3c46 rename default configuration xml file 2015-07-13 07:11:50 +12:00
James Duley
cc2b2149ef changed default GCS names to not have a vendor 2015-07-13 07:11:49 +12:00
James Duley
b6d42f2da8 Passed ORG_NAME to GCS 2015-07-13 07:11:49 +12:00
James Duley
7a1f330096 fixed stylesheet path hardocding 2015-07-13 03:34:10 +12:00
LibrePilot Packager
8c47b39535 use GetDataPath instead of hardcoding 2015-07-13 01:34:45 +12:00
LibrePilot Packager
77cdbcc351 removed unnecesssary PathUtils class around functions 2015-07-13 01:34:45 +12:00
LibrePilot Packager
1e662d6175 removed openpilotgcs hardcoding from qt.conf 2015-07-13 01:34:32 +12:00
Alessio Morale
0e0e6a1a1c Merge branch 'laurent/LP-03_Artwork_rebranding' of git://github.com/f5soh/LibrePilot into f5soh-laurent/LP-03_Artwork_rebranding
Conflicts:
	package/winx86/openpilotgcs.nsi
2015-07-12 10:39:43 +02:00
LibrePilot Packager
fba69ae07e fix up for files that were missed in share directory move due to rebase 2dee2328d 2015-07-11 14:09:49 +01:00
a*morale
e84ad7abff Merge pull request #7 from parched/OP-1879_remove_openpilot_hardcoding
OP-1879 remove openpilot hardcoding
2015-07-11 14:23:29 +02:00
a*morale
f43b6c890a Merge pull request #8 from parched/OP-1929_broken_package_src
OP-1929 broken package src
2015-07-11 14:22:56 +02:00
James Duley
2dee2328d0 OP-1879: Move ground/openpilotgcs/share/openpilotgcs to ground/openpilotgcs/src/share
This seperates our intermediate build files and files that need to be
installed.
2015-07-09 22:01:46 +01:00
James Duley
4dea2d3d97 OP-1879 remove openpilot hardcoding: added naming variables to top Makefile 2015-07-09 22:01:39 +01:00
James Duley
5474583660 OP-1879 remove openpilot hardcoding: use $$shell_quote where appropraite 2015-07-09 22:01:39 +01:00
James Duley
64cd361666 OP-1879 remove openpilot hardcoding: add GCS_NAME make variable 2015-07-09 22:01:38 +01:00
James Duley
edc949a91b OP-1879 remove openpilot hardcoding: reworked settings to use default app name 2015-07-09 22:01:38 +01:00
James Duley
95d3de7351 OP-1879 remove openpilot hardcoding: use QStandardPaths:CacheLocation for GetStoragePath 2015-07-09 22:01:37 +01:00
James Duley
11beba3369 OP-1879 remove openpilot hardcoding: use GCS_APP_TARGET name for library and data paths 2015-07-09 22:01:37 +01:00
James Duley
d6eb85c5ee OP-1879 remove openpilot hardcoding: remove unused hardcoded cloudconfig path 2015-07-09 22:01:37 +01:00
James Duley
64dc5717f1 OP-1879 remove openpilot hardcoding: use Utils::PathUtils.GetDataPath() instead of hardcoding in main.cpp 2015-07-09 22:01:36 +01:00
James Duley
fc791e87dc OP-1879 remove openpilot hardcoding: use relative paths define from openpilotgcs.pri for data and plugins paths 2015-07-09 22:01:36 +01:00
James Duley
c992daddaf OP-1879 remove openpilot hardcoding: change GCS_APP_PATH on Mac removing pointless bin subdir 2015-07-09 22:01:35 +01:00
James Duley
31cafe1d22 OP-1879 remove openpilot hardcoding: remove wrong and unneeded libexec path 2015-07-09 22:01:35 +01:00
Laurent Lalanne
4ae9bfe3f7 LP-03 About - Splash screen fixes 2015-07-09 21:01:58 +02:00
Laurent Lalanne
a91679b50f LP-03 Splash : Add dark grey background for status text 2015-07-09 11:16:28 +02:00
Laurent Lalanne
7210eda66d LP-03 Installer img and icon - move SplashScreen text 2015-07-09 02:28:09 +02:00
Laurent Lalanne
fa3c4dcd4b LP-03 Missing splash file :) 2015-07-09 00:07:03 +02:00
Laurent Lalanne
b43e533cf6 LP-03 slash name, win32 issue 2015-07-08 23:38:24 +02:00
Laurent Lalanne
c68756a036 LP-03 Artwork rebranding : updated Logos, wizard and config shapes 2015-07-08 20:29:34 +02:00
James Duley
67aaa1fd19 fix usagetracker to compile with qt < 5.4 2015-06-26 08:11:52 +12:00
Corvus Corax
bd9fdba2c5 Merge remote-tracking branch 'origin/rel-15.05' into next 2015-06-23 18:45:04 +02:00
abeck70
28a8a36a56 rel-nano-15.05 Updated cloud configs 2015-06-17 20:17:20 +10:00
m_thread
3d5fae2172 REVONANO: Fix for Comboboxes not having options but rather just an integer value that equals the actual selected index.. 2015-06-06 11:23:01 +02:00
abeck70
631c1b2361 Release 15.05 RC7 WhatsNew Update
And uncrustify
2015-06-06 08:00:16 +10:00
m_thread
9ce00a18f0 REVONANO: Added limit for ComBridge on Nano receiver port.
Fixed Revo Hw config page to handle ComBridge on Receiver port
correctly.
Changed some alignments in GUI.
2015-06-04 22:18:16 +02:00
m_thread
5e5a0e503f REVONANO: Minor bug fix with a combobox not hiding properly. 2015-06-04 21:44:23 +02:00
m_thread
c60a5a5e94 Merge branch 'rel-nano-15.05' of ssh://git.openpilot.org/temp into rel-nano-15.05 2015-06-04 21:26:10 +02:00
m_thread
a871a6f455 REVONANO: Update Nano Hw page to use 'limits safe' combobox code. 2015-06-04 21:25:47 +02:00
m_thread
c4105240c2 REVONANO: Handle limits.
Added code to take limits on options into consideration when dealing
with comboboxes in configtaskwidget controls.
2015-06-04 21:25:01 +02:00
Mathieu Rondonneau
891922db23 OP-1915: Fix google map not appearing. 2015-06-03 16:00:29 -07:00
abeck70
ae26eea363 REVONANO uncrustify 2015-06-02 08:38:27 +10:00
Steve Evans
d41808ecaf Merge branch 'rel-nano-15.05' into steve/OP-1904_Display_current_TxPID_settings_on_OSD 2015-05-30 12:14:47 +01:00
abeck70
2081ab6550 Merge remote-tracking branch 'origin/thread/OP-1901_SRXL_Wizard' into rel-nano-15.05 2015-05-30 19:40:35 +10:00
abeck70
c8ff29c404 Merge remote-tracking branch 'origin/steve/OP-1903_Add_TxPID_controls_for_AttitudeSettings' into rel-nano-15.05 2015-05-30 19:31:46 +10:00
abeck70
3e4c11780e Merge remote-tracking branch 'origin/laurent/OP-1648_PFD_Stabmodes_update' into rel-nano-15.05 2015-05-30 19:27:34 +10:00
Laurent Lalanne
6ddcb26e5e OP-1648 Update PFD with new flightmodes 2015-05-29 19:56:25 +02:00
abeck70
690eaf9cb6 Merge branch 'samguns/OP-xxxx_Limit_PWM_RX_OneShot' into rel-nano-15.05 2015-05-29 21:41:59 +10:00
abeck70
6b2d217efe Merge branch 'samguns/OP-XXXX_wizard_freeze_workaround' into rel-nano-15.05 2015-05-29 21:41:28 +10:00
samguns
3e60dff30b REVONANO Only reboot nano when needed in setup wizard 2015-05-28 23:18:24 +08:00
samguns
edddc0e34f REVONANO Remove unnecessary limits for OneShot/PWMSync in setup wizard 2015-05-28 22:24:41 +08:00
m_thread
3d6a01f0e2 OP-1732 - Fixed timer bank assignments and labels for Revolution
Conflicts:
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
2015-05-27 11:18:47 +02:00
m_thread
f23de9b628 Merge remote-tracking branch 'temp/laurent/OP-1901_revonano1505_SRXL_wizard_artwork' into thread/OP-1901_SRXL_Wizard 2015-05-27 08:10:31 +02:00
m_thread
6c850cbfdb OP-1901 Fixed faulty tooltip. 2015-05-27 07:30:58 +02:00
Laurent Lalanne
f4eb368a8f OP-1901 Revo-srxl placement 2015-05-27 07:29:51 +02:00
m_thread
52e56df397 OP-1901 Adding support for SRXL in connection diagram. 2015-05-26 23:36:32 +02:00
m_thread
4db1dd8b19 Merge remote-tracking branch 'temp/laurent/OP-1901_revonano1505_SRXL_wizard_artwork' into thread/OP-1901_SRXL_Wizard 2015-05-26 22:21:39 +02:00
m_thread
924503de48 OP-1901 Adding support for SRXL in vehicle wizard. 2015-05-26 22:20:46 +02:00
Laurent Lalanne
58bbc9324d OP-1901 Revonano1505 SRXL wizard artwork 2015-05-26 21:32:40 +02:00
samguns
68da0d20a2 REVONANO A workaround for freeze in setup wizard 2015-05-26 23:09:25 +08:00
samguns
8551048354 REVONANO 1. Sanity check for PWMSync & OneShot while using PWM receiver. 2. Remove CC in hwsettings.xml 2015-05-26 15:01:01 +08:00
Steve Evans
1cdc1635bd Merge branch 'steve/OP-1903_Add_TxPID_controls_for_AttitudeSettings' into steve/OP-1904_Display_current_TxPID_settings_on_OSD 2015-05-23 22:24:48 +01:00
Steve Evans
df3e0ae3c8 OP-1903 Get default values for attitude attributes 2015-05-23 22:24:20 +01:00
Steve Evans
5a9ee46742 OP-1904 Initial commit 2015-05-23 21:55:19 +01:00
abeck70
e8b09e88e2 Merge branch 'rel-15.05' into next 2015-05-22 22:16:08 +10:00
abeck70
4502bff08c Merge branch 'abeck/OP-1898-VR' into rel-nano-15.05 2015-05-22 21:39:09 +10:00
abeck70
6f2d8d40e3 Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-22 21:38:37 +10:00
abeck70
42b1e12646 HITL segv fix 2015-05-22 21:26:20 +10:00
abeck70
446866f769 OP-1898 Velocity Roam Update tooltips on GPSAssist 2015-05-22 18:56:04 +10:00
abeck70
c0c5cd3d16 OP-1464 uncrustify 2015-05-22 18:36:38 +10:00
abeck70
22b2317732 Merge branch 'theothercliff/OP-1464_Handle_Autobaud_code_for_GPS' into rel-nano-15.05 2015-05-22 18:34:17 +10:00
abeck70
981005e40c Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-21 22:51:45 +10:00
abeck70
b77a7d1116 Merge branch 'rel-15.05' into next 2015-05-21 22:47:39 +10:00
abeck70
f44884f072 REVONANO esc setupwizard nano fix 2015-05-21 22:19:40 +10:00
Cliff Geerdes
ced0d4725b OP-1464 Rename things as requested Implement autodisable as advised by Alessio 2015-05-21 04:37:44 -04:00
samguns
40acc2c7ea OP-1897 Minor change after code review 2015-05-21 09:47:44 +08:00
samguns
501e2e09de OP-1897 Adopt FTT's suggestion that make warning dialog for Ground Vehicle when it's neccesary and omit confusing texts 2015-05-20 15:50:25 +08:00
Cliff Geerdes
55a43d1815 OP-1464 Compile warning discovery Remove AbConfStoreDisable 2015-05-20 01:04:06 -04:00
Cliff Geerdes
244c9e2d5e Merge branch 'rel-15.05' into theothercliff/OP-1464_Handle_Autobaud_code_for_GPS 2015-05-19 21:57:34 -04:00
Cliff Geerdes
de521c9004 OP-1464 tested version with debug still in place 2015-05-19 19:33:31 -04:00
abeck70
2241070d04 Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-20 08:37:44 +10:00
Alessio Morale
a858321add update and cleanup UAVObjects list 2015-05-19 17:33:07 +02:00
Laurent Lalanne
81361af7b6 Rcpanel hot fix (Roll can't move) 2015-05-19 15:21:31 +02:00
abeck70
c14be34551 Merge branch 'rel-15.05' into rel-nano-15.05
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2015-05-19 22:24:16 +10:00
abeck70
5b49aa092f Merge branch 'rel-15.05' into next 2015-05-19 22:02:34 +10:00
abeck70
a00ce7a551 Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into parched/OP-1853_Ground_build_tidy 2015-05-19 21:53:20 +10:00
abeck70
399bf0470a Merge branch 'rel-15.05' into rel-nano-15.05 2015-05-19 18:25:07 +10:00
abeck70
869bfaaee5 Merge branch 'rel-15.05' into next 2015-05-19 18:20:06 +10:00
abeck70
053bd9ebb7 Map update code review comments 2015-05-19 18:17:21 +10:00
Kevin Finisterre
bf96bfac74 Remove redundant entry 2015-05-19 18:17:21 +10:00
Kevin Finisterre
8f8b2fccfc Add Statkart Topo2 aka... I scratch YOUR back, you scratch mine!
17f68c3be6
2015-05-19 18:17:20 +10:00
Kevin Finisterre
d7fef72b4d disable printing of the image header, was used for debugging only 2015-05-19 18:17:20 +10:00
Kevin Finisterre
f98a9e6319 Depreciate MapsLT map source 2015-05-19 18:17:20 +10:00
Kevin Finisterre
17fa6341c3 Depreciate Yandex maps 2015-05-19 18:17:20 +10:00
Kevin Finisterre
13b0eac79f Depreciate Pergo maps 2015-05-19 18:17:20 +10:00
Kevin Finisterre
361bb26212 attempt to get Pergo Turkish maps working. Still buggy. Unable to search and auto zoom. Initial map render works mostly 2015-05-19 18:17:19 +10:00
Kevin Finisterre
2c3f3f6a49 Attempt to fix ArcGIS_MapsLT_* map types, Successfully fix ArcGIS_ShadedRelief by limiting the max tiles.
Tiles 11, 12 and 13 are invalid here http://server.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer
Set maxtiles to 10 for ArcGIS_ShadedRelief map type
2015-05-19 18:17:19 +10:00
Kevin Finisterre
666b63c1d7 Update old mapsurfer interface... mapsurfer.net changed to mapsurfernet.com and was depreciated all together. Use GIScience (Geoinformatics) Research Group, Heidelberg University mirror 2015-05-19 18:17:19 +10:00
Kevin Finisterre
c1cc21da94 Fix SigPacSpainMap & Google*Korea map types 2015-05-19 18:17:19 +10:00
Kevin Finisterre
3a95dd9b78 Fix GoogleMapsKorea, GoogleMapsKoreaHybrid & GoogleMapsKoreaSatellite, Still need to fix the Labels mapset
SSL bug in QT, workaround used in url generation code as well
2015-05-19 18:17:19 +10:00
Kevin Finisterre
01a00ccafd Continue debugging troublesome maps... remove the Dragons from the map!!! https://progress.openpilot.org/browse/OP-392 was more annoying than useful.
Attempt to change HTTP request method to debug failed tile downloads.
2015-05-19 18:17:19 +10:00
Alessio Morale
0034dbf2d2 REVONANO - Fix a missing wizard include file 2015-05-18 22:14:45 +02:00
Laurent Lalanne
28ffaa068f REVONANO Add cloudconfig for Mako flying wing 2015-05-18 21:30:05 +02:00
Laurent Lalanne
7df64ada76 REVONANO - Again with Input 2 - *** PIN4 *** 2015-05-18 21:30:05 +02:00
m_thread
6bc338885e REVONANO Fixed hardware page falsely reporting that it was changed. 2015-05-18 21:30:03 +02:00
m_thread
1e7da5a0e1 REVONANO - Added nano support for bankmodes and rates. 2015-05-18 21:30:03 +02:00
m_thread
300a2c38ca REVONANO - Added limits for receiver port enum on nano. 2015-05-18 21:30:02 +02:00
m_thread
8dfbe69900 REVONANO - Fixed timer bank assignments and labels. 2015-05-18 21:30:02 +02:00
Laurent Lalanne
3acc4243a5 Uncrustify ground 2015-05-18 21:30:00 +02:00
m_thread
a0c82d340b OP-1617 PlotPicker configuration change. 2015-05-18 21:30:00 +02:00
m_thread
4f1ae4c25d OP-1617 Added PlotPicker to get readings in numbers out of scope graphs. 2015-05-18 21:30:00 +02:00
m_thread
28c257292f OP-1659 Added HW config page. 2015-05-18 21:30:00 +02:00
m_thread
bbb0c34411 OP-1659 Updated uploader image 2015-05-18 21:29:59 +02:00
Stefan Karlsson
59570c86b2 Remove QT_STATIC_CONST and QT_STATIC_CONST_IMPL 2015-05-18 21:29:58 +02:00
Stefan Karlsson
532b93ddbf REVONANO - Use Nano picture on the uploader page 2015-05-18 21:29:58 +02:00
Stefan Karlsson
7877798015 REVONANO - Add missing setupwizard setup wizard support of the Nano 2015-05-18 21:29:58 +02:00
Stefan Karlsson
7252fb4207 REVONANO - Fix Auto Upload 2015-05-18 21:29:58 +02:00
Alessio Morale
15e7286078 MPU9K - merge 9k and 6k settings into a single uavo 2015-05-18 21:29:56 +02:00
Mathieu Rondonneau
66b06e4c9a REVONANO - Add MPU9250 support 2015-05-18 21:29:42 +02:00
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
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