diff options
| -rw-r--r-- | apps/menus/settings_menu.c | 4 | ||||
| -rw-r--r-- | apps/settings.c | 2 | ||||
| -rw-r--r-- | apps/shortcuts.c | 2 | ||||
| -rw-r--r-- | firmware/export/powermgmt.h | 2 | ||||
| -rw-r--r-- | firmware/powermgmt.c | 8 |
5 files changed, 12 insertions, 6 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index f2249e3..fbc83fd 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -438,8 +438,8 @@ static int sleep_timer_voice(int selected_item, void*data) /* If a sleep timer is running, cancel it, otherwise start one */ static int toggle_sleeptimer(void) { - set_sleep_timer(get_sleep_timer() ? 0 - : global_settings.sleeptimer_duration * 60); + set_sleeptimer_duration(get_sleep_timer() ? 0 + : global_settings.sleeptimer_duration); return 0; } diff --git a/apps/settings.c b/apps/settings.c index 3bf9c5b..e2a6efa 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -842,7 +842,7 @@ void settings_apply(bool read_disk) #endif set_poweroff_timeout(global_settings.poweroff); if (global_settings.sleeptimer_on_startup) - set_sleep_timer(global_settings.sleeptimer_duration * 60); + set_sleeptimer_duration(global_settings.sleeptimer_duration); set_keypress_restarts_sleep_timer( global_settings.keypress_restarts_sleeptimer); diff --git a/apps/shortcuts.c b/apps/shortcuts.c index 50b8dec..ee84544 100644 --- a/apps/shortcuts.c +++ b/apps/shortcuts.c @@ -528,7 +528,7 @@ int do_shortcut_menu(void *ignored) #endif { char timer_buf[10]; - set_sleep_timer(sc->u.timedata.sleep_timeout * 60); + set_sleeptimer_duration(sc->u.timedata.sleep_timeout); splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER), sleep_timer_formatter(timer_buf, sizeof(timer_buf), sc->u.timedata.sleep_timeout, NULL)); diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index 14d0078..d79d560 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h @@ -167,7 +167,7 @@ void set_battery_capacity(int capacity); /* set local battery capacity value */ int get_battery_capacity(void); /* get local battery capacity value */ void set_battery_type(int type); /* set local battery type */ -void set_sleep_timer(int seconds); +void set_sleeptimer_duration(int minutes); int get_sleep_timer(void); void set_keypress_restarts_sleep_timer(bool enable); void handle_auto_poweroff(void); diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 379b91c..b6d4b9f 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -60,6 +60,7 @@ int last_sent_battery_level = 100; /* battery level (0-100%) */ int battery_percent = -1; void send_battery_level_event(void); +static void set_sleep_timer(int seconds); static bool sleeptimer_active = false; static long sleeptimer_endtick; @@ -863,7 +864,12 @@ void send_battery_level_event(void) } } -void set_sleep_timer(int seconds) +void set_sleeptimer_duration(int minutes) +{ + set_sleep_timer(minutes * 60); +} + +static void set_sleep_timer(int seconds) { if (seconds) { sleeptimer_active = true; |