Browse Source

Correct check for bad value from parseFloat

QGC4.4
Don Gagne 8 years ago
parent
commit
80d7676fa7
  1. 4
      src/AutoPilotPlugins/APM/APMPowerComponent.qml
  2. 4
      src/AutoPilotPlugins/PX4/PowerComponent.qml

4
src/AutoPilotPlugins/APM/APMPowerComponent.qml

@ -138,11 +138,11 @@ SetupPage { @@ -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
}
}

4
src/AutoPilotPlugins/PX4/PowerComponent.qml

@ -144,11 +144,11 @@ SetupPage { @@ -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
}
}

Loading…
Cancel
Save