From 803f518f2336fc378009ee7baf5f1fbd4163d1db Mon Sep 17 00:00:00 2001
From: dheideman <dheideman@socal.rr.com>
Date: Mon, 28 Aug 2017 16:50:19 -0700
Subject: [PATCH] Add ARMING_VOLT_MIN parameter to Power setup page

---
 .../APM/APMPowerComponent.qml                 | 19 ++++++++++++++++---
 .../APM/ArduCopterFirmwarePlugin.cc           |  3 +++
 .../APM/ArduPlaneFirmwarePlugin.cc            |  3 +++
 .../APM/ArduRoverFirmwarePlugin.cc            |  3 +++
 .../APM/ArduSubFirmwarePlugin.cc              |  9 +++++++--
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
index e4c6ac0d2..16e036fff 100644
--- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
@@ -29,6 +29,7 @@ SetupPage {
         Column {
             spacing: _margins
 
+            property Fact armVoltMin:       controller.getParameterFact(-1, "r.ARMING_VOLT_MIN")
             property Fact battAmpPerVolt:   controller.getParameterFact(-1, "BATT_AMP_PERVOLT")
             property Fact battCapacity:     controller.getParameterFact(-1, "BATT_CAPACITY")
             property Fact battCurrPin:      controller.getParameterFact(-1, "BATT_CURR_PIN")
@@ -239,6 +240,18 @@ SetupPage {
                 QGCLabel {
                     Layout.row:     2
                     Layout.column:  0
+                    text:           qsTr("Minimum arming voltage:")
+                }
+
+                FactTextField {
+                    id:     armVoltField
+                    width:  _fieldWidth
+                    fact:   armVoltMin
+                }
+
+                QGCLabel {
+                    Layout.row:     3
+                    Layout.column:  0
                     text:           qsTr("Power sensor:")
                 }
 
@@ -260,7 +273,7 @@ SetupPage {
                 }
 
                 QGCLabel {
-                    Layout.row:     3
+                    Layout.row:     4
                     Layout.column:  0
                     text:           qsTr("Current pin:")
                     visible:        _showAdvanced
@@ -274,7 +287,7 @@ SetupPage {
                 }
 
                 QGCLabel {
-                    Layout.row:     4
+                    Layout.row:     5
                     Layout.column:  0
                     text:           qsTr("Voltage pin:")
                     visible:        _showAdvanced
@@ -288,7 +301,7 @@ SetupPage {
                 }
 
                 QGCLabel {
-                    Layout.row:     5
+                    Layout.row:     6
                     Layout.column:  0
                     text:           qsTr("Voltage multiplier:")
                     visible:        _showAdvanced
diff --git a/src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
index 58ff75035..75079d044 100644
--- a/src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
@@ -145,6 +145,9 @@ ArduCopterFirmwarePlugin::ArduCopterFirmwarePlugin(void)
         remapV3_5["SERVO13_REVERSED"] = QStringLiteral("RC13_REVERSED");
         remapV3_5["SERVO14_REVERSED"] = QStringLiteral("RC14_REVERSED");
 
+        remapV3_5["ARMING_VOLT_MIN"] = QStringLiteral("ARMING_MIN_VOLT");
+        remapV3_5["ARMING_VOLT2_MIN"] = QStringLiteral("ARMING_MIN_VOLT2");
+
         _remapParamNameIntialized = true;
     }
 }
diff --git a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
index 40ec05daf..73f2caf3c 100644
--- a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
@@ -110,6 +110,9 @@ ArduPlaneFirmwarePlugin::ArduPlaneFirmwarePlugin(void)
         remapV3_8["SERVO13_REVERSED"] = QStringLiteral("RC13_REVERSED");
         remapV3_8["SERVO14_REVERSED"] = QStringLiteral("RC14_REVERSED");
 
+        remapV3_8["ARMING_VOLT_MIN"] = QStringLiteral("ARMING_MIN_VOLT");
+        remapV3_8["ARMING_VOLT2_MIN"] = QStringLiteral("ARMING_MIN_VOLT2");
+
         _remapParamNameIntialized = true;
     }
 }
diff --git a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
index 12459a699..ea8f38854 100644
--- a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
@@ -89,6 +89,9 @@ ArduRoverFirmwarePlugin::ArduRoverFirmwarePlugin(void)
         remapV3_2["SERVO13_REVERSED"] = QStringLiteral("RC13_REVERSED");
         remapV3_2["SERVO14_REVERSED"] = QStringLiteral("RC14_REVERSED");
 
+        remapV3_2["ARMING_VOLT_MIN"] = QStringLiteral("ARMING_MIN_VOLT");
+        remapV3_2["ARMING_VOLT2_MIN"] = QStringLiteral("ARMING_MIN_VOLT2");
+
         _remapParamNameIntialized = true;
     }
 }
diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
index 6fd925901..518996d7d 100644
--- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
@@ -110,6 +110,11 @@ ArduSubFirmwarePlugin::ArduSubFirmwarePlugin(void):
 
         remapV3_5["FENCE_ALT_MIN"] = QStringLiteral("FENCE_DEPTH_MAX");
 
+        FirmwarePlugin::remapParamNameMap_t& remapV3_6 = _remapParamName[3][6];
+
+        remapV3_6["ARMING_VOLT_MIN"] = QStringLiteral("ARMING_MIN_VOLT");
+        remapV3_6["ARMING_VOLT2_MIN"] = QStringLiteral("ARMING_MIN_VOLT2");
+
         _remapParamNameIntialized = true;
     }
 
@@ -150,8 +155,8 @@ QList<MAV_CMD> ArduSubFirmwarePlugin::supportedMissionCommands(void)
 
 int ArduSubFirmwarePlugin::remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const
 {
-    // Remapping supports up to 3.5
-    return majorVersionNumber == 3 ? 5 : Vehicle::versionNotSetValue;
+    // Remapping supports up to 3.6
+    return majorVersionNumber == 3 ? 6 : Vehicle::versionNotSetValue;
 }
 
 int ArduSubFirmwarePlugin::manualControlReservedButtonCount(void)
-- 
2.22.0