diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/settings.c | 8 | ||||
-rw-r--r-- | apps/settings.h | 13 |
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[] = | |||
240 | {32 | SIGNED, S_O(resume_seed), -1, NULL, NULL }, | 240 | {32 | SIGNED, S_O(resume_seed), -1, NULL, NULL }, |
241 | {3, S_O(repeat_mode), REPEAT_ALL, "repeat", "off,all,one,shuffle,ab" }, | 241 | {3, S_O(repeat_mode), REPEAT_ALL, "repeat", "off,all,one,shuffle,ab" }, |
242 | /* LCD */ | 242 | /* LCD */ |
243 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
243 | {6, S_O(contrast), 40, "contrast", NULL }, | 244 | {6, S_O(contrast), 40, "contrast", NULL }, |
245 | #endif | ||
244 | #ifdef CONFIG_BACKLIGHT | 246 | #ifdef CONFIG_BACKLIGHT |
245 | {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf }, | 247 | {5, S_O(backlight_timeout), 5, "backlight timeout", backlight_times_conf }, |
246 | #ifdef CONFIG_CHARGING | 248 | #ifdef CONFIG_CHARGING |
@@ -1015,7 +1017,9 @@ void settings_apply(void) | |||
1015 | 1017 | ||
1016 | audio_set_buffer_margin(global_settings.buffer_margin); | 1018 | audio_set_buffer_margin(global_settings.buffer_margin); |
1017 | 1019 | ||
1020 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
1018 | lcd_set_contrast(global_settings.contrast); | 1021 | lcd_set_contrast(global_settings.contrast); |
1022 | #endif | ||
1019 | lcd_scroll_speed(global_settings.scroll_speed); | 1023 | lcd_scroll_speed(global_settings.scroll_speed); |
1020 | #ifdef HAVE_REMOTE_LCD | 1024 | #ifdef HAVE_REMOTE_LCD |
1021 | lcd_remote_set_contrast(global_settings.remote_contrast); | 1025 | lcd_remote_set_contrast(global_settings.remote_contrast); |
@@ -1259,8 +1263,10 @@ void settings_load(int which) | |||
1259 | RTC_BLOCK_SIZE*8); | 1263 | RTC_BLOCK_SIZE*8); |
1260 | } | 1264 | } |
1261 | 1265 | ||
1266 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
1262 | if ( global_settings.contrast < MIN_CONTRAST_SETTING ) | 1267 | if ( global_settings.contrast < MIN_CONTRAST_SETTING ) |
1263 | global_settings.contrast = lcd_default_contrast(); | 1268 | global_settings.contrast = lcd_default_contrast(); |
1269 | #endif | ||
1264 | 1270 | ||
1265 | i = 0xb8; | 1271 | i = 0xb8; |
1266 | strncpy((char *)global_settings.wps_file, (char *)&config_block[i], | 1272 | strncpy((char *)global_settings.wps_file, (char *)&config_block[i], |
@@ -1722,7 +1728,9 @@ void settings_reset(void) { | |||
1722 | global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); | 1728 | global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE); |
1723 | global_settings.superbass = sound_default(SOUND_SUPERBASS); | 1729 | global_settings.superbass = sound_default(SOUND_SUPERBASS); |
1724 | #endif | 1730 | #endif |
1731 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) | ||
1725 | global_settings.contrast = lcd_default_contrast(); | 1732 | global_settings.contrast = lcd_default_contrast(); |
1733 | #endif | ||
1726 | #ifdef HAVE_LCD_REMOTE | 1734 | #ifdef HAVE_LCD_REMOTE |
1727 | global_settings.remote_contrast = lcd_remote_default_contrast(); | 1735 | global_settings.remote_contrast = lcd_remote_default_contrast(); |
1728 | #endif | 1736 | #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 | |||
274 | 274 | ||
275 | /* device settings */ | 275 | /* device settings */ |
276 | 276 | ||
277 | int contrast; /* lcd contrast: 0-63 0=low 63=high */ | 277 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) |
278 | int contrast; /* lcd contrast */ | ||
279 | #endif | ||
278 | bool invert; /* invert display */ | 280 | bool invert; /* invert display */ |
279 | bool invert_cursor; /* invert the current file in dir browser and menu | 281 | bool invert_cursor; /* invert the current file in dir browser and menu |
280 | instead of using the default cursor */ | 282 | instead of using the default cursor */ |
@@ -573,16 +575,13 @@ extern const char rec_base_directory[]; | |||
573 | #ifdef IAUDIO_X5 | 575 | #ifdef IAUDIO_X5 |
574 | #define MIN_CONTRAST_SETTING 0 | 576 | #define MIN_CONTRAST_SETTING 0 |
575 | #define MAX_CONTRAST_SETTING 29 | 577 | #define MAX_CONTRAST_SETTING 29 |
576 | #else | 578 | #elif defined HAVE_LCD_CHARCELLS |
577 | #ifdef HAVE_LCD_CHARCELLS | 579 | #define MIN_CONTRAST_SETTING 5 |
578 | #define MAX_CONTRAST_SETTING 31 | 580 | #define MAX_CONTRAST_SETTING 31 |
579 | #define DEFAULT_CONTRAST_SETTING 30 | ||
580 | #else | 581 | #else |
582 | #define MIN_CONTRAST_SETTING 5 | ||
581 | #define MAX_CONTRAST_SETTING 63 | 583 | #define MAX_CONTRAST_SETTING 63 |
582 | #define DEFAULT_CONTRAST_SETTING 38 | ||
583 | #endif | 584 | #endif |
584 | #define MIN_CONTRAST_SETTING 5 | ||
585 | #endif // X5 | ||
586 | 585 | ||
587 | /* argument bits for settings_load() */ | 586 | /* argument bits for settings_load() */ |
588 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ | 587 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ |