diff options
-rw-r--r-- | firmware/backlight.c | 6 | ||||
-rw-r--r-- | firmware/export/config-e200v2.h | 11 | ||||
-rw-r--r-- | firmware/export/config-fuze.h | 11 | ||||
-rw-r--r-- | firmware/target/arm/as3525/backlight-e200v2-fuze.c | 7 |
4 files changed, 18 insertions, 17 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 66cc6df569..f0a0bb518b 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -463,9 +463,9 @@ static void backlight_set_up_fade_down(void) | |||
463 | _backlight_off(); | 463 | _backlight_off(); |
464 | /* h300/x5/d2 go to the last known brightness level at backight_on(),which | 464 | /* h300/x5/d2 go to the last known brightness level at backight_on(),which |
465 | * should be the lowest level to keep fading up glitch free | 465 | * should be the lowest level to keep fading up glitch free |
466 | * sansa e200/c200 make the backlight on only by setting the brightness, | 466 | * targets which set brightness over AS3514 I2C make the backlight on only |
467 | * so this step would be noticeable */ | 467 | * by setting the brightness, so this step would be noticeable */ |
468 | #if !defined(SANSA_E200) && !defined(SANSA_C200) | 468 | #if !defined(HAVE_AS3514) |
469 | _backlight_set_brightness(MIN_BRIGHTNESS_SETTING); | 469 | _backlight_set_brightness(MIN_BRIGHTNESS_SETTING); |
470 | #endif | 470 | #endif |
471 | } | 471 | } |
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h index 08a672b057..5b6ac5ff48 100644 --- a/firmware/export/config-e200v2.h +++ b/firmware/export/config-e200v2.h | |||
@@ -134,6 +134,12 @@ | |||
134 | /** Non-simulator section **/ | 134 | /** Non-simulator section **/ |
135 | #ifndef SIMULATOR | 135 | #ifndef SIMULATOR |
136 | 136 | ||
137 | /* define this if the backlight thread is used for fade, not for sim, needs | ||
138 | * HAVE_BACKLIGHT_BRIGHTNESS */ | ||
139 | #ifndef BOOTLOADER | ||
140 | #define USE_BACKLIGHT_SW_FADING | ||
141 | #endif | ||
142 | |||
137 | /* Define this if you have an AMS AS3525*/ | 143 | /* Define this if you have an AMS AS3525*/ |
138 | #define CONFIG_CPU AS3525 | 144 | #define CONFIG_CPU AS3525 |
139 | 145 | ||
@@ -200,8 +206,3 @@ | |||
200 | #define DEFAULT_REC_MIC_GAIN 23 | 206 | #define DEFAULT_REC_MIC_GAIN 23 |
201 | #define DEFAULT_REC_LEFT_GAIN 23 | 207 | #define DEFAULT_REC_LEFT_GAIN 23 |
202 | #define DEFAULT_REC_RIGHT_GAIN 23 | 208 | #define DEFAULT_REC_RIGHT_GAIN 23 |
203 | |||
204 | #ifdef E200R_INSTALLER | ||
205 | #define IRAMORIG 0x40004000 | ||
206 | #endif | ||
207 | |||
diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index 5607e4a93f..e79abb19f2 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h | |||
@@ -134,6 +134,12 @@ | |||
134 | /** Non-simulator section **/ | 134 | /** Non-simulator section **/ |
135 | #ifndef SIMULATOR | 135 | #ifndef SIMULATOR |
136 | 136 | ||
137 | /* define this if the backlight thread is used for fade, not for sim, needs | ||
138 | * HAVE_BACKLIGHT_BRIGHTNESS */ | ||
139 | #ifndef BOOTLOADER | ||
140 | #define USE_BACKLIGHT_SW_FADING | ||
141 | #endif | ||
142 | |||
137 | /* Define this if you have an AMS AS3525*/ | 143 | /* Define this if you have an AMS AS3525*/ |
138 | #define CONFIG_CPU AS3525 | 144 | #define CONFIG_CPU AS3525 |
139 | 145 | ||
@@ -200,8 +206,3 @@ | |||
200 | #define DEFAULT_REC_MIC_GAIN 23 | 206 | #define DEFAULT_REC_MIC_GAIN 23 |
201 | #define DEFAULT_REC_LEFT_GAIN 23 | 207 | #define DEFAULT_REC_LEFT_GAIN 23 |
202 | #define DEFAULT_REC_RIGHT_GAIN 23 | 208 | #define DEFAULT_REC_RIGHT_GAIN 23 |
203 | |||
204 | #ifdef E200R_INSTALLER | ||
205 | #define IRAMORIG 0x40004000 | ||
206 | #endif | ||
207 | |||
diff --git a/firmware/target/arm/as3525/backlight-e200v2-fuze.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c index 2c0aad27ab..c642064591 100644 --- a/firmware/target/arm/as3525/backlight-e200v2-fuze.c +++ b/firmware/target/arm/as3525/backlight-e200v2-fuze.c | |||
@@ -28,10 +28,7 @@ | |||
28 | 28 | ||
29 | void _backlight_set_brightness(int brightness) | 29 | void _backlight_set_brightness(int brightness) |
30 | { | 30 | { |
31 | if (brightness > 0) | 31 | ascodec_write(AS3514_DCDC15, brightness); |
32 | _backlight_on(); | ||
33 | else | ||
34 | _backlight_off(); | ||
35 | } | 32 | } |
36 | 33 | ||
37 | void _backlight_on(void) | 34 | void _backlight_on(void) |
@@ -42,7 +39,9 @@ void _backlight_on(void) | |||
42 | #ifdef HAVE_LCD_ENABLE | 39 | #ifdef HAVE_LCD_ENABLE |
43 | lcd_enable(true); /* power on lcd + visible display */ | 40 | lcd_enable(true); /* power on lcd + visible display */ |
44 | #endif | 41 | #endif |
42 | #ifndef USE_BACKLIGHT_SW_FADING | ||
45 | ascodec_write(AS3514_DCDC15, backlight_brightness); | 43 | ascodec_write(AS3514_DCDC15, backlight_brightness); |
44 | #endif | ||
46 | } | 45 | } |
47 | 46 | ||
48 | void _backlight_off(void) | 47 | void _backlight_off(void) |