Add software backlight fading for E100/H300/X5/D2, by Thomas Martitz and others - see FS#6800 for credits.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19221 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Steve Bavin 2008-11-26 08:26:13 +00:00
parent 756bcc4bd5
commit f684726580
18 changed files with 304 additions and 39 deletions

View file

@ -20,7 +20,7 @@ albumart
backlight_brightness
#endif
#if defined(HAVE_BACKLIGHT_PWM_FADING)
#if defined(HAVE_BACKLIGHT_PWM_FADING) || defined(USE_BACKLIGHT_SW_FADING)
backlight_fade
#endif

View file

@ -91,7 +91,8 @@ MENUITEM_SETTING(backlight_on_button_hold,
&global_settings.backlight_on_button_hold, NULL);
#endif
MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL);
#if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
defined(USE_BACKLIGHT_SW_FADING)
MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL);
MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL);
#endif
@ -130,9 +131,10 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
,&backlight_on_button_hold
# endif
,&caption_backlight
# if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
defined(USE_BACKLIGHT_SW_FADING)
,&backlight_fade_in, &backlight_fade_out
# endif
#endif
,&bl_filter_first_keypress
# ifdef HAVE_LCD_SLEEP_SETTING
,&lcd_sleep_after_backlight_off

View file

@ -768,7 +768,8 @@ void settings_apply(bool read_disk)
#if CONFIG_CHARGING
backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged);
#endif
#if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)
#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) \
|| defined(USE_BACKLIGHT_SW_FADING)
backlight_set_fade_in(global_settings.backlight_fade_in);
backlight_set_fade_out(global_settings.backlight_fade_out);
#endif

View file

@ -421,10 +421,14 @@ struct user_settings
int backlight_timeout_plugged;
#endif
#ifdef HAVE_BACKLIGHT_PWM_FADING
#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)
bool backlight_fade_in;
bool backlight_fade_out;
#endif
#ifdef HAVE_BACKLIGHT_BRIGHTNESS
int brightness;
#endif

View file

@ -679,6 +679,11 @@ 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)
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,
true, "backlight fade out", backlight_set_fade_out),
#endif
INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed",
UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed),