diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 17 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 7 | ||||
-rw-r--r-- | apps/settings.c | 3 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/settings_list.c | 7 |
5 files changed, 37 insertions, 0 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 69900c5e6a..a2592eb26b 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -10741,3 +10741,20 @@ | |||
10741 | *: "Context Menu" | 10741 | *: "Context Menu" |
10742 | </voice> | 10742 | </voice> |
10743 | </phrase> | 10743 | </phrase> |
10744 | <phrase> | ||
10745 | id: LANG_BUTTONLIGHT_TIMEOUT | ||
10746 | desc: in settings_menu | ||
10747 | user: | ||
10748 | <source> | ||
10749 | *: "" | ||
10750 | e200: "Wheel Light Timeout" | ||
10751 | </source> | ||
10752 | <dest> | ||
10753 | *: "" | ||
10754 | e200: "Wheel Light Timeout" | ||
10755 | </dest> | ||
10756 | <voice> | ||
10757 | *: "" | ||
10758 | e200: "Wheel Light Timeout" | ||
10759 | </voice> | ||
10760 | </phrase> | ||
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index bc253ed398..528587dffb 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -319,6 +319,10 @@ MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | |||
319 | #endif | 319 | #endif |
320 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 320 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
321 | 321 | ||
322 | #ifdef HAVE_BUTTON_LIGHT | ||
323 | MENUITEM_SETTING(button_light_timeout, &global_settings.button_light_timeout, NULL); | ||
324 | #endif | ||
325 | |||
322 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | 326 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), |
323 | 0, Icon_System_menu, | 327 | 0, Icon_System_menu, |
324 | &start_screen, | 328 | &start_screen, |
@@ -345,6 +349,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
345 | #if CONFIG_CHARGING | 349 | #if CONFIG_CHARGING |
346 | &car_adapter_mode, | 350 | &car_adapter_mode, |
347 | #endif | 351 | #endif |
352 | #ifdef HAVE_BUTTON_LIGHT | ||
353 | &button_light_timeout, | ||
354 | #endif | ||
348 | ); | 355 | ); |
349 | 356 | ||
350 | /* SYSTEM MENU */ | 357 | /* SYSTEM MENU */ |
diff --git a/apps/settings.c b/apps/settings.c index f3ce2d41c1..537ca9f5b6 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -709,6 +709,9 @@ void settings_apply(void) | |||
709 | backlight_set_fade_out(global_settings.backlight_fade_out); | 709 | backlight_set_fade_out(global_settings.backlight_fade_out); |
710 | #endif | 710 | #endif |
711 | #endif | 711 | #endif |
712 | #ifdef HAVE_BUTTON_LIGHT | ||
713 | button_backlight_set_timeout(global_settings.button_light_timeout); | ||
714 | #endif | ||
712 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 715 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
713 | backlight_set_brightness(global_settings.brightness); | 716 | backlight_set_brightness(global_settings.brightness); |
714 | #endif | 717 | #endif |
diff --git a/apps/settings.h b/apps/settings.h index 0a82051498..13291be3df 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -717,6 +717,9 @@ struct user_settings | |||
717 | unsigned char remote_icon_file[MAX_FILENAME+1]; | 717 | unsigned char remote_icon_file[MAX_FILENAME+1]; |
718 | unsigned char remote_viewers_icon_file[MAX_FILENAME+1]; | 718 | unsigned char remote_viewers_icon_file[MAX_FILENAME+1]; |
719 | #endif | 719 | #endif |
720 | #ifdef HAVE_BUTTON_LIGHT | ||
721 | int button_light_timeout; | ||
722 | #endif | ||
720 | }; | 723 | }; |
721 | 724 | ||
722 | /** global variables **/ | 725 | /** global variables **/ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index ce45074f36..49ec5b5f32 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1175,6 +1175,13 @@ const struct settings_list settings[] = { | |||
1175 | "remote viewers iconset", "", | 1175 | "remote viewers iconset", "", |
1176 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), | 1176 | ICON_DIR "/", ".bmp", MAX_FILENAME+1), |
1177 | #endif /* HAVE_REMOTE_LCD */ | 1177 | #endif /* HAVE_REMOTE_LCD */ |
1178 | #ifdef HAVE_BUTTON_LIGHT | ||
1179 | INT_SETTING_W_CFGVALS(F_FLIPLIST, button_light_timeout, | ||
1180 | LANG_BUTTONLIGHT_TIMEOUT, 6, | ||
1181 | "button light timeout", backlight_times_conf, UNIT_SEC, | ||
1182 | 0, 18, 1, backlight_formatter, backlight_getlang, | ||
1183 | button_backlight_set_timeout), | ||
1184 | #endif | ||
1178 | }; | 1185 | }; |
1179 | 1186 | ||
1180 | const int nb_settings = sizeof(settings)/sizeof(*settings); | 1187 | const int nb_settings = sizeof(settings)/sizeof(*settings); |