Add hardware backlight fading on Gigabeat S with fade up and down options in LCD Settings. USE_BACKLIGHT_CUSTOM_FADING_BOOL is used to specify the setting type needed but leave the fading code itself implementation-defined.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19237 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 12 insertions, 5 deletions

diff --git a/apps/features.txt b/apps/features.txt
index 4f394d5eef..0ddccced3c 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -24,6 +24,8 @@ backlight_brightness
 backlight_fade_pwm
 #elif defined(USE_BACKLIGHT_SW_FADING)
 backlight_fade_sw
+#elif defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+backlight_fade_custom_bool
 #endif
 
 #if BATTERY_TYPES_COUNT > 1
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 744a9e9354..488b0ff570 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -92,7 +92,8 @@ MENUITEM_SETTING(backlight_on_button_hold,
 #endif
 MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL);
 #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
-        defined(USE_BACKLIGHT_SW_FADING)
+        defined(USE_BACKLIGHT_SW_FADING) || \
+        defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
 MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL);
 MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL);
 #endif
@@ -132,7 +133,8 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
 # endif
             ,&caption_backlight
 #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
-        defined(USE_BACKLIGHT_SW_FADING)
+        defined(USE_BACKLIGHT_SW_FADING) || \
+        defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
             ,&backlight_fade_in, &backlight_fade_out
 #endif
             ,&bl_filter_first_keypress
diff --git a/apps/settings.c b/apps/settings.c
index 2cab26a4a1..609cb3f93f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -769,7 +769,8 @@ void settings_apply(bool read_disk)
     backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged);
 #endif
 #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) \
-        || defined(USE_BACKLIGHT_SW_FADING)
+        || defined(USE_BACKLIGHT_SW_FADING) \
+        || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
     backlight_set_fade_in(global_settings.backlight_fade_in);
     backlight_set_fade_out(global_settings.backlight_fade_out);
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 56b7d3e80a..be83689368 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -424,7 +424,8 @@ struct user_settings
 #if defined(HAVE_BACKLIGHT_PWM_FADING)
     int backlight_fade_in;  /* backlight fade in timing: 0..3 */
     int backlight_fade_out; /* backlight fade in timing: 0..7 */
-#elif defined(USE_BACKLIGHT_SW_FADING)
+#elif defined(USE_BACKLIGHT_SW_FADING) \
+    || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
     bool backlight_fade_in;
     bool backlight_fade_out;
 #endif
diff --git a/apps/settings_list.c b/apps/settings_list.c
index f4519f5975..fe379ca229 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -679,7 +679,8 @@ const struct settings_list settings[] = {
                   UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off,
                   backlight_set_fade_out, 10,
                   0,100,200,300,500,1000,2000,3000,5000,10000),
-#elif defined(USE_BACKLIGHT_SW_FADING)
+#elif defined(USE_BACKLIGHT_SW_FADING) \
+    || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
     OFFON_SETTING(0, backlight_fade_in, LANG_BACKLIGHT_FADE_IN,
                     true, "backlight fade in", backlight_set_fade_in),
     OFFON_SETTING(0, backlight_fade_out, LANG_BACKLIGHT_FADE_OUT,