Merge pull request #4495 from DonLakeFlyer/VoltageCalculate

Correct check for bad value from parseFloat

Merge pull request #4495 from DonLakeFlyer/VoltageCalculate
Correct check for bad value from parseFloat
7688c667 · Don Gagne · GitHub · 7217c644 · 80d7676f · 7688c667
Commit 7688c667 authored Feb 06, 2017 by Don Gagne Committed by GitHub Feb 06, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

APMPowerComponent.qml src/AutoPilotPlugins/APM/APMPowerComponent.qml +2 -2

PowerComponent.qml src/AutoPilotPlugins/PX4/PowerComponent.qml +2 -2

No files found.
--- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
@@ -138,11 +138,11 @@ SetupPage {

                                onClicked:  {
                                    var measuredVoltageValue = parseFloat(measuredVoltage.text)
-                                    if (measuredVoltageValue == 0) {
+                                    if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) {
                                        return
                                    }
                                    var newVoltageMultiplier = (measuredVoltageValue * battVoltMult.value) / controller.vehicle.battery.voltage.value
-                                    if (newVoltageMultiplier != 0) {
+                                    if (newVoltageMultiplier > 0) {
                                        battVoltMult.value = newVoltageMultiplier
                                    }
                                }

--- a/src/AutoPilotPlugins/PX4/PowerComponent.qml
+++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml
@@ -144,11 +144,11 @@ SetupPage {

                                onClicked:  {
                                    var measuredVoltageValue = parseFloat(measuredVoltage.text)
-                                    if (measuredVoltageValue == 0) {
+                                    if (measuredVoltageValue == 0 || isNaN(measuredVoltageValue)) {
                                        return
                                    }
                                    var newVoltageDivider = (measuredVoltageValue * battVoltageDivider.value) / controller.vehicle.battery.voltage.value
-                                    if (newVoltageDivider != 0) {
+                                    if (newVoltageDivider > 0) {
                                        battVoltageDivider.value = newVoltageDivider
                                    }
                                }