Fix Takeoff.Pitch/Yaw usage by vehicle type

4 years ago · b9566e443b
3 changed files with 14 additions and 16 deletions
--- a/src/MissionManager/MavCmdInfoCommon.json
+++ b/src/MissionManager/MavCmdInfoCommon.json
@ -196,20 +196,7 @@
				@@ -196,20 +196,7 @@
            "specifiesCoordinate":  true,
            "isTakeoffCommand":     true,
            "friendlyEdit":         true,
-            "category":             "Basic",
-            "param1": {
-                "label":            "Pitch",
-                "units":            "deg",
-                "default":          15,
-                "decimalPlaces":    2
-            },
-            "param4": {
-                "label":            "Yaw",
-                "units":            "deg",
-                "nanUnchanged":     true,
-                "default":          null,
-                "decimalPlaces":    2
-            }
+            "category":             "Basic"
        },
        { "id": 23, "rawName": "MAV_CMD_NAV_LAND_LOCAL", "friendlyName": "Land local" },
        { "id": 24, "rawName": "MAV_CMD_NAV_TAKEOFF_LOCAL", "friendlyName": "Takeoff local" },
--- a/src/MissionManager/MavCmdInfoFixedWing.json
+++ b/src/MissionManager/MavCmdInfoFixedWing.json
@ -22,7 +22,12 @@
				@@ -22,7 +22,12 @@
        {
            "id":           22,
            "comment":      "MAV_CMD_NAV_TAKEOFF",
-            "paramRemove":  "4"
+            "param1": {
+                "label":            "Pitch",
+                "units":            "deg",
+                "default":          15,
+                "decimalPlaces":    2
+            }
        }
    ]
 }
--- a/src/MissionManager/MavCmdInfoMultiRotor.json
+++ b/src/MissionManager/MavCmdInfoMultiRotor.json
@ -22,7 +22,13 @@
				@@ -22,7 +22,13 @@
        {
            "id":           22,
            "comment":      "MAV_CMD_NAV_TAKEOFF",
-            "paramRemove":  "1"
+            "param4": {
+                "label":            "Yaw",
+                "units":            "deg",
+                "nanUnchanged":     true,
+                "default":          null,
+                "decimalPlaces":    2
+            }
        },
        {
            "id":           31,