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
Kevin Finisterre
6ee9eda7fb
Fix the error "Err Field '0' (actuatorcommand.Channel.0) is signed (FT_INT16) but is being displayed unsigned (BASE_DEC_HEX)"
...
Stop attempting to display in hex
2015-04-28 15:31:27 -04:00
Kevin Finisterre
d591ec7117
dissector_add() was depreciated and replaced with dissector_add_uint()
2015-04-28 14:49:30 -04:00
Kevin Finisterre
25a91bc5fc
Fix some minor issues with the old Wireshark Plugin. It won't compile past Wireshark 1.8 which is way outdated.
...
added void *data _U_ to the dissecor definition per - https://ask.wireshark.org/questions/22590/dissector-handle
2015-04-28 14:21:37 -04: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
m_thread
95574494af
OP-1848 Updated Ki ranges and scale.
2015-04-24 14:06:47 +02:00
abeck70
57ba5280ef
OP-1848 altvario
...
UI scaling fixes and help text edits.
2015-04-24 17:29:19 +10:00
abeck70
e36ab50040
OP-1838 altvario
...
Fixes and tidyup.
TODO:
1. Fix UI for sliders
2. Disable vtol tuning on stabi input
3. Altitude loss feedback
2015-04-23 22:49:12 +10:00
abeck70
443b3742cc
OP-1848 altvario
...
1. Build fixes
2. Additional UI components.
2015-04-23 21:54:20 +10:00
abeck70
0d77cd95d9
OP-1848 altvari0
...
1. build fixes
2. Updated ui to use updated uavo names in altitude settings that align to the naming in vtol settings
3. Moved call the thrust altvario to pre application of PIDs for 3d axes to allow for later coupling.
2015-04-23 21:13:00 +10:00
Steve Evans
79339d677f
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_update_minimosd_via_usb
2015-04-21 07:44:50 +01:00
Richard von Lehe
604585f74e
OP-1740: GetSet use enums. Need to pack the enums to retain byte compatibility.
2015-04-20 08:31:26 -05:00
Alessio Morale
ab36dcbdee
Merge remote-tracking branch 'origin/rel-15.02.02' into next
2015-04-20 14:54:07 +02:00
Alessio Morale
2571db4d96
Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next
2015-04-20 14:29:16 +02:00
abeck70
1e9bd43871
Merge branch 'next' into abeck/OP-1760-autotakeoff-squashed
2015-04-19 17:52:35 +10:00
Philippe Renon
77dfff1dac
Merge remote-tracking branch 'origin/samguns/OP-1808_make_flight_mode_optional' into next
2015-04-18 20:13:09 +02:00
Laurent Lalanne
fe04a9b63c
OP-1337 French translation update : Usage feedback
2015-04-18 13:55:50 +02:00
Laurent Lalanne
00ac0048ee
Merge remote-tracking branch 'origin/laurent/OP-1822_Heli_tab_refresh' into next
2015-04-18 11:33:42 +02:00
abeck70
8490cd2e73
OP-1760 autotakeoff fix pathdesired mode display in pfd
2015-04-18 16:17:46 +10:00
abeck70
71d1757bb0
OP-1760 autotakeoff
...
Fix the gcs defines for the pathaction modes.
2015-04-17 21:01:38 +10:00
m_thread
ddb2025108
Merge branch 'thread/OP-1777_Usage_statistics' into next
2015-04-17 08:26:02 +02:00
Richard von Lehe
0a7bd475f2
Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
2015-04-15 21:59:38 -05:00
Richard von Lehe
ef6cf262d5
OP-1740: GetSet use enums: tidy
2015-04-15 21:57:38 -05:00
James Duley
80f5a83b39
Merge branch 'parched/OP-1792_makefile_tidy' into next
2015-04-16 09:35:04 +12:00
David Ankers
5af7cea3f6
New versions of HK RTF models for cloudconfig
2015-04-13 20:08:23 +10:00
David Ankers
968e4557e1
Upgrade HK CCs
2015-04-13 20:07:27 +10:00
abeck70
a52969a76b
OP-1760 Autotakeoff
...
Squashed commit as code reviews impossible otherwise due to dependencing on OP-1696
2015-04-12 21:39:31 +10:00
James Duley
24defde93b
OP-1792 Makefile tidy: fix addCopyDirTarget on windows because directory timestamps are not updated when a file is modified
2015-04-11 23:20:30 +12:00
dwillis
2a08d6aa12
OP-1832 Add getDefaultInstance method to Java UAVObject template
2015-04-11 00:36:26 +01:00
James Duley
5ea8a990df
OP-1792 Makefile tidy: removed repeated Qt5OpenGL.dll
2015-04-09 13:01:23 +12:00
James Duley
af06960482
OP-1792 Makefile tidy: set dependencies for copydata by using new
...
functions addCopyFileTarget and addCopyDirTarget
2015-04-09 13:01:22 +12:00
Richard von Lehe
242d810c37
Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
2015-04-08 18:39:56 -05:00
Richard von Lehe
04497a5b77
enums sorted out in code and template, need to merge in latest
2015-04-08 18:38:49 -05:00
samguns
aaf635068d
OP-1808 Code change according to review results
2015-04-06 13:10:04 +08:00
Laurent Lalanne
9140ac5be2
OP-1337 French translation : First update for 15.05
2015-04-05 20:42:32 +02:00
Philippe Renon
d9708e79d6
OP-1796 updated PYTHON_DIR to qt-5.4.1
2015-04-05 11:47:59 +02:00
Laurent Lalanne
0b38791b3f
OP-1814 Add another reset button on battery panel using "time left" area
2015-04-05 00:54:21 +02:00
Laurent Lalanne
da4dc0e935
OP-1814 Reset consumed energy from PFD
2015-04-05 00:37:20 +02:00
Laurent Lalanne
805ee4e9b5
OP-1822 Check visibility and avoid false error that skip Mixer table to populate
2015-04-04 17:21:38 +02:00
Steve Evans
a0f180d393
OP-1803 Initial commit
2015-04-02 19:09:58 +01:00
samguns
5b76f4f96b
OP-1808 1.Make flight mode stick identification to be optional. 2. Refine some code.
2015-03-31 22:54:25 +08:00
James Duley
3a08642b40
OP-1792 Makefile tidy: Fix up the 'copydata.pro's to depend on FORCE, not be FORCE, and be aux template, not subdirs template.
2015-03-31 14:57:43 +13:00
James Duley
c245d18683
Merge remote-tracking branch 'dev/parched/OP-1700_copydata_doubles_if_called_twice' into next
2015-03-30 11:40:22 +13:00
m_thread
81050f557c
Uncrustify
2015-03-29 10:51:03 +02:00
Richard von Lehe
69fae1b977
Fix misspelling in function name
2015-03-28 23:27:07 -05:00
m_thread
62bd0115fe
OP-1809 Changed Min/Max limits
2015-03-28 15:31:05 +01:00
m_thread
4bd2e889ce
Merge remote-tracking branch 'origin/samguns/OP-1781_ground_input_channel_conf' into next
2015-03-28 12:33:24 +01:00
m_thread
32e670b8f0
Merge remote-tracking branch 'origin/next' into thread/OP-1763_CloudConfigs_outside_of_Wizard
2015-03-28 10:47:01 +01:00
Philippe Renon
009faf3559
Merge branch 'filnet/OP-1797_improve_gcs_workspace_layout_reactivity' into next
2015-03-26 21:57:46 +01:00
Philippe Renon
c84849fa4b
Merge branch 'filnet/OP_1798_gcs_ophid_is_too_verbose' into next
2015-03-26 21:57:18 +01:00
Richard von Lehe
f00b4a24d8
Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
2015-03-25 08:16:22 -05:00
Richard von Lehe
8e236c9954
OP-1740 UAVO_GetSetFunctionsTakeEnum - getting started
2015-03-25 08:03:35 -05:00
samguns
44ab63d696
OP-1781 Add the stash&restore operation vehicle type in systemsettings
2015-03-25 11:07:19 +08:00
Philippe Renon
859f601279
uncrustified
2015-03-22 23:16:17 +01:00
Philippe Renon
0cab4b0016
OP-1798 fixed recently converted OPHID_DEBUG taking argument
2015-03-22 21:04:50 +01:00
Alessio Morale
fbaf39229b
Merge remote-tracking branch 'origin/cyr/OP-1739_GNSS' into next
2015-03-22 20:25:51 +01:00
Philippe Renon
0236074de4
OP-1798 moved OPHID_DEBUG_ON define to ophid.pro
2015-03-22 15:47:03 +01:00
Philippe Renon
f8b3e6d3b1
OP-1798 cleaned up ophid.pro
2015-03-22 15:44:29 +01:00
Philippe Renon
a1a225f592
OP-1798 replaced qDebug() with OPHID_DEBUG()
2015-03-22 15:43:17 +01:00
m_thread
234ddf96bc
Merge
2015-03-22 09:08:14 +01:00
m_thread
b783d65c18
OP-1763 Removed a very bad key shortcut from Vehicle Setup Wizard.
...
Removed the word Wizard from tools menu inport/export templates.
2015-03-22 09:06:42 +01:00
m_thread
deeb7c3502
OP-1777 Added some more information from configuration to uploaded data.
2015-03-21 10:14:32 +01:00
m_thread
9a2584fae0
Merge remote-tracking branch 'origin/next' into thread/OP-1777_Usage_statistics
2015-03-21 09:23:56 +01:00
James Duley
5dffb1033f
OP-1700 copydata doubles if called twice: reused code for all platforms. Note this may make mixed case directories on windows
2015-03-21 15:35:11 +13:00
James Duley
0e631502d8
OP-1700 copydata doubles if called twice: tidy
2015-03-21 15:26:05 +13:00
James Duley
8261017ec6
OP-1700 copydata doubles if called twice:
...
Fix by rm -rf directory beforehand
2015-03-21 15:08:37 +13:00
abeck70
a4ea1f008b
OP-1696 uncrustify
2015-03-20 21:44:24 +11:00
abeck70
88494e2745
OP-1696 PathFollower rewrite in C++ and Landing Squashed commit of the following:
...
commit 580cd8addafadc3109b90b1fd183130ea8add7f2
Author: abeck70 <abeck70@icloud.com>
Date: Fri Mar 20 21:32:33 2015 +1100
OP-1696 Cleanup and bug fix
1. Code review cleanup
2. Fixed gps assist braking - the thrust limits in piddown were not being set.
commit 31ac4494f6e2bc5859f49d1f76f19fe3a4d32862
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 18 08:31:16 2015 +1100
OP-1696 fix initialisation of down pid control parameters
commit a7bd737459249530bde9546b8247dd45b40dced4
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 21:18:38 2015 +1100
OP-1769 Actuator fix from code review
commit 968172b8fb46c91b2611be4825e17faf2fa13411
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 21:01:11 2015 +1100
OP-1696 fixed ground pathfollower settings xml
commit 721c07b67a87911ed67d0b62aa658cfac6d3eb97
Merge: f556215 be9f4ae5c9b6faad44b315a9cfa6ba5f3958c31f96843325d04f4cd91102243deafed693fb2d53e15cac57e0a8b31c1385db7d605
2015-03-20 21:42:20 +11:00
samguns
1811b5f1fd
OP-1781 Make sure the vehicle type is correct, next step will be acro, heli tests and minor modifications.
2015-03-20 16:23:26 +08:00
Philippe Renon
b11bec1b5b
OP-1798 fixed unused args warnings in ophid
2015-03-19 22:25:32 +01:00
Philippe Renon
9631018320
OP-1798 reduced verbosity of ophid gcs plugin
2015-03-19 09:08:24 +01:00
Philippe Renon
306960fd2e
OP-1797 avoid unparenting gadgets when splitting/unsplitting/closing a gadget (see Jira for details)
2015-03-19 09:03:12 +01:00
Philippe Renon
505801c3a5
OP-1797 avoid redundant calls to loadConfiguration when setting a configuration on a gadget
2015-03-19 08:57:37 +01:00
samguns
f806a9d3f2
1. Revise according to review results. 2. Force one flight mode if 2CH ground vehicle was confirmed.
2015-03-19 15:06:22 +08:00
samguns
30a40140be
OP-1781 Minor changes according to review results. Leave the stick don't move and 1 flight mode issues to tomorrow
2015-03-18 23:00:17 +08:00
m_thread
1e1b97bd77
OP-1763 Added function to save template in default location.
2015-03-18 11:51:06 +01:00
samguns
8b1e7dee58
OP-1781 Uncrustify code
2015-03-18 15:47:10 +08:00
m_thread
48ef30850f
OP-1763 Moved and consolidated template folder code.
2015-03-18 08:36:56 +01:00
samguns
97fd54b25d
OP-1781 I think it's almost done, ready for a thoroughly test and review
2015-03-18 14:58:46 +08:00
