4 files changed, 10 insertions, 4 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 4dbd2bf3ac..00fea9f84b 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -94,7 +94,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
 #include "dsp.h"
 #endif
 
-#define CONFIG_BLOCK_VERSION 48
+#define CONFIG_BLOCK_VERSION 49
 #define CONFIG_BLOCK_SIZE 512
 #define RTC_BLOCK_SIZE 44
 
@@ -1260,7 +1260,7 @@ void settings_load(int which)
         }
 
         if ( global_settings.contrast < MIN_CONTRAST_SETTING )
-            global_settings.contrast = DEFAULT_CONTRAST_SETTING;
+            global_settings.contrast = lcd_default_contrast();
 
         i = 0xb8;
         strncpy((char *)global_settings.wps_file, (char *)&config_block[i],
@@ -1722,7 +1722,7 @@ void settings_reset(void) {
     global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE);
     global_settings.superbass = sound_default(SOUND_SUPERBASS);
 #endif
-    global_settings.contrast    = DEFAULT_CONTRAST_SETTING;
+    global_settings.contrast = lcd_default_contrast();
 #ifdef HAVE_LCD_REMOTE
     global_settings.remote_contrast = lcd_remote_default_contrast();
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 51eaca3a51..58e8f3f14e 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -573,7 +573,6 @@ extern const char rec_base_directory[];
 #ifdef IAUDIO_X5
 #define MIN_CONTRAST_SETTING        0
 #define MAX_CONTRAST_SETTING        29
-#define DEFAULT_CONTRAST_SETTING    15
 #else
 #ifdef HAVE_LCD_CHARCELLS
 #define MAX_CONTRAST_SETTING        31
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index ebf714709c..4297937abd 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -72,11 +72,13 @@ static const char scroll_tick_table[16] = {
     100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3
 };
 
+#ifndef TARGET_TREE
 /* probably just a dummy */
 int lcd_default_contrast(void)
 {
     return 28;
 }
+#endif
 
 /* LCD init */
 void lcd_init(void)
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
index 1adcf6aaea..7c155eac8f 100755
--- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
@@ -137,6 +137,11 @@ inline void lcd_write_data(const unsigned short* p_bytes, int count)
 
 /*** hardware configuration ***/
 
+int lcd_default_contrast(void)
+{
+    return 16;
+}
+
 void lcd_set_contrast(int val)
 {
     if (val >= 15) // val must'nt be 15 or 31