From 8a7dc1b3201a15df3fc7d783267fc8e3a5344a65 Mon Sep 17 00:00:00 2001 From: Simone Guscetti Date: Thu, 5 Apr 2018 09:25:57 +0200 Subject: [PATCH] commander: Remove usb_ connected flag on battery warnings Battery warning gets only fired if a battery is inserted. --- src/modules/commander/commander.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 6ac6ea76d9..b6d4045318 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -2008,8 +2008,7 @@ Commander::run() } status_changed = true; - } else if (!status_flags.usb_connected && - battery.warning == battery_status_s::BATTERY_WARNING_CRITICAL && + } else if (battery.warning == battery_status_s::BATTERY_WARNING_CRITICAL && !critical_battery_voltage_actions_done) { critical_battery_voltage_actions_done = true; @@ -2043,8 +2042,7 @@ Commander::run() status_changed = true; - } else if (!status_flags.usb_connected && - battery.warning == battery_status_s::BATTERY_WARNING_EMERGENCY && + } else if (battery.warning == battery_status_s::BATTERY_WARNING_EMERGENCY && !emergency_battery_voltage_actions_done) { emergency_battery_voltage_actions_done = true;