Patch No 1387627 by Peter D'Hoye: Backlight Brightness setting for H300

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

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
 eng: "Mode:"
 voice: ""
 new:
+
+id: LANG_BRIGHTNESS
+desc: in settings_menu
+eng: "Brightness"
+voice: "Brightness"
+new:
+
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[] =
 #endif
     {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" },
     
+#ifdef HAVE_BACKLIGHT_BRIGHTNESS
+    {4, S_O(brightness), 9, "brightness", "2,3,4,5,6,7,8,9,10,11,12,13,14,15"},
+#endif
+
     /* If values are just added to the end, no need to bump the version. */
     /* new stuff to be added at the end */
 
@@ -892,6 +896,9 @@ void settings_apply(void)
     backlight_set_fade_out(global_settings.backlight_fade_out);
 #endif
 #endif
+#ifdef HAVE_BACKLIGHT_BRIGHTNESS
+    backlight_set_brightness(global_settings.brightness);
+#endif
     ata_spindown(global_settings.disk_spindown);
 #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR)
     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
 #ifdef HAVE_REMOTE_LCD
     unsigned char rwps_file[MAX_FILENAME+1];  /* last remote-wps */
 #endif
+#ifdef HAVE_BACKLIGHT_BRIGHTNESS 
+    int brightness;         /* iriver h300: backlight PWM value: 2..15
+                                (0 and 1 are black) */
+#endif
 };
 
 enum optiontype { INT, BOOL };
@@ -442,6 +446,11 @@ extern const char rec_base_directory[];
 #endif
 #define MIN_CONTRAST_SETTING        5
 
+#ifdef HAVE_BACKLIGHT_BRIGHTNESS
+#define MIN_BRIGHTNESS_SETTING      2
+#define MAX_BRIGHTNESS_SETTING      15
+#endif
+
 /* argument bits for settings_load() */
 #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */
 #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)
 #endif
 #endif /* CONFIG_BACKLIGHT */
 
+#ifdef HAVE_BACKLIGHT_BRIGHTNESS
+static bool brightness(void)
+{
+    return set_int( str(LANG_BRIGHTNESS), "", UNIT_INT,
+                    &global_settings.brightness, 
+                    backlight_set_brightness, 1, MIN_BRIGHTNESS_SETTING,
+                    MAX_BRIGHTNESS_SETTING, NULL );
+}
+#endif
+
 #ifdef HAVE_REMOTE_LCD
 
 static bool remote_backlight_timer(void)
@@ -1525,6 +1535,9 @@ static bool lcd_settings_menu(void)
         { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in },
         { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out },
 #endif
+#ifdef HAVE_BACKLIGHT_BRIGHTNESS
+        { ID2P(LANG_BRIGHTNESS), brightness },
+#endif
 #endif /* CONFIG_BACKLIGHT */
         { ID2P(LANG_CONTRAST),        contrast },
 #ifdef HAVE_LCD_BITMAP