From 9d1378746a75b5afb0fd924197101c489238a65c Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 27 Feb 2015 18:43:57 -0800
Subject: [PATCH] Remove support for old param sets

---
 src/AutoPilotPlugins/PX4/SensorsComponent.h              | 1 -
 src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml     | 9 +++------
 .../PX4/SensorsComponentSummaryFixedWing.qml             | 9 +++------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.h b/src/AutoPilotPlugins/PX4/SensorsComponent.h
index 87f8e4d10..00b0d6e97 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.h
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.h
@@ -55,7 +55,6 @@ public:
 private:
     const QString   _name;
     QVariantList    _summaryItems;
-    bool            _paramsV1;
 };
 
 #endif
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
index 2c1f31420..5148b38c8 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
@@ -20,8 +20,7 @@ Column {
         QGCLabel {
             horizontalAlignment: Text.AlignRight;
             width: parent.width - compass.contentWidth;
-            property bool setupRequiredValue: autopilot.parameters["SENS_MAG_XOFF"] ? autopilot.parameters["SENS_MAG_XOFF"].value : autopilot.parameters["CAL_MAG0_ID"].value
-            text: setupRequiredValue  == 0 ? "Setup required" : "Ready"
+            text: autopilot.parameters["CAL_MAG0_ID"].value  == 0 ? "Setup required" : "Ready"
         }
     }
 
@@ -32,8 +31,7 @@ Column {
         QGCLabel {
             horizontalAlignment: Text.AlignRight;
             width: parent.width - gyro.contentWidth;
-            property bool setupRequiredValue: autopilot.parameters["SENS_GYRO_XOFF"] ? autopilot.parameters["SENS_GYRO_XOFF"].value : autopilot.parameters["CAL_GYRO0_ID"].value
-            text: setupRequiredValue  == 0 ? "Setup required" : "Ready"
+            text: autopilot.parameters["CAL_GYRO0_ID"].value  == 0 ? "Setup required" : "Ready"
         }
     }
 
@@ -44,8 +42,7 @@ Column {
         QGCLabel {
             horizontalAlignment: Text.AlignRight;
             width: parent.width - accel.contentWidth;
-            property bool setupRequiredValue: autopilot.parameters["SENS_ACC_XOFF"] ? autopilot.parameters["SENS_ACC_XOFF"].value : autopilot.parameters["CAL_ACC0_ID"].value
-            text: setupRequiredValue  == 0 ? "Setup required" : "Ready"
+            text: autopilot.parameters["CAL_ACC0_ID"].value  == 0 ? "Setup required" : "Ready"
         }
     }
 }
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
index 624e5e9f9..77a6c53d0 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml
@@ -20,8 +20,7 @@ Column {
         QGCLabel {
             horizontalAlignment: Text.AlignRight;
             width: parent.width - compass.contentWidth;
-            property bool setupRequiredValue: autopilot.parameters["SENS_MAG_XOFF"] ? autopilot.parameters["SENS_MAG_XOFF"].value : autopilot.parameters["CAL_MAG0_ID"].value
-            text: setupRequiredValue  == 0 ? "Setup required" : "Ready"
+            text: autopilot.parameters["CAL_MAG0_ID"].value  == 0 ? "Setup required" : "Ready"
         }
     }
 
@@ -32,8 +31,7 @@ Column {
         QGCLabel {
             horizontalAlignment: Text.AlignRight;
             width: parent.width - gyro.contentWidth;
-            property bool setupRequiredValue: autopilot.parameters["SENS_GYRO_XOFF"] ? autopilot.parameters["SENS_GYRO_XOFF"].value : autopilot.parameters["CAL_GYRO0_ID"].value
-            text: setupRequiredValue  == 0 ? "Setup required" : "Ready"
+            text: autopilot.parameters["CAL_GYRO0_ID"].value  == 0 ? "Setup required" : "Ready"
         }
     }
 
@@ -44,8 +42,7 @@ Column {
         QGCLabel {
             horizontalAlignment: Text.AlignRight;
             width: parent.width - accel.contentWidth;
-            property bool setupRequiredValue: autopilot.parameters["SENS_ACC_XOFF"] ? autopilot.parameters["SENS_ACC_XOFF"].value : autopilot.parameters["CAL_ACC0_ID"].value
-            text: setupRequiredValue  == 0 ? "Setup required" : "Ready"
+            text: autopilot.parameters["CAL_ACC0_ID"].value  == 0 ? "Setup required" : "Ready"
         }
     }
 
-- 
2.22.0