LP-574 Check if adc inputs are configured before displaying battery data on PFD

Author: f5soh

ground/gcs/src/share/qml/js/uav.js

@@ -318,6 +318,28 @@ function batteryModuleEnabled() {
     return (hwSettings.optionalModulesBattery == HwSettings.OptionalModules.Enabled);
 }
 
+function batteryModuleADCConfigured() {
+    if ((hwSettings.adcRoutingadc0 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc0 == HwSettings.ADCRouting.BatteryCurrent) ||
+        (hwSettings.adcRoutingadc1 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc1 == HwSettings.ADCRouting.BatteryCurrent) ||
+        (hwSettings.adcRoutingadc2 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc2 == HwSettings.ADCRouting.BatteryCurrent) ||
+        (hwSettings.adcRoutingadc3 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc3 == HwSettings.ADCRouting.BatteryCurrent) ||
+        (hwSettings.adcRoutingadc4 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc4 == HwSettings.ADCRouting.BatteryCurrent) ||
+        (hwSettings.adcRoutingadc5 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc5 == HwSettings.ADCRouting.BatteryCurrent) ||
+        (hwSettings.adcRoutingadc6 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc6 == HwSettings.ADCRouting.BatteryCurrent) ||
+        (hwSettings.adcRoutingadc7 == HwSettings.ADCRouting.BatteryVoltage) || 
+        (hwSettings.adcRoutingadc7 == HwSettings.ADCRouting.BatteryCurrent)) {
+        return true;    
+    }
+    return false;
+}
+
 function batteryNbCells() {
     return flightBatterySettings.nbCells;
 }

ground/gcs/src/share/qml/pfd/Info.qml

@@ -271,7 +271,7 @@ Item {
     }
 
     // Battery Info (Top)
-    // Only visible when PathPlan not active and Battery module enabled
+    // Only visible when PathPlan not active and Battery module enabled and ADC input configured
 
     SvgElementPositionItem {
         id: topbattery_voltamp_bg
@@ -281,7 +281,7 @@ Item {
         width: scaledBounds.width * sceneItem.width
         height: scaledBounds.height * sceneItem.height
         y: scaledBounds.y * sceneItem.height
-        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled())
+        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled() && UAV.batteryModuleADCConfigured())
 
         Rectangle {
             anchors.fill: parent
@@ -296,7 +296,7 @@ Item {
         width: scaledBounds.width * sceneItem.width
         height: scaledBounds.height * sceneItem.height
         y: Math.floor(scaledBounds.y * sceneItem.height)
-        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled())
+        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled() && UAV.batteryModuleADCConfigured())
     }
 
     SvgElementPositionItem {
@@ -307,7 +307,7 @@ Item {
         width: scaledBounds.width * sceneItem.width
         height: scaledBounds.height * sceneItem.height
         y: scaledBounds.y * sceneItem.height
-        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled())
+        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled() && UAV.batteryModuleADCConfigured())
 
         Rectangle {
             anchors.fill: parent
@@ -334,7 +334,7 @@ Item {
         width: scaledBounds.width * sceneItem.width
         height: scaledBounds.height * sceneItem.height
         y: scaledBounds.y * sceneItem.height
-        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled())
+        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled() && UAV.batteryModuleADCConfigured())
 
         Rectangle {
             anchors.fill: parent
@@ -361,7 +361,7 @@ Item {
         width: scaledBounds.width * sceneItem.width
         height: scaledBounds.height * sceneItem.height
         y: scaledBounds.y * sceneItem.height
-        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled())
+        visible: (!UAV.isPathPlanEnabled() && UAV.batteryModuleEnabled() && UAV.batteryModuleADCConfigured())
 
         Rectangle {
             anchors.fill: parent