3 files changed, 28 insertions, 5 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 4746c22c87..ee7fa36d39 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -302,7 +302,8 @@ static const struct bit_entry rtc_bits[] =
 
 #ifdef HAVE_REMOTE_LCD
     /* remote lcd */
-    {6, S_O(remote_contrast), 42, "remote contrast", NULL },
+    {6, S_O(remote_contrast), DEFAULT_REMOTE_CONTRAST_SETTING,
+        "remote contrast", NULL },
     {1, S_O(remote_invert), false, "remote invert", off_on },
     {1, S_O(remote_flip_display), false, "remote flip display", off_on },
     {5, S_O(remote_backlight_timeout), 6, "remote backlight timeout",
@@ -1365,11 +1366,18 @@ void settings_load(int which)
 #ifdef HAVE_RECORDING
     global_settings.recscreen_on = false;
 #endif
+
 #ifdef HAVE_LCD_CONTRAST
-        if ( global_settings.contrast < MIN_CONTRAST_SETTING )
+        if ( global_settings.contrast < MIN_CONTRAST_SETTING ||
+             global_settings.contrast > MAX_CONTRAST_SETTING )
             global_settings.contrast = lcd_default_contrast();
 #endif
 
+#ifdef HAVE_LCD_REMOTE
+        if (global_settings.remote_contrast < MIN_REMOTE_CONTRAST_SETTING ||
+            global_settings.remote_contrast > MAX_REMOTE_CONTRAST_SETTING )
+            global_settings.remote_contrast = lcd_remote_default_contrast();
+#endif
         i = 0xb8;
         strncpy((char *)global_settings.wps_file, (char *)&config_block[i],
                 MAX_FILENAME);
diff --git a/apps/settings.h b/apps/settings.h
index 9f8372415a..3e0b8fcd11 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -108,7 +108,6 @@ extern unsigned char vp_dummy[VIRT_SIZE];
    simplicity. */
 #if !defined(HAVE_LCD_COLOR)
 #define HAVE_LCD_CONTRAST
-#define DEFAULT_CONTRAST_SETTING    40
 #endif
 
 struct user_settings
@@ -545,6 +544,11 @@ extern const char rec_base_directory[];
 
 /* system defines */
 #ifndef TARGET_TREE
+
+#ifndef HAVE_LCD_COLOR
+#define DEFAULT_CONTRAST_SETTING    40
+#endif
+
 #if defined HAVE_LCD_CHARCELLS
 #define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        31
@@ -552,6 +556,17 @@ extern const char rec_base_directory[];
 #define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        63
 #endif
+
+/* As it was */
+#ifdef HAVE_REMOTE_LCD
+#ifndef DEFAULT_REMOTE_CONTRAST_SETTING
+/* May be defined in config file if driver code needs the value */
+#define DEFAULT_REMOTE_CONTRAST_SETTING 42
+#endif
+#define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING
+#define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING
+#endif
+
 #endif /* !TARGET_TREE */
 
 /* argument bits for settings_load() */
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 36615cfc6a..27fc5653d1 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -124,8 +124,8 @@ static bool remote_contrast(void)
 {
     return set_int( str(LANG_CONTRAST), "", UNIT_INT,
                     &global_settings.remote_contrast,
-                    lcd_remote_set_contrast, 1, MIN_CONTRAST_SETTING,
-                    MAX_CONTRAST_SETTING, NULL );
+                    lcd_remote_set_contrast, 1, MIN_REMOTE_CONTRAST_SETTING,
+                    MAX_REMOTE_CONTRAST_SETTING, NULL );
 }
 
 static bool remote_invert(void)