From ba817c7e454e869cf6d25be12fc54b12d93a0af9 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 23 Apr 2016 15:47:20 +0200 Subject: [PATCH] Battery handling: Make critical state accessible --- src/modules/systemlib/battery.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/systemlib/battery.cpp b/src/modules/systemlib/battery.cpp index 0237dee700..b398a7370a 100644 --- a/src/modules/systemlib/battery.cpp +++ b/src/modules/systemlib/battery.cpp @@ -163,10 +163,11 @@ void Battery::determineWarning() { // TODO: Determine threshold or make params. - if (_remaining < 0.18f) { - _warning = battery_status_s::BATTERY_WARNING_LOW; - } else if (_remaining < 0.09f) { + // Smallest values must come first + if (_remaining < 0.09f) { _warning = battery_status_s::BATTERY_WARNING_CRITICAL; + } else if (_remaining < 0.18f) { + _warning = battery_status_s::BATTERY_WARNING_LOW; } }