From 68cd055ed24a888230f10c19672b4e2dd82737bc Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Sat, 15 Feb 2020 18:10:01 -0700 Subject: [PATCH 1/2] fixes battery % issue with NaN --- src/FlightDisplay/PreFlightBatteryCheck.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/FlightDisplay/PreFlightBatteryCheck.qml b/src/FlightDisplay/PreFlightBatteryCheck.qml index 9e1d86d..20a7fb3 100644 --- a/src/FlightDisplay/PreFlightBatteryCheck.qml +++ b/src/FlightDisplay/PreFlightBatteryCheck.qml @@ -25,6 +25,7 @@ PreFlightCheckButton { property int failurePercent: 40 property bool allowFailurePercentOverride: false - property var _batPercentRemaining: activeVehicle ? activeVehicle.battery.percentRemaining.value : 0 + property var batteryValue: activeVehicle ? activeVehicle.battery.percentRemaining.value : 0 + property var _batPercentRemaining: batteryValue ? batteryValue : 0 property bool _batLow: _batPercentRemaining < failurePercent } From e4a4c33b5e36a268a7213e2a1dbd7dce7309abbb Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Mon, 17 Feb 2020 14:16:43 -0700 Subject: [PATCH 2/2] updated from reviewer feedback --- src/FlightDisplay/PreFlightBatteryCheck.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FlightDisplay/PreFlightBatteryCheck.qml b/src/FlightDisplay/PreFlightBatteryCheck.qml index 20a7fb3..30736be 100644 --- a/src/FlightDisplay/PreFlightBatteryCheck.qml +++ b/src/FlightDisplay/PreFlightBatteryCheck.qml @@ -25,7 +25,7 @@ PreFlightCheckButton { property int failurePercent: 40 property bool allowFailurePercentOverride: false - property var batteryValue: activeVehicle ? activeVehicle.battery.percentRemaining.value : 0 - property var _batPercentRemaining: batteryValue ? batteryValue : 0 + property var _batteryValue: activeVehicle ? activeVehicle.battery.percentRemaining.value : 0 + property var _batPercentRemaining: isNaN(_batteryValue) ? 0 : _batteryValue property bool _batLow: _batPercentRemaining < failurePercent }