From 1fef6f0656ef4a3e55da8c8b563571a963b0cc53 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 5 Dec 2022 07:37:01 -0600 Subject: [PATCH] Clean up on battery shutdown condition --- src/PowerFSMThread.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/PowerFSMThread.h b/src/PowerFSMThread.h index 36bee834d..f45eec2f7 100644 --- a/src/PowerFSMThread.h +++ b/src/PowerFSMThread.h @@ -26,11 +26,9 @@ class PowerFSMThread : public OSThread if (powerStatus->getHasUSB()) { timeLastPowered = millis(); - } else if (config.power.on_battery_shutdown_after_secs > 0 && - millis() > - timeLastPowered + - (1000 * - config.power.on_battery_shutdown_after_secs)) { // shutdown after 30 minutes unpowered + } else if (config.power.on_battery_shutdown_after_secs > 0 && + config.power.on_battery_shutdown_after_secs != UINT32_MAX && + millis() > (timeLastPowered + getConfiguredOrDefaultMs(config.power.on_battery_shutdown_after_secs))) { // shutdown after 30 minutes unpowered powerFSM.trigger(EVENT_SHUTDOWN); }