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 f2249e3a57..fbc83fd60d 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) | |||
438 | /* If a sleep timer is running, cancel it, otherwise start one */ | 438 | /* If a sleep timer is running, cancel it, otherwise start one */ |
439 | static int toggle_sleeptimer(void) | 439 | static int toggle_sleeptimer(void) |
440 | { | 440 | { |
441 | set_sleep_timer(get_sleep_timer() ? 0 | 441 | set_sleeptimer_duration(get_sleep_timer() ? 0 |
442 | : global_settings.sleeptimer_duration * 60); | 442 | : global_settings.sleeptimer_duration); |
443 | return 0; | 443 | return 0; |
444 | } | 444 | } |
445 | 445 | ||
diff --git a/apps/settings.c b/apps/settings.c index 3bf9c5bf17..e2a6efa3d8 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -842,7 +842,7 @@ void settings_apply(bool read_disk) | |||
842 | #endif | 842 | #endif |
843 | set_poweroff_timeout(global_settings.poweroff); | 843 | set_poweroff_timeout(global_settings.poweroff); |
844 | if (global_settings.sleeptimer_on_startup) | 844 | if (global_settings.sleeptimer_on_startup) |
845 | set_sleep_timer(global_settings.sleeptimer_duration * 60); | 845 | set_sleeptimer_duration(global_settings.sleeptimer_duration); |
846 | set_keypress_restarts_sleep_timer( | 846 | set_keypress_restarts_sleep_timer( |
847 | global_settings.keypress_restarts_sleeptimer); | 847 | global_settings.keypress_restarts_sleeptimer); |
848 | 848 | ||
diff --git a/apps/shortcuts.c b/apps/shortcuts.c index 50b8decfc6..ee8454485d 100644 --- a/apps/shortcuts.c +++ b/apps/shortcuts.c | |||
@@ -528,7 +528,7 @@ int do_shortcut_menu(void *ignored) | |||
528 | #endif | 528 | #endif |
529 | { | 529 | { |
530 | char timer_buf[10]; | 530 | char timer_buf[10]; |
531 | set_sleep_timer(sc->u.timedata.sleep_timeout * 60); | 531 | set_sleeptimer_duration(sc->u.timedata.sleep_timeout); |
532 | splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER), | 532 | splashf(HZ, "%s (%s)", str(LANG_SLEEP_TIMER), |
533 | sleep_timer_formatter(timer_buf, sizeof(timer_buf), | 533 | sleep_timer_formatter(timer_buf, sizeof(timer_buf), |
534 | sc->u.timedata.sleep_timeout, NULL)); | 534 | sc->u.timedata.sleep_timeout, NULL)); |
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index 14d0078c31..d79d560150 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 */ | |||
167 | int get_battery_capacity(void); /* get local battery capacity value */ | 167 | int get_battery_capacity(void); /* get local battery capacity value */ |
168 | void set_battery_type(int type); /* set local battery type */ | 168 | void set_battery_type(int type); /* set local battery type */ |
169 | 169 | ||
170 | void set_sleep_timer(int seconds); | 170 | void set_sleeptimer_duration(int minutes); |
171 | int get_sleep_timer(void); | 171 | int get_sleep_timer(void); |
172 | void set_keypress_restarts_sleep_timer(bool enable); | 172 | void set_keypress_restarts_sleep_timer(bool enable); |
173 | void handle_auto_poweroff(void); | 173 | void handle_auto_poweroff(void); |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 379b91ca13..b6d4b9f66e 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -60,6 +60,7 @@ int last_sent_battery_level = 100; | |||
60 | /* battery level (0-100%) */ | 60 | /* battery level (0-100%) */ |
61 | int battery_percent = -1; | 61 | int battery_percent = -1; |
62 | void send_battery_level_event(void); | 62 | void send_battery_level_event(void); |
63 | static void set_sleep_timer(int seconds); | ||
63 | 64 | ||
64 | static bool sleeptimer_active = false; | 65 | static bool sleeptimer_active = false; |
65 | static long sleeptimer_endtick; | 66 | static long sleeptimer_endtick; |
@@ -863,7 +864,12 @@ void send_battery_level_event(void) | |||
863 | } | 864 | } |
864 | } | 865 | } |
865 | 866 | ||
866 | void set_sleep_timer(int seconds) | 867 | void set_sleeptimer_duration(int minutes) |
868 | { | ||
869 | set_sleep_timer(minutes * 60); | ||
870 | } | ||
871 | |||
872 | static void set_sleep_timer(int seconds) | ||
867 | { | 873 | { |
868 | if (seconds) { | 874 | if (seconds) { |
869 | sleeptimer_active = true; | 875 | sleeptimer_active = true; |