diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-11-26 21:26:22 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-11-26 21:26:22 +0000 |
commit | 495115b84a71b900b27c55b899b68e12059434d4 (patch) | |
tree | 5514f2d3131bc20a341a020fe6382fd5df9fe532 /apps/menus | |
parent | 5b0d74a7d3329ec3fc5818d9185aba7f29291ca7 (diff) | |
download | rockbox-495115b84a71b900b27c55b899b68e12059434d4.tar.gz rockbox-495115b84a71b900b27c55b899b68e12059434d4.zip |
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
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/display_menu.c | 6 |
1 files changed, 4 insertions, 2 deletions
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, | |||
92 | #endif | 92 | #endif |
93 | MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL); | 93 | MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL); |
94 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ | 94 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ |
95 | defined(USE_BACKLIGHT_SW_FADING) | 95 | defined(USE_BACKLIGHT_SW_FADING) || \ |
96 | defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
96 | MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL); | 97 | MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL); |
97 | MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL); | 98 | MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL); |
98 | #endif | 99 | #endif |
@@ -132,7 +133,8 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
132 | # endif | 133 | # endif |
133 | ,&caption_backlight | 134 | ,&caption_backlight |
134 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ | 135 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ |
135 | defined(USE_BACKLIGHT_SW_FADING) | 136 | defined(USE_BACKLIGHT_SW_FADING) || \ |
137 | defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
136 | ,&backlight_fade_in, &backlight_fade_out | 138 | ,&backlight_fade_in, &backlight_fade_out |
137 | #endif | 139 | #endif |
138 | ,&bl_filter_first_keypress | 140 | ,&bl_filter_first_keypress |