Merge pull request #3555 from makrebs/mocklink

Save vehicle type for APM mock link

Merge pull request #3555 from makrebs/mocklink
Save vehicle type for APM mock link
278d9814 · Don Gagne · GitHub · 815b465d · 2096d5e3 · 278d9814
Commit 278d9814 authored Jun 13, 2016 by Don Gagne Committed by GitHub Jun 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

MockLinkSettings.qml src/ui/preferences/MockLinkSettings.qml +7 -2

No files found.
--- a/src/ui/preferences/MockLinkSettings.qml
+++ b/src/ui/preferences/MockLinkSettings.qml
@@ -24,9 +24,14 @@ Item {

    function saveSettings() {
        if(px4Firmware.checked)
-            subEditConfig.firmware = 12
-        else if(apmFirmware.checked)
+            subEditConfig.firmware = 12         // Hardcoded MAV_AUTOPILOT_PX4
+        else if(apmFirmware.checked) {
            subEditConfig.firmware = 3
+            if(planeVehicle.checked)
+                subEditConfig.vehicle = 1       // Hardcoded MAV_TYPE_FIXED_WING
+            else
+                subEditConfig.vehicle = 2       // Hardcoded MAV_TYPE_QUADROTOR
+        }
        else
            subEditConfig.firmware = 0
        subEditConfig.sendStatus = sendStatus.checked