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 be9f4ae
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 20:52:01 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit f556215ddbd5a29b22c2e6124372d74a0d6b9a0f
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 20:51:22 2015 +1100
OP-1696 ground pathfollower fixes
commit 4584b22d6a2d33d3efb1cd11ac46804a5623a236
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 18:11:52 2015 +1100
OP-1696 Ground redesign
1. Move to new PID loop design
2. Prototype steering control
commit b70c3373646fa758ae30a59765b8a56df7d2fbeb
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 18:42:06 2015 +1100
OP-1696 ground pathfollower added missing call to update velocity state
commit a282bfb14dffcd486466b60be3100d26c11649ef
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 17:22:02 2015 +1100
OP-1696 ground pathfollower improvements
commit f56ea4f9b101415e32e4464e51e087ee350be969
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 07:44:01 2015 +1100
OP-1696 remove unused PID controller in ground for vertical
commit 6424aa0a84c3718a5a7b51fab1c9e04587d325b8
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 21:40:58 2015 +1100
OP-1696 Initialise vtolemergencyfallback variables
commit 5d6110499bb06fe9b397e09dea5aafe994f03d13
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 21:30:21 2015 +1100
OP-1696 vtolflycontroller segv fixed and uncrustify
commit bef23ea3dc2b5aff5b9b8713802586719b8f68cf
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 20:50:05 2015 +1100
OP-1783 PathPlanner
Instead of config alarm if no pathplan, simply continue to alarm pathplan, but allow normal arming and flight in other modes. If pathplan enabled, simply enter position hold.
commit 370f1747209cca7c01c071a43224ad83b04bdd55
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 20:48:22 2015 +1100
OP-1769 Ground code review comment
1. Remove idx1 < 0 check not needed
2. Should return abs_input in the corner case that curve is "invalid".
commit 01973c656d783e035ad823c267d3387bf473eebe
Merge: be07d12 5c9b6fa
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 12:17:31 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit be07d125f42b5ca1aabce0f5c0fcf592e8cddf98
Merge: 44afdc7 ad44b31
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 21:55:52 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 44afdc77987049dc58cdf42e3be88b7eae38de02
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 19:35:55 2015 +1100
OP-1696 fix startup
Fix initialisation and void use of pios_malloc at startup
commit 962f5f75756883cec6726c0347310d60264f6989
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 18:48:04 2015 +1100
OP-1696 undo changes to make file
commit 7fa71d5c614d492cb4026312672068f92a4bcd3e
Merge: 672732e 5a9cfa6
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 18:06:59 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 672732e95d555946300ef5093f687f3fa88bfd3a
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 11 12:59:44 2015 +1100
OP-1696 code review comments
commit 73b295d6515f2489b3b3a61459c975b0c37afe3d
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 11 12:47:24 2015 +1100
OP-1696 code review comments
commit 524b72f537fe922bf3c4385b418872f13819a5cf
Merge: 6beef01 ba5f395
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 10 23:19:06 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 6beef01476d06598652a10de4857e6ae55015417
Merge: 100cf33 8c31f96
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 7 16:50:32 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 100cf335d187fe696d3678371b194fc3044a1c7e
Author: Alex Beck <abeck70@icloud.com>
Date: Thu Mar 5 22:32:30 2015 +1100
OP-1696 simposix c++ compilation fix
commit 9ebf846d1ec8fef30ffc1204546fc5dc648ec10b
Author: Alex Beck <abeck70@icloud.com>
Date: Thu Mar 5 21:35:39 2015 +1100
OP-1696 fix simposix c++ compile of pathfollower
commit a86b4b1db46dba569739587ee57b03460381ebab
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 5 18:03:51 2015 +1100
OP-1696 resolve linux build issue
commit 1d7695f81293534bc17f69b0fcd9de3876867f6a
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 18:10:09 2015 +1100
OP-1696 Return to Base & Land implemented
Enabled via FlightModeSettings ReturnToBaseNextCommand = LAND
commit 4e5ca807b18a40ea60c05c1b46f738462595a6b2
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 16:38:06 2015 +1100
OP-1696 reduce memory footprint by only allocating controllers required for a particular frame type
commit 78e8f559cd25ffaeac68b563e25d1ad357205fd6
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 13:51:05 2015 +1100
OP-1696 move fsm initialisation to controller implementations
commit 848c78a84e5c7e11b2da953c9d9549b11fc5b1d8
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 13:27:11 2015 +1100
OP-1696 reduce memory through re-use of pointers to data objects in base class.
commit bc8794601142055942910ba9f938c03c8a3ca547
Merge: 24bc3de 843325d
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 22:06:01 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 24bc3de6155a74850b17ca7706f6b592923e027c
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 17:56:12 2015 +1100
OP-1696 update gcs path planner options to align to new modes
commit dc659891882ea0624a6436550425c54b347f4101
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 13:51:55 2015 +1100
OP-1696 pathfollower class renaming and uncrustify
commit af19d114b8e0ff23159bdaca37e5f5bf1c1f8beb
Merge: b07c1fd 04f4cd9
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 21:47:12 2015 +1100
Merge branch 'rel-15.02' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit b07c1fdd0544a555678bc7a8510cd92861f17e46
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 21:27:27 2015 +1100
OP-1696 remainder of changes to integrate drive and fly objectives
commit c824c53cf30889a468ecb25ae3d705fa011b23ba
Merge: b89751c 1102243
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 17:06:13 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit b89751caa5d6dc06e1e20391aa4e12b5484056d4
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 17:04:27 2015 +1100
OP-1696 merge fly and drive pathdesired/action objectives
commit c463132cb7da5cdf9fc5395ae0650b081bc9fb55
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 1 10:25:29 2015 +1100
OP-1696 merge ground pathfollower and refactored into C++
commit 6ed504b32f9e502e4f02d50b9e85ba91591417ba
Merge: bcf245e deafed6
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 27 18:12:32 2015 +1100
Merge branch 'next' into corvuscorax/OP-1642_tank-support
Conflicts:
flight/modules/PathFollower/pathfollower.c
shared/uavobjectdefinition/vtolpathfollowersettings.xml
commit bcf245e08c3348f2e6e5eddceee6d6cc268bdc23
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 19:45:29 2014 +0100
OP-1642 added new uavobject to discovery target, too
commit 6b9e8a7d7dad0739b4ffd2ce7f2f78ed4f597077
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 17:58:18 2014 +0100
OP-1642 added very simple path control for ground vehicles
commit e8d8440e049c06158e7fc542627fac6420abaf65
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 17:17:09 2014 +0100
OP-1642 added new settings uavobject for tank path follower
commit 71dd726eb5b52614b417236c22e8a5cc3a487faf
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 27 18:05:10 2015 +1100
OP-1696 align pathaction to pathdesired
commit 8a88af83be457aafbb63e4f94fad3b1cd54264ca
Author: abeck70 <abeck70@icloud.com>
Date: Thu Feb 26 08:06:34 2015 +1100
OP-1696 fixed wing control refactored and compiling
commit fd9850b5e5680f5b422dbc468a94c5ec4b6dd518
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 25 17:47:19 2015 +1100
OP-1696 Removed vtol stuff from pathfollower.cpp after having replaced it with class impl
commit 9127d8d6d8c345c5bbf8622ce4e5eb76b03d1356
Merge: 4054c73 93fb2d5
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 25 13:09:06 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 4054c73ac98b54188a0a5367c5ca913b7fee6a89
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 24 12:29:28 2015 +1100
OP-1696 fix compile errors
commit b398db3d4de8cd621a059da1f0dbb00868be0fb9
Merge: 94c795a 3e15cac
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 24 12:06:35 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 94c795af386cf0f1072a88e99a80cb1080bf85e7
Merge: d2115de 57e0a8b
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 23 17:54:33 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
Conflicts:
flight/modules/Sensors/sensors.c
make/common-defs.mk
commit d2115dee4e8e9b6a02f7b7700e4715480a56b18f
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 23 14:35:02 2015 +1100
OP-1696 preliminary checkin for refactor of fly
TODO:
1. Finalise and test fly, brake
2. Remove patfhollower vtol fly
3. Rename all objects adding vtol in name
commit 95804b1d591d194cce3596187c74cdb2dd0d192f
Merge: 58cebb0 31c1385
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 21 22:10:03 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 58cebb0658deaece1555cfa24e50f1b86fd68c96
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 21 22:09:29 2015 +1100
OP-1696 refactor neutral thrust and add pos hold implementation
commit 2c3cadfef3de9e092bd66bbabc58ac7847aca7e4
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 20 18:32:11 2015 +1100
OP-1696 start of refactor of braking
commit 991c2124e834f3432f5e34c5c9f4966cb42a7be3
Merge: 1ab5798 db7d605
Author: abeck70 <abeck70@icloud.com>
Date: Thu Feb 19 12:17:54 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 1ab579865f04aeaa5899f5065a983de29074e025
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 18 21:29:01 2015 +1100
OP-1696 Rewrote velocity roam into new C++ OO architecture
With use of new PID controller for NE.
commit 03edb049f06bf60054dce36a5b8b301a397284c4
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 18 12:19:17 2015 +1100
OP-1696 Start of refactoring of VelocityRoam implementation in PathFollower
Also TODOs:
1. To support pathplanner, remove all references to FlightStatus object and add more fields to PathDesired
2. Refactor Braking to use C++
3. Test and optimise Velocity Roam
4. Add more config options to Landing. For example disable disarming. And add more setting objects.
5. Consider moving all landing settings to one object.
commit 1f5dba821d4535a9a14f333efdeec1af5afcc281
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 16 22:51:31 2015 +1100
OP-1696 Landing tuning
commit 5133956c717fba871dd5700333806e298038a3d0
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 16 21:05:06 2015 +1100
OP-1696 Landing
Multiple fixes
commit cf22055ecb8eb7304174c730f249a2332ebc599b
Author: abeck70 <abeck70@icloud.com>
Date: Sun Feb 15 20:52:29 2015 +1100
OP-1696 Add PIDStatus debug object
commit bc13d732601e7c7cb48db17f1a75b33cc96c0c34
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 14 15:53:16 2015 +1100
OP-1696 Landing sanity tested
commit 6e913076c1dfcb8b90153e9eca8acf6c9e51f293
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 14 11:16:06 2015 +1100
OP-1696 completed refactoring
1. Completed refactoring of NE and Thrust control
2. Fixed velocity roam
TODO Tuning and testing
commit 63b62fbd0ac105029e54163b98c3beebc2d73c3a
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 13 08:54:23 2015 +1100
OP-1696 New PID Controller and refactoring of PID implementation for thrust management
commit 7474331529477d0badd2ef0d609c84c556be9cec
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 10 16:39:44 2015 +1100
OP-1696 Landing Refactor Thrust PID Loop for landing
commit 904ab2a9241e40c19da6a1508b4ce5243c75d7a3
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 9 22:13:39 2015 +1100
OP-1696 Uncrustify
commit b3d30e298d8a0343782a29bc91be6677105b325e
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 9 22:05:05 2015 +1100
OP-1696 Create new OO design
Added PathFollowerControl which has an Landing implementation. The landing implementation runs its own set of PIDs. And interfaces to the FSM for Landing.
commit 1ffd8d67cf7310c1c18c90f3ba18b08221d185a3
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 7 18:04:42 2015 +1100
OP-1696 Upgrade arm tools
commit 3df01f97021d13694027b92ba0b13cc9fe70d437
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 21:52:38 2015 +1100
OP-1696 Landing uncrustify and start of refactoring landing to make more use of FSMLand
commit 7a753b65fb69d52c89875b9a182ef5210ee8ef2d
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 15:08:29 2015 +1100
OP-1696 Landing: fix compilation of all exes
commit 692459874acf2b7ae07aa3ab88a2c78a09f26ee6
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 14:45:06 2015 +1100
OP-1696 Landing startup fixes
commit 9851f29b9238a969efd0110f01a4fad6bdbc5a5d
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 10:21:52 2015 +1100
OP-1696 Landing pathfollower CPP refactoring
commit 9b3a54d41f14f07cd0d78426026d12ae9ac4e5b5
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 4 13:02:44 2015 +1100
OP-1696 Moved to FSMLand class and fixed CPP problems
1. Additional methods, compile options, and need to have main as a cpp to solve various link issues when using static constructors but to avoid adding unnecessary libs.
commit 7ebe739bfdb4e0f598f4408c1488f01bc033c044
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 3 22:17:08 2015 +1100
OP-1696 Initial Landing prototype
Proof of concept. To be refactored into C++
commit 11d6754b9766efb76cc1cd57e9894badaf33ef2d
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 3 22:13:10 2015 +1100
OP-1696 CPP Enablement
revo c++
Enable optional revo C++ support:
1. Set USE_CXX to enable compliation and linkage of C++ source code
2. Disables rtti and exceptions
3. operator new and delete call pios malloc/free
4. Static constructor invocation supported
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
m_thread
8eedfcec49
OP-1763 Added import functionality to the template dialog.
...
Added new tab and gui with template selector widget to the export
template dialog.
Renamed dialog menu to export/import vehicle wizard settings.
Added code to upload and save template data to board.
2015-03-18 00:32:42 +01:00
m_thread
2b0d357df3
OP-1763 Extracted template selector functionality as a widget for reuse.
2015-03-17 23:13:29 +01:00
m_thread
5b08f02aae
Merge remote-tracking branch 'origin/next' into thread/OP-1763_CloudConfigs_outside_of_Wizard
2015-03-17 22:25:10 +01:00
m_thread
52984119f0
OP-1777 Moved Qt include statement.
2015-03-17 22:18:14 +01:00
samguns
22e0b88a8f
OP-1781 Add UI stuff and basic definitions
2015-03-17 15:51:06 +08:00
m_thread
4c58675fc3
OP-1777 Adding dependecy to VersionInfo lib.
2015-03-16 21:43:06 +01:00
m_thread
dda065db64
OP-1777 Attempting to fix build issues in Win and Mac builds.
2015-03-16 21:37:46 +01:00
m_thread
e4e3125e72
OP-1777 Uncrustify
2015-03-16 20:41:38 +01:00
m_thread
6a89427aa8
OP-1777 Added handling of network issues.
...
Changed local time to timezone.
Re-factored some functions.
2015-03-16 20:38:56 +01:00
m_thread
14f2bb6ce9
OP-1777 Added caching of collected data hash to avoid sending duplicate redundant data.
...
Changed some text.
Changed nag-dialog text to use html for formatting to make it easier to
translate and maintain.
Removed timestamp from hash.
2015-03-16 14:53:37 +01:00
m_thread
d948b1ca1c
OP-1777 Added caching of collected data hash.
2015-03-16 14:51:36 +01:00
m_thread
8bf717fec2
OP-1777 Changed some text.
2015-03-16 14:51:04 +01:00
m_thread
efccabfe8f
OP-1777 Renamed some parameters.
2015-03-15 23:21:43 +01:00
m_thread
f1e1507b06
OP-1777 Added more settings information.
...
Re-factored field access code.
Added hash for integrity checks.
2015-03-15 12:18:14 +01:00
abeck70
5c9b6fac29
OP-1769 uncrustify
2015-03-14 12:15:59 +11:00
abeck70
616cd466d2
OP-1769 align tank throttle curve
2015-03-14 10:04:54 +11:00
m_thread
0a87b30572
OP-1777 Fixed a compiler error.
2015-03-13 07:21:27 +01:00
m_thread
daad175c52
OP-1777 Added some board specific settings information.
2015-03-13 00:15:33 +01:00
m_thread
6c8f5a35ed
Merge remote-tracking branch 'origin/next' into thread/OP-1777_Usage_statistics
2015-03-12 23:04:14 +01:00
abeck70
ea47436091
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1769-Ground
2015-03-12 22:34:43 +11:00
abeck70
ad44b313fc
Release 15.02 Merge branch 'master' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h
2015-03-12 21:45:00 +11:00
abeck70
d4c4c68131
Release 15.02
...
Update whatsnew and uncrustify.
2015-03-12 21:33:30 +11:00
abeck70
8defea867b
OP-1769 ground support wizard alignment with flight side code
...
1. Moved to using throttle curve 1 which is meant to be primary for throttle. Curve1 can support reversible motor mixer so ok.
2. Changed default throttle1 curve to linear 0-1 representing x>0. For x < 0 the same throttle curve is applied symmetrically to the reverse direction.
3. Allowed in UI both throttle curves to be visible. Throttle curve 2 manually can be used to mix other inputs to affect motor. E.g. slow down in turning.
2015-03-12 08:46:43 +11:00
m_thread
779a1823e2
OP-1777 Changed some encoding. Changed parameter names to be meaningful.
2015-03-11 21:03:32 +01:00
m_thread
a3f9d42146
OP-1777 Adding some text to disclaimer
2015-03-11 14:14:54 +01:00
m_thread
c186a55243
OP-1777 Updated some text.
2015-03-11 13:53:59 +01:00
m_thread
4d780b0ffd
OP-1777 Adding disclaimer dialog and setting to hide it.
2015-03-11 13:36:28 +01:00
abeck70
1d7059d4d7
OP-1769 Ground support: Align wizard to flight side code implementation
2015-03-11 22:07:57 +11:00
m_thread
3653457b28
OP-1777 Adding some more info and checking if we should send any usage data at all.
2015-03-11 10:19:28 +01:00
abeck70
9b726777ea
Updated cloud configs
2015-03-11 13:55:02 +11:00
m_thread
867742d102
OP-1777 Adding usage tracker plugin and basic functionality.
2015-03-11 01:09:19 +01:00
m_thread
f5811e7747
OP-1777 Adding settings to general settings panel.
2015-03-10 22:20:08 +01:00
m_thread
bb880b451e
OP-1763 Moving code to widget from form.
2015-03-10 19:48:56 +01:00
Laurent Lalanne
8727720026
Merge remote-tracking branch 'origin/laurent/OP-1337_15.02' into rel-15.02
2015-03-09 23:05:40 +01:00
Laurent Lalanne
e8a9f698a3
OP-1337 translations updates - rel-15.02
2015-03-09 23:04:04 +01:00
Laurent Lalanne
56fbf1b5ca
Typo s/us/µs/
2015-03-09 22:23:58 +01:00
Laurent Lalanne
12a81827f8
Merge remote-tracking branch 'origin/rel-15.02' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.h
2015-03-09 22:21:55 +01:00
Laurent Lalanne
0e2fb2231e
OP-1764 Add missing files and changes from review
2015-03-09 13:08:56 +01:00
abeck70
d94b015ed1
OP-1764 spelling mistake
2015-03-09 22:36:54 +11:00
abeck70
2b12b18167
OP-1764 Add explanation html for the new throttle/collective input channel min/max range check
2015-03-09 22:27:25 +11:00
abeck70
d22cb21022
Merge branch 'laurent/OP-1764_Rc_input_ranges' into abeck/OP-1764
2015-03-09 21:26:20 +11:00
m_thread
389577e62a
OP-1763 Adding Widget for template selection gui.
2015-03-08 09:33:54 +01:00
m_thread
54b00dd3e6
OP-1768 Added PWMSync to warning text
2015-03-08 09:26:59 +01:00
m_thread
efd66c375e
Merge branch 'thread/OP-1747_Max_Output_Rates' into rel-15.02
2015-03-08 09:22:12 +01:00
Laurent Lalanne
4b640c5d1d
OP-1764 Add Throttle range check
2015-03-08 02:20:57 +01:00
abeck70
65a3c858dd
rel-15.02 updated cloudconfigs from failsafe
2015-03-08 08:44:53 +11:00
abeck70
7f5d4082d3
rel-15.02 remove all cloudconfigs
2015-03-08 08:42:56 +11:00
Laurent Lalanne
b0a7a19a94
Uncrustify
2015-03-07 12:52:06 +01:00
Laurent Lalanne
fba3281a8c
Merge remote-tracking branch 'origin/laurent/OP-1734_Wizard_show_servo_movement' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
2015-03-07 12:43:03 +01:00
abeck70
8c31f96dd7
Merge branch 'rel-15.02' RC4 into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
2015-03-07 16:47:46 +11:00
samguns
e6f5b5c50f
Merge branch 'samguns/zh_CN_GCS' into rel-15.02
2015-03-06 10:34:16 +08:00
samguns
d13848a921
OP-1748 one final revision for 15.02
2015-03-06 07:56:56 +08:00
m_thread
840cc86a8d
Uncrustify
2015-03-06 00:37:36 +01:00
m_thread
6fb19b99cb
Merge branch 'thread/OP-1756_Multi_Motor_Calibration' into next
2015-03-06 00:22:31 +01:00
m_thread
9aaf1d6984
OP-1761 Fixes to summary page and connection diagram.
2015-03-06 00:18:00 +01:00
m_thread
1a21b8fce6
OP-1761 Fixing a type
2015-03-06 00:10:21 +01:00
m_thread
25c52d6430
OP-1761 Changed code to not allow PWMSync to be configured if CC or CC3D and > Hexa
2015-03-06 00:05:38 +01:00
m_thread
d4c562eb11
OP-1747 Updated code in SetupWizard to use different max rate outputs for pwm and OneShot125.
2015-03-05 21:45:08 +01:00
Erik Gustavsson
b63cbebc40
OP-1739 Add color coding for QZSS SVs (classify as SBAS), adjust GPS SV
...
color to better match the SNR widget
2015-03-04 19:12:46 +01:00
Erik Gustavsson
ccbe05dff5
Merge branch 'next' into cyr/OP-1739_GNSS
2015-03-04 18:07:31 +01:00
samguns
d77c317e37
Revise translations after testing in 15.02-RC3
2015-03-04 09:56:11 +08:00
samguns
08564a739f
Merge branch 'rel-15.02' into samguns/zh_CN_GCS
2015-03-04 08:45:44 +08:00
samguns
ae234e3fa2
Revise some translations after testing in 15.02-RC2
2015-03-04 08:44:29 +08:00
m_thread
a253884edb
Merge branch 'rel-15.02' of ssh://git.openpilot.org/OpenPilot into rel-15.02
2015-03-03 23:23:49 +01:00
m_thread
779415c384
OP-1759 Added limits to field. Changed attached attribute in .ui file to enable limits.
2015-03-03 23:00:52 +01:00
abeck70
1557570b4d
OP-1745 Updated cloudconfigs from failsafe
2015-03-04 07:20:31 +11:00
Laurent Lalanne
843325d44e
GUI input / helicopter tab : Define first tab as default
2015-03-03 00:40:50 +01:00
Laurent Lalanne
a61891cd2e
Fixed Flight Mode layout
2015-03-03 00:09:50 +01:00
Laurent Lalanne
bce05a2312
Fixed Stab layout
2015-03-02 23:32:04 +01:00
m_thread
f1b213834a
OP-1758 Backed out Windows changes due to issues with board detection in certain situations.
2015-03-02 22:26:52 +01:00
m_thread
f3ee2f4845
Fixed layout
2015-03-02 22:22:41 +01:00
abeck70
109b8cd551
OP-1758 usb hidapi upgrade
2015-03-02 22:06:23 +11:00
samguns
45f589627e
Merge branch 'rel-15.02' into samguns/zh_CN_GCS
2015-03-02 10:03:09 +08:00
m_thread
7d62152a98
OP-1756 Removed obsolete concect
2015-03-01 23:09:56 +01:00
m_thread
1c4a861211
OP-1756 Uncrustify
2015-03-01 22:50:14 +01:00
m_thread
4046439433
OP-1756 Added code to set the actuator command for multiple channels at the same time from calibration.
2015-03-01 22:48:35 +01:00
Erik Gustavsson
9351d822c5
Normalize line endings
2015-03-01 19:54:35 +01:00
m_thread
f2c80d7d06
OP-1756 Added code to properly handle next and back when calibrating all motors at the same time.
2015-03-01 17:45:19 +01:00
Erik Gustavsson
3a8c13a365
OP-1739 Add BeiDou SV display to GCS
2015-03-01 17:39:05 +01:00
m_thread
8d6070d674
OP-1756 Added information of the types of the svg elements to be able to enable correctly.
2015-03-01 12:31:57 +01:00
m_thread
662f1fb3f3
OP-1756 Added handling for svg item highlight when calibrating all motors.
2015-03-01 12:12:50 +01:00
Erik Gustavsson
a806eb6f36
OP-1739 Add GLONASS support to GPS constellation widget
2015-03-01 08:32:01 +01:00
m_thread
c2c5d41311
Merge remote-tracking branch 'origin/next' into thread/OP-1756_Multi_Motor_Calibration
2015-02-28 23:35:16 +01:00
Laurent Lalanne
1102243eae
Merge remote-tracking branch 'origin/laurent/OP-1752_SystemHealth_sub_alarms' into rel-15.02
2015-02-28 15:08:51 +01:00
m_thread
ed6b9a4e9c
Goto final/end page automatically after successfull save in wizard.
2015-02-28 14:46:38 +01:00
m_thread
f11c03d34a
OP-1754 Fixing PWMSync PPM connection diagram setup.
2015-02-28 14:38:26 +01:00
Laurent Lalanne
190590e1a1
Merge branch 'thread/15.02-RC1_fixes' of ssh://git.openpilot.org/OpenPilot into thread/15.02-RC1_fixes
2015-02-28 14:16:49 +01:00
Laurent Lalanne
1c13531043
OP-1754 Connection diagram : Fix regression, rename GPS, airspeed sensors and rcinput objects
2015-02-28 14:12:46 +01:00
m_thread
3cb1357069
OP-1756 Added checkbox to ui file.
2015-02-28 14:07:47 +01:00
Laurent Lalanne
789b71880c
OP-1752 Typo
2015-02-28 13:02:13 +01:00
m_thread
c358f975c4
Uncrustify
2015-02-28 09:47:23 +01:00
m_thread
b9ca2b92eb
Merge remote-tracking branch 'origin/rel-15.02' into thread/15.02-RC1_fixes
2015-02-28 09:46:09 +01:00
Erik Gustavsson
aa99c56eb3
OP-1739 Add separate color for GLONASS sats. Fix sat PNR > 127.
2015-02-28 08:09:45 +01:00
m_thread
a8b6e1f959
OP-1755 Added additional location for cloudconfigs.
2015-02-28 00:14:51 +01:00
Laurent Lalanne
39ed1b0b45
Merge remote-tracking branch 'origin/laurent/OP-1466_Heli_config_tab' into rel-15.02
2015-02-27 23:05:47 +01:00
m_thread
3ee481fd2a
OP-1754 Fixing PWMSunc PPM setting.
2015-02-27 23:05:10 +01:00
Laurent Lalanne
fcb36b3639
OP-1466 Cosmetic changes to Svg / Layer order
2015-02-27 22:37:35 +01:00
samguns
3d3c08dd3e
OP-1751 add more translation for next release
2015-02-27 16:09:11 +08:00
Laurent Lalanne
799b4d6240
OP-1466 Add tr()
2015-02-27 05:28:27 +01:00
Laurent Lalanne
19cbd26465
OP-1466 Keep previous Mixer table when user choose Custom Settings - Reuse M_PI from math.h
2015-02-27 05:22:20 +01:00