diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/button.c | 4 | ||||
-rw-r--r-- | firmware/powermgmt.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index f7523d776c..100957b77a 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -205,8 +205,12 @@ static void button_tick(void) | |||
205 | #endif | 205 | #endif |
206 | ) && | 206 | ) && |
207 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) | 207 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
208 | #if CONFIG_CHARGING >= CHARGING_MONITOR | ||
209 | !charging_state() && | ||
210 | #else | ||
208 | !charger_inserted() && | 211 | !charger_inserted() && |
209 | #endif | 212 | #endif |
213 | #endif | ||
210 | repeat_count > POWEROFF_COUNT) | 214 | repeat_count > POWEROFF_COUNT) |
211 | { | 215 | { |
212 | /* Tell the main thread that it's time to | 216 | /* Tell the main thread that it's time to |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index f1dd83ef52..bf5734c264 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -358,8 +358,12 @@ static void handle_auto_poweroff(void) | |||
358 | 358 | ||
359 | if (usb_inserted() | 359 | if (usb_inserted() |
360 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) | 360 | #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
361 | #if CONFIG_CHARGING >= CHARGING_MONITOR | ||
362 | || charging_state() | ||
363 | #else | ||
361 | || charger_input_state != NO_CHARGER | 364 | || charger_input_state != NO_CHARGER |
362 | #endif | 365 | #endif |
366 | #endif | ||
363 | ) { | 367 | ) { |
364 | DEBUGF("Sleep timer timeout. Stopping...\n"); | 368 | DEBUGF("Sleep timer timeout. Stopping...\n"); |
365 | set_sleep_timer(0); | 369 | set_sleep_timer(0); |