diff options
author | Rani Hod <raenye@gmail.com> | 2006-07-23 22:18:32 +0000 |
---|---|---|
committer | Rani Hod <raenye@gmail.com> | 2006-07-23 22:18:32 +0000 |
commit | c657763a23797238b4f95f7d52ac4902fd05f306 (patch) | |
tree | 898bd9ad893de4904be01b16894aec99ece5f43d | |
parent | 3c810c4f6ae374e1aed674b8171fcd220d58f13a (diff) | |
download | rockbox-c657763a23797238b4f95f7d52ac4902fd05f306.tar.gz rockbox-c657763a23797238b4f95f7d52ac4902fd05f306.zip |
Accepted FS #5474 by yours truly.
Save your settings; CONFIG_BLOCK_VERSION is increased.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10303 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.c | 6 | ||||
-rw-r--r-- | apps/settings.h | 7 | ||||
-rw-r--r-- | apps/settings_menu.c | 8 | ||||
-rw-r--r-- | firmware/backlight.c | 2 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 3 | ||||
-rwxr-xr-x | firmware/target/coldfire/iaudio/x5/lcd-x5.c | 11 |
6 files changed, 24 insertions, 13 deletions
diff --git a/apps/settings.c b/apps/settings.c index 8846fa4bcf..4dbd2bf3ac 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 47 | 97 | #define CONFIG_BLOCK_VERSION 48 |
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 = lcd_default_contrast(); | 1263 | global_settings.contrast = DEFAULT_CONTRAST_SETTING; |
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 = lcd_default_contrast(); | 1725 | global_settings.contrast = DEFAULT_CONTRAST_SETTING; |
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 8c47c9253e..51eaca3a51 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -570,6 +570,11 @@ extern const char rec_base_directory[]; | |||
570 | 570 | ||
571 | /* system defines */ | 571 | /* system defines */ |
572 | 572 | ||
573 | #ifdef IAUDIO_X5 | ||
574 | #define MIN_CONTRAST_SETTING 0 | ||
575 | #define MAX_CONTRAST_SETTING 29 | ||
576 | #define DEFAULT_CONTRAST_SETTING 15 | ||
577 | #else | ||
573 | #ifdef HAVE_LCD_CHARCELLS | 578 | #ifdef HAVE_LCD_CHARCELLS |
574 | #define MAX_CONTRAST_SETTING 31 | 579 | #define MAX_CONTRAST_SETTING 31 |
575 | #define DEFAULT_CONTRAST_SETTING 30 | 580 | #define DEFAULT_CONTRAST_SETTING 30 |
@@ -578,7 +583,7 @@ extern const char rec_base_directory[]; | |||
578 | #define DEFAULT_CONTRAST_SETTING 38 | 583 | #define DEFAULT_CONTRAST_SETTING 38 |
579 | #endif | 584 | #endif |
580 | #define MIN_CONTRAST_SETTING 5 | 585 | #define MIN_CONTRAST_SETTING 5 |
581 | 586 | #endif // X5 | |
582 | 587 | ||
583 | /* argument bits for settings_load() */ | 588 | /* argument bits for settings_load() */ |
584 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ | 589 | #define SETTINGS_RTC 1 /* only the settings from the RTC nonvolatile RAM */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 3e02727f9e..f088c3be3d 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -266,7 +266,7 @@ static bool remote_caption_backlight(void) | |||
266 | } | 266 | } |
267 | #endif /* HAVE_REMOTE_LCD */ | 267 | #endif /* HAVE_REMOTE_LCD */ |
268 | 268 | ||
269 | #ifndef HAVE_LCD_COLOR | 269 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) |
270 | static bool contrast(void) | 270 | static bool contrast(void) |
271 | { | 271 | { |
272 | return set_int( str(LANG_CONTRAST), "", UNIT_INT, | 272 | return set_int( str(LANG_CONTRAST), "", UNIT_INT, |
@@ -1776,12 +1776,12 @@ static bool lcd_settings_menu(void) | |||
1776 | { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in }, | 1776 | { ID2P(LANG_BACKLIGHT_FADE_IN), backlight_fade_in }, |
1777 | { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out }, | 1777 | { ID2P(LANG_BACKLIGHT_FADE_OUT), backlight_fade_out }, |
1778 | #endif | 1778 | #endif |
1779 | { ID2P(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), set_bl_filter_first_keypress }, | ||
1779 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 1780 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
1780 | { ID2P(LANG_BRIGHTNESS), brightness }, | 1781 | { ID2P(LANG_BRIGHTNESS), brightness }, |
1781 | #endif | 1782 | #endif |
1782 | { ID2P(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), set_bl_filter_first_keypress }, | ||
1783 | #endif /* CONFIG_BACKLIGHT */ | 1783 | #endif /* CONFIG_BACKLIGHT */ |
1784 | #ifndef HAVE_LCD_COLOR | 1784 | #if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) |
1785 | { ID2P(LANG_CONTRAST), contrast }, | 1785 | { ID2P(LANG_CONTRAST), contrast }, |
1786 | #endif | 1786 | #endif |
1787 | #ifdef HAVE_LCD_BITMAP | 1787 | #ifdef HAVE_LCD_BITMAP |
diff --git a/firmware/backlight.c b/firmware/backlight.c index 76ffc6f0e4..8568c98829 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -655,7 +655,7 @@ bool is_remote_backlight_on(void) {return true;} | |||
655 | #endif /* #ifdef CONFIG_BACKLIGHT */ | 655 | #endif /* #ifdef CONFIG_BACKLIGHT */ |
656 | 656 | ||
657 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 657 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
658 | #ifdef IRIVER_H300_SERIES | 658 | #if defined(IRIVER_H300_SERIES) || defined(IAUDIO_X5) |
659 | void backlight_set_brightness(int val) | 659 | void backlight_set_brightness(int val) |
660 | { | 660 | { |
661 | /* set H300 brightness by changing the PWM | 661 | /* set H300 brightness by changing the PWM |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index a04967c455..7ce230ee8e 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -42,7 +42,8 @@ | |||
42 | #define CONFIG_LCD LCD_X5 | 42 | #define CONFIG_LCD LCD_X5 |
43 | 43 | ||
44 | /* Define this for LCD backlight available */ | 44 | /* Define this for LCD backlight available */ |
45 | #define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */ | 45 | #define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled !?!? */ |
46 | #define HAVE_BACKLIGHT_BRIGHTNESS | ||
46 | 47 | ||
47 | /* Define this if you have a software controlled poweroff */ | 48 | /* Define this if you have a software controlled poweroff */ |
48 | #define HAVE_SW_POWEROFF | 49 | #define HAVE_SW_POWEROFF |
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c index 75ec2462be..1adcf6aaea 100755 --- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c +++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c | |||
@@ -38,8 +38,8 @@ static bool display_on=false; /* is the display turned on? */ | |||
38 | /* register defines for the Renesas HD66773R */ | 38 | /* register defines for the Renesas HD66773R */ |
39 | #define R_HORIZ_RAM_ADDR_POS 0x16 | 39 | #define R_HORIZ_RAM_ADDR_POS 0x16 |
40 | #define R_VERT_RAM_ADDR_POS 0x17 | 40 | #define R_VERT_RAM_ADDR_POS 0x17 |
41 | #define R_RAM_ADDR_SET 0x21 | 41 | #define R_RAM_ADDR_SET 0x21 |
42 | #define R_WRITE_DATA_2_GRAM 0x22 | 42 | #define R_WRITE_DATA_2_GRAM 0x22 |
43 | 43 | ||
44 | /***************************************************** | 44 | /***************************************************** |
45 | The table below was generated by the following script: | 45 | The table below was generated by the following script: |
@@ -139,7 +139,12 @@ inline void lcd_write_data(const unsigned short* p_bytes, int count) | |||
139 | 139 | ||
140 | void lcd_set_contrast(int val) | 140 | void lcd_set_contrast(int val) |
141 | { | 141 | { |
142 | (void)val; | 142 | if (val >= 15) // val must'nt be 15 or 31 |
143 | ++val; | ||
144 | if (val > 30) | ||
145 | return; | ||
146 | |||
147 | lcd_write_reg(0x0e, 0x201e + (val << 8)); | ||
143 | } | 148 | } |
144 | 149 | ||
145 | void lcd_set_invert_display(bool yesno) | 150 | void lcd_set_invert_display(bool yesno) |