diff options
| -rw-r--r-- | apps/misc.c | 10 | ||||
| -rw-r--r-- | firmware/drivers/button.c | 4 | ||||
| -rw-r--r-- | firmware/powermgmt.c | 4 |
3 files changed, 1 insertions, 17 deletions
diff --git a/apps/misc.c b/apps/misc.c index 07b4c94..3dfc289 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -264,12 +264,8 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) scrobbler_poweroff(); #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) -#if CONFIG_CHARGING >= CHARGING_MONITOR - if(!charging_state()) -#else if(!charger_inserted()) #endif -#endif { bool batt_safe = battery_level_safe(); int audio_stat = audio_status(); @@ -410,11 +406,7 @@ bool list_stop_handler(void) if (TIME_BEFORE(current_tick, last_off + HZ/2)) { -#if CONFIG_CHARGING >= CHARGING_MONITOR - if (charging_state()) -#else - if (charger_inserted()) -#endif + if (charger_inserted()) { charging_splash(); ret = true; /* screen is dirty, caller needs to refresh */ diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index f116ad6..91b8ebd 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -205,12 +205,8 @@ static void button_tick(void) #endif ) && #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) -#if CONFIG_CHARGING >= CHARGING_MONITOR - !charging_state() && -#else !charger_inserted() && #endif -#endif repeat_count > POWEROFF_COUNT) { /* Tell the main thread that it's time to diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index bf5734c..f1dd83e 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -358,12 +358,8 @@ static void handle_auto_poweroff(void) if (usb_inserted() #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) -#if CONFIG_CHARGING >= CHARGING_MONITOR - || charging_state() -#else || charger_input_state != NO_CHARGER #endif -#endif ) { DEBUGF("Sleep timer timeout. Stopping...\n"); set_sleep_timer(0); |