summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.c6
-rw-r--r--apps/settings.h1
2 files changed, 3 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;
94#include "dsp.h" 94#include "dsp.h"
95#endif 95#endif
96 96
97#define CONFIG_BLOCK_VERSION 48 97#define CONFIG_BLOCK_VERSION 49
98#define CONFIG_BLOCK_SIZE 512 98#define CONFIG_BLOCK_SIZE 512
99#define RTC_BLOCK_SIZE 44 99#define RTC_BLOCK_SIZE 44
100 100
@@ -1260,7 +1260,7 @@ void settings_load(int which)
1260 } 1260 }
1261 1261
1262 if ( global_settings.contrast < MIN_CONTRAST_SETTING ) 1262 if ( global_settings.contrast < MIN_CONTRAST_SETTING )
1263 global_settings.contrast = DEFAULT_CONTRAST_SETTING; 1263 global_settings.contrast = lcd_default_contrast();
1264 1264
1265 i = 0xb8; 1265 i = 0xb8;
1266 strncpy((char *)global_settings.wps_file, (char *)&config_block[i], 1266 strncpy((char *)global_settings.wps_file, (char *)&config_block[i],
@@ -1722,7 +1722,7 @@ void settings_reset(void) {
1722 global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); 1722 global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE);
1723 global_settings.superbass = sound_default(SOUND_SUPERBASS); 1723 global_settings.superbass = sound_default(SOUND_SUPERBASS);
1724#endif 1724#endif
1725 global_settings.contrast = DEFAULT_CONTRAST_SETTING; 1725 global_settings.contrast = lcd_default_contrast();
1726#ifdef HAVE_LCD_REMOTE 1726#ifdef HAVE_LCD_REMOTE
1727 global_settings.remote_contrast = lcd_remote_default_contrast(); 1727 global_settings.remote_contrast = lcd_remote_default_contrast();
1728#endif 1728#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[];
573#ifdef IAUDIO_X5 573#ifdef IAUDIO_X5
574#define MIN_CONTRAST_SETTING 0 574#define MIN_CONTRAST_SETTING 0
575#define MAX_CONTRAST_SETTING 29 575#define MAX_CONTRAST_SETTING 29
576#define DEFAULT_CONTRAST_SETTING 15
577#else 576#else
578#ifdef HAVE_LCD_CHARCELLS 577#ifdef HAVE_LCD_CHARCELLS
579#define MAX_CONTRAST_SETTING 31 578#define MAX_CONTRAST_SETTING 31