Skip to content

Commit 773bc08

Browse files
committed
LP-574 Use loop for ADCRouting
1 parent bdf66ca commit 773bc08

1 file changed

Lines changed: 7 additions & 17 deletions

File tree

  • ground/gcs/src/share/qml/js

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

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -319,23 +319,13 @@ function batteryModuleEnabled() {
319319
}
320320

321321
function batteryModuleADCConfigured() {
322-
if ((hwSettings.adcRoutingadc0 == HwSettings.ADCRouting.BatteryVoltage) ||
323-
(hwSettings.adcRoutingadc0 == HwSettings.ADCRouting.BatteryCurrent) ||
324-
(hwSettings.adcRoutingadc1 == HwSettings.ADCRouting.BatteryVoltage) ||
325-
(hwSettings.adcRoutingadc1 == HwSettings.ADCRouting.BatteryCurrent) ||
326-
(hwSettings.adcRoutingadc2 == HwSettings.ADCRouting.BatteryVoltage) ||
327-
(hwSettings.adcRoutingadc2 == HwSettings.ADCRouting.BatteryCurrent) ||
328-
(hwSettings.adcRoutingadc3 == HwSettings.ADCRouting.BatteryVoltage) ||
329-
(hwSettings.adcRoutingadc3 == HwSettings.ADCRouting.BatteryCurrent) ||
330-
(hwSettings.adcRoutingadc4 == HwSettings.ADCRouting.BatteryVoltage) ||
331-
(hwSettings.adcRoutingadc4 == HwSettings.ADCRouting.BatteryCurrent) ||
332-
(hwSettings.adcRoutingadc5 == HwSettings.ADCRouting.BatteryVoltage) ||
333-
(hwSettings.adcRoutingadc5 == HwSettings.ADCRouting.BatteryCurrent) ||
334-
(hwSettings.adcRoutingadc6 == HwSettings.ADCRouting.BatteryVoltage) ||
335-
(hwSettings.adcRoutingadc6 == HwSettings.ADCRouting.BatteryCurrent) ||
336-
(hwSettings.adcRoutingadc7 == HwSettings.ADCRouting.BatteryVoltage) ||
337-
(hwSettings.adcRoutingadc7 == HwSettings.ADCRouting.BatteryCurrent)) {
338-
return true;
322+
for (var adc = 0; adc < 8; adc++) {
323+
var adc_set = hwSettings.getADCRouting(adc);
324+
if (adc_set == HwSettings.ADCRouting.BatteryVoltage) {
325+
return true;
326+
} else if (adc_set == HwSettings.ADCRouting.BatteryCurrent) {
327+
return true;
328+
}
339329
}
340330
return false;
341331
}

0 commit comments

Comments
 (0)