5 files changed, 37 insertions, 0 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 69900c5..a2592eb 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -10741,3 +10741,20 @@
     *: "Context Menu"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_BUTTONLIGHT_TIMEOUT
+  desc: in settings_menu
+  user:
+  <source>
+    *: ""
+    e200: "Wheel Light Timeout"
+  </source>
+  <dest>
+    *: ""
+    e200: "Wheel Light Timeout"
+  </dest>
+  <voice>
+    *: ""
+    e200: "Wheel Light Timeout"
+  </voice>
+</phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index bc253ed..528587d 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);
 #endif
 MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL);
 
+#ifdef HAVE_BUTTON_LIGHT
+MENUITEM_SETTING(button_light_timeout, &global_settings.button_light_timeout, NULL);
+#endif
+
 MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), 
           0, Icon_System_menu,
             &start_screen,
@@ -345,6 +349,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #if CONFIG_CHARGING
             &car_adapter_mode,
 #endif
+#ifdef HAVE_BUTTON_LIGHT
+            &button_light_timeout,
+#endif
          );
 
 /*    SYSTEM MENU                  */
diff --git a/apps/settings.c b/apps/settings.c
index f3ce2d4..537ca9f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -709,6 +709,9 @@ void settings_apply(void)
     backlight_set_fade_out(global_settings.backlight_fade_out);
 #endif
 #endif
+#ifdef HAVE_BUTTON_LIGHT
+    button_backlight_set_timeout(global_settings.button_light_timeout);
+#endif
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     backlight_set_brightness(global_settings.brightness);
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 0a82051..13291be 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -717,6 +717,9 @@ struct user_settings
     unsigned char remote_icon_file[MAX_FILENAME+1];
     unsigned char remote_viewers_icon_file[MAX_FILENAME+1];
 #endif
+#ifdef HAVE_BUTTON_LIGHT
+    int button_light_timeout;
+#endif
 };
 
 /** global variables **/
diff --git a/apps/settings_list.c b/apps/settings_list.c
index ce45074..49ec5b5 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1175,6 +1175,13 @@ const struct settings_list settings[] = {
                      "remote viewers iconset", "",
                      ICON_DIR "/", ".bmp", MAX_FILENAME+1),
 #endif /* HAVE_REMOTE_LCD */
+#ifdef HAVE_BUTTON_LIGHT
+    INT_SETTING_W_CFGVALS(F_FLIPLIST, button_light_timeout,
+                          LANG_BUTTONLIGHT_TIMEOUT, 6,
+        "button light timeout", backlight_times_conf, UNIT_SEC,
+        0, 18, 1, backlight_formatter, backlight_getlang, 
+        button_backlight_set_timeout),
+#endif
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);