From adbe27ac89fccfaa119e72abb4055b46ff2ac2c9 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 18 Aug 2016 15:56:27 -0700
Subject: [PATCH] Fixes found by unit test

---
 src/FirmwarePlugin/APM/MavCmdInfoCommon.json    | 5 +++++
 src/FirmwarePlugin/PX4/MavCmdInfoCommon.json    | 5 +++++
 src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
index f7a29ac14..845b4cc51 100644
--- a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
+++ b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
@@ -4,6 +4,11 @@
     "version": 1,
 
     "mavCmdInfo": [
+        {
+            "id":           16,
+            "comment":      "MAV_CMD_NAV_WAYPOINT",
+            "paramRemove":  "2"
+        },
         {
             "id":                   84,
             "comment":              "MAV_CMD_NAV_VTOL_TAKEOFF",
diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json b/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
index 059e49a77..161650430 100644
--- a/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
+++ b/src/FirmwarePlugin/PX4/MavCmdInfoCommon.json
@@ -4,5 +4,10 @@
     "version": 1,
 
     "mavCmdInfo": [
+        {
+            "id":           16,
+            "comment":      "MAV_CMD_NAV_WAYPOINT",
+            "paramRemove":  "2,3,4"
+        }
     ]
 }
diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
index d66a21757..b595e720f 100644
--- a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
+++ b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
@@ -4,11 +4,6 @@
     "version": 1,
 
     "mavCmdInfo": [
-        {
-            "id":           16,
-            "comment":      "MAV_CMD_NAV_WAYPOINT",
-            "paramRemove":  "3,4"
-        },
         {
             "id":           21,
             "comment":      "MAV_CMD_NAV_LAND",
-- 
2.22.0