Merge pull request #7346 from DonLakeFlyer/LoiterNaN

Hack around ArduPilot problems with unsupported NaN in Loiter commands

Merge pull request #7346 from DonLakeFlyer/LoiterNaN
Hack around ArduPilot problems with unsupported NaN in Loiter commands
bccb07d7 · Don Gagne · GitHub · 9285dba5 · 5e49ead0 · bccb07d7
Unverified Commit bccb07d7 authored Apr 05, 2019 by Don Gagne Committed by GitHub Apr 05, 2019
Show whitespace changes
Inline Side-by-side

Showing with 36 additions and 5 deletions

MavCmdInfoCommon.json src/FirmwarePlugin/PX4/MavCmdInfoCommon.json +33 -0

MavCmdInfoCommon.json src/MissionManager/MavCmdInfoCommon.json +3 -5

No files found.
--- a/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
+++ b/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
@@ -9,6 +9,39 @@
            "comment":      "MAV_CMD_NAV_WAYPOINT",
            "paramRemove":  "2,3"
        },
+        {
+            "id":                   17,
+            "comment":              "MAV_CMD_NAV_LOITER_UNLIM",
+            "param4": {
+                "label":            "Heading",
+                "units":            "radians",
+                "nanUnchanged":     true,
+                "default":          null,
+                "decimalPlaces":    2
+            }
+        },
+        {
+            "id":                   18,
+            "comment":              "MAV_CMD_NAV_LOITER_TURNS",
+            "param4": {
+                "label":            "Heading",
+                "units":            "radians",
+                "nanUnchanged":     true,
+                "default":          null,
+                "decimalPlaces":    2
+            }
+        },
+        {
+            "id":                   19,
+            "comment":              "MAV_CMD_NAV_LOITER_TIME",
+            "param4": {
+                "label":            "Heading",
+                "units":            "radians",
+                "nanUnchanged":     true,
+                "default":          null,
+                "decimalPlaces":    2
+            }
+        },
        {
            "id":           21,
            "comment":      "MAV_CMD_NAV_LAND",

--- a/src/MissionManager/MavCmdInfoCommon.json
+++ b/src/MissionManager/MavCmdInfoCommon.json
@@ -75,8 +75,7 @@
            "param4": {
                "label":            "Heading",
                "units":            "radians",
-                "nanUnchanged":     true,
+                "default":          0,
-                "default":          null,
                "decimalPlaces":    2
            }
        },
@@ -102,8 +101,7 @@
            "param4": {
                "label":            "Heading",
                "units":            "radians",
-                "nanUnchanged":     true,
+                "default":          0,
-                "default":          null,
                "decimalPlaces":    2
            }
        },
@@ -130,7 +128,7 @@
            "param4": {
                "label":            "Heading",
                "units":            "radians",
-                "nanUnchanged":     true,
+                "default":          0,
                "decimalPlaces":    2
            }
        },