2 files changed, 14 insertions, 7 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 00fea9f84b..db3b45d155 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -240,7 +240,9 @@ static const struct bit_entry rtc_bits[] =
     {32 | SIGNED, S_O(resume_seed), -1, NULL, NULL },
     {3, S_O(repeat_mode), REPEAT_ALL, "repeat", "off,all,one,shuffle,ab" },
     /* LCD */
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
     {6, S_O(contrast), 40, "contrast", NULL },
+#endif
 #ifdef CONFIG_BACKLIGHT
     {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf },
 #ifdef CONFIG_CHARGING
@@ -1015,7 +1017,9 @@ void settings_apply(void)
 
     audio_set_buffer_margin(global_settings.buffer_margin);
 
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
     lcd_set_contrast(global_settings.contrast);
+#endif
     lcd_scroll_speed(global_settings.scroll_speed);
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_set_contrast(global_settings.remote_contrast);
@@ -1259,8 +1263,10 @@ void settings_load(int which)
                 RTC_BLOCK_SIZE*8);
         }
 
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
         if ( global_settings.contrast < MIN_CONTRAST_SETTING )
             global_settings.contrast = lcd_default_contrast();
+#endif
 
         i = 0xb8;
         strncpy((char *)global_settings.wps_file, (char *)&config_block[i],
@@ -1722,7 +1728,9 @@ void settings_reset(void) {
     global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE);
     global_settings.superbass = sound_default(SOUND_SUPERBASS);
 #endif
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
     global_settings.contrast = lcd_default_contrast();
+#endif
 #ifdef HAVE_LCD_REMOTE
     global_settings.remote_contrast = lcd_remote_default_contrast();
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 58e8f3f14e..d32b58ac85 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -274,7 +274,9 @@ struct user_settings
 
     /* device settings */
 
-    int contrast;   /* lcd contrast:          0-63 0=low 63=high            */
+#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5)
+    int contrast;   /* lcd contrast */
+#endif
     bool invert;    /* invert display */
     bool invert_cursor; /* invert the current file in dir browser and menu
                            instead of using the default cursor */
@@ -573,16 +575,13 @@ extern const char rec_base_directory[];
 #ifdef IAUDIO_X5
 #define MIN_CONTRAST_SETTING        0
 #define MAX_CONTRAST_SETTING        29
-#else
-#ifdef HAVE_LCD_CHARCELLS
+#elif defined HAVE_LCD_CHARCELLS
+#define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        31
-#define DEFAULT_CONTRAST_SETTING    30
 #else
+#define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        63
-#define DEFAULT_CONTRAST_SETTING    38
 #endif
-#define MIN_CONTRAST_SETTING        5
-#endif // X5
 
 /* argument bits for settings_load() */
 #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */