diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 7 | ||||
-rw-r--r-- | apps/settings.c | 7 | ||||
-rw-r--r-- | apps/settings.h | 9 | ||||
-rw-r--r-- | apps/settings_menu.c | 13 |
4 files changed, 36 insertions, 0 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 1f0ef87ca4..08060fffd6 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3550,3 +3550,10 @@ desc: in radio screen / menu | |||
3550 | eng: "Mode:" | 3550 | eng: "Mode:" |
3551 | voice: "" | 3551 | voice: "" |
3552 | new: | 3552 | new: |
3553 | |||
3554 | id: LANG_BRIGHTNESS | ||
3555 | desc: in settings_menu | ||
3556 | eng: "Brightness" | ||
3557 | voice: "Brightness" | ||
3558 | new: | ||
3559 | |||
diff --git a/apps/settings.c b/apps/settings.c index 22bfc9b60f..118692afe4 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -488,6 +488,10 @@ static const struct bit_entry hd_bits[] = | |||
488 | #endif | 488 | #endif |
489 | {4, S_O(default_codepage), 0, "default codepage", "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,iso8859-6,iso8859-9,iso8859-2,sjis,gb2312,ksx1001,big5,utf-8" }, | 489 | {4, S_O(default_codepage), 0, "default codepage", "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,iso8859-6,iso8859-9,iso8859-2,sjis,gb2312,ksx1001,big5,utf-8" }, |
490 | 490 | ||
491 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
492 | {4, S_O(brightness), 9, "brightness", "2,3,4,5,6,7,8,9,10,11,12,13,14,15"}, | ||
493 | #endif | ||
494 | |||
491 | /* If values are just added to the end, no need to bump the version. */ | 495 | /* If values are just added to the end, no need to bump the version. */ |
492 | /* new stuff to be added at the end */ | 496 | /* new stuff to be added at the end */ |
493 | 497 | ||
@@ -892,6 +896,9 @@ void settings_apply(void) | |||
892 | backlight_set_fade_out(global_settings.backlight_fade_out); | 896 | backlight_set_fade_out(global_settings.backlight_fade_out); |
893 | #endif | 897 | #endif |
894 | #endif | 898 | #endif |
899 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
900 | backlight_set_brightness(global_settings.brightness); | ||
901 | #endif | ||
895 | ata_spindown(global_settings.disk_spindown); | 902 | ata_spindown(global_settings.disk_spindown); |
896 | #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR) | 903 | #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR) |
897 | dac_line_in(global_settings.line_in); | 904 | dac_line_in(global_settings.line_in); |
diff --git a/apps/settings.h b/apps/settings.h index 7378f1daeb..870d9efdd7 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -381,6 +381,10 @@ struct user_settings | |||
381 | #ifdef HAVE_REMOTE_LCD | 381 | #ifdef HAVE_REMOTE_LCD |
382 | unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */ | 382 | unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */ |
383 | #endif | 383 | #endif |
384 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
385 | int brightness; /* iriver h300: backlight PWM value: 2..15 | ||
386 | (0 and 1 are black) */ | ||
387 | #endif | ||
384 | }; | 388 | }; |
385 | 389 | ||
386 | enum optiontype { INT, BOOL }; | 390 | enum optiontype { INT, BOOL }; |
@@ -442,6 +446,11 @@ extern const char rec_base_directory[]; | |||
442 | #endif | 446 | #endif |
443 | #define MIN_CONTRAST_SETTING 5 | 447 | #define MIN_CONTRAST_SETTING 5 |
444 | 448 | ||
449 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
450 | #define MIN_BRIGHTNESS_SETTING 2 | ||
451 | #define MAX_BRIGHTNESS_SETTING 15 | ||
452 | #endif | ||
453 | |||
445 | /* argument bits for settings_load() */ | 454 | /* argument bits for settings_load() */ |
446 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ | 455 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ |
447 | #define SETTINGS_HD 2 /* only the settings fron the disk sector */ | 456 | #define SETTINGS_HD 2 /* only the settings fron the disk sector */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index fc5d75e431..5338be34a3 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -214,6 +214,16 @@ static bool backlight_fade_out(void) | |||
214 | #endif | 214 | #endif |
215 | #endif /* CONFIG_BACKLIGHT */ | 215 | #endif /* CONFIG_BACKLIGHT */ |
216 | 216 | ||
217 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
218 | static bool brightness(void) | ||
219 | { | ||
220 | return set_int( str(LANG_BRIGHTNESS), "", UNIT_INT, | ||
221 | &global_settings.brightness, | ||
222 | backlight_set_brightness, 1, MIN_BRIGHTNESS_SETTING, | ||
223 | MAX_BRIGHTNESS_SETTING, NULL ); | ||
224 | } | ||
225 | #endif | ||
226 | |||
217 | #ifdef HAVE_REMOTE_LCD | 227 | #ifdef HAVE_REMOTE_LCD |
218 | 228 | ||
219 | static bool remote_backlight_timer(void) | 229 | static bool remote_backlight_timer(void) |
@@ -1525,6 +1535,9 @@ static bool lcd_settings_menu(void) | |||
1525 | { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in }, | 1535 | { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in }, |
1526 | { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out }, | 1536 | { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out }, |
1527 | #endif | 1537 | #endif |
1538 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
1539 | { ID2P(LANG_BRIGHTNESS), brightness }, | ||
1540 | #endif | ||
1528 | #endif /* CONFIG_BACKLIGHT */ | 1541 | #endif /* CONFIG_BACKLIGHT */ |
1529 | { ID2P(LANG_CONTRAST), contrast }, | 1542 | { ID2P(LANG_CONTRAST), contrast }, |
1530 | #ifdef HAVE_LCD_BITMAP | 1543 | #ifdef HAVE_LCD_BITMAP |