diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 1 | ||||
-rw-r--r-- | firmware/export/config-e200v2.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-e200v2/backlight-e200v2.c | 71 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-e200v2/backlight-target.h | 21 |
5 files changed, 85 insertions, 14 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 7a93d058b4..f2f8526494 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1046,6 +1046,7 @@ target/arm/as3525/as3525-codec.c | |||
1046 | #ifndef SIMULATOR | 1046 | #ifndef SIMULATOR |
1047 | target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 1047 | target/arm/as3525/sansa-e200v2/lcd-e200v2.c |
1048 | target/arm/as3525/sansa-e200v2/button-e200v2.c | 1048 | target/arm/as3525/sansa-e200v2/button-e200v2.c |
1049 | target/arm/as3525/sansa-e200v2/backlight-e200v2.c | ||
1049 | target/arm/as3525/as3525-codec.c | 1050 | target/arm/as3525/as3525-codec.c |
1050 | #endif /* !SIMULATOR */ | 1051 | #endif /* !SIMULATOR */ |
1051 | #endif /* SANSA_E200V2 */ | 1052 | #endif /* SANSA_E200V2 */ |
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h index 5b051f2a89..0dc87d4123 100644 --- a/firmware/export/config-e200v2.h +++ b/firmware/export/config-e200v2.h | |||
@@ -47,6 +47,7 @@ | |||
47 | #define LCD_DEPTH 16 /* 65536 colours */ | 47 | #define LCD_DEPTH 16 /* 65536 colours */ |
48 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ | 48 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ |
49 | 49 | ||
50 | #ifndef BOOTLOADER | ||
50 | /* define this if you have LCD enable function */ | 51 | /* define this if you have LCD enable function */ |
51 | #define HAVE_LCD_ENABLE | 52 | #define HAVE_LCD_ENABLE |
52 | 53 | ||
@@ -54,6 +55,7 @@ | |||
54 | should be defined as well. */ | 55 | should be defined as well. */ |
55 | #define HAVE_LCD_SLEEP | 56 | #define HAVE_LCD_SLEEP |
56 | #define HAVE_LCD_SLEEP_SETTING | 57 | #define HAVE_LCD_SLEEP_SETTING |
58 | #endif | ||
57 | 59 | ||
58 | /* define this if you can flip your LCD */ | 60 | /* define this if you can flip your LCD */ |
59 | #define HAVE_LCD_FLIP | 61 | #define HAVE_LCD_FLIP |
@@ -165,7 +167,7 @@ | |||
165 | #define CONFIG_USBOTG USBOTG_AS3525 | 167 | #define CONFIG_USBOTG USBOTG_AS3525 |
166 | 168 | ||
167 | /* enable these for the experimental usb stack */ | 169 | /* enable these for the experimental usb stack */ |
168 | #define HAVE_USBSTACK | 170 | //#define HAVE_USBSTACK |
169 | #define USB_VENDOR_ID 0x0781 | 171 | #define USB_VENDOR_ID 0x0781 |
170 | #define USB_PRODUCT_ID 0x7423 | 172 | #define USB_PRODUCT_ID 0x7423 |
171 | 173 | ||
diff --git a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c index 4ae13a5fcc..ed4bcc7be9 100644 --- a/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c +++ b/firmware/target/arm/as3525/sansa-clip/lcd-ssd1303.c | |||
@@ -228,6 +228,8 @@ void lcd_init_device(void) | |||
228 | lcd_write_data(p_bytes, LCD_FULLSCREEN /* overscan */); | 228 | lcd_write_data(p_bytes, LCD_FULLSCREEN /* overscan */); |
229 | } | 229 | } |
230 | 230 | ||
231 | lcd_enable(true); | ||
232 | |||
231 | lcd_update(); | 233 | lcd_update(); |
232 | } | 234 | } |
233 | 235 | ||
diff --git a/firmware/target/arm/as3525/sansa-e200v2/backlight-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/backlight-e200v2.c new file mode 100644 index 0000000000..fd2b65ad5b --- /dev/null +++ b/firmware/target/arm/as3525/sansa-e200v2/backlight-e200v2.c | |||
@@ -0,0 +1,71 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Barry Wardell | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #include "config.h" | ||
22 | #include "backlight-target.h" | ||
23 | #include "system.h" | ||
24 | #include "lcd.h" | ||
25 | #include "backlight.h" | ||
26 | #include "as3525-codec.h" | ||
27 | #include "as3514.h" | ||
28 | |||
29 | static unsigned short backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; | ||
30 | |||
31 | void _backlight_set_brightness(int brightness) | ||
32 | { | ||
33 | backlight_brightness = brightness; | ||
34 | |||
35 | if (brightness > 0) | ||
36 | _backlight_on(); | ||
37 | else | ||
38 | _backlight_off(); | ||
39 | } | ||
40 | |||
41 | void _backlight_on(void) | ||
42 | { | ||
43 | #ifdef HAVE_LCD_SLEEP | ||
44 | backlight_lcd_sleep_countdown(false); /* stop counter */ | ||
45 | #endif | ||
46 | #ifdef HAVE_LCD_ENABLE | ||
47 | lcd_enable(true); /* power on lcd + visible display */ | ||
48 | #endif | ||
49 | as3525_codec_write(AS3514_DCDC15, backlight_brightness); | ||
50 | } | ||
51 | |||
52 | void _backlight_off(void) | ||
53 | { | ||
54 | as3525_codec_write(AS3514_DCDC15, 0x0); | ||
55 | #ifdef HAVE_LCD_ENABLE | ||
56 | lcd_enable(false); /* power off visible display */ | ||
57 | #endif | ||
58 | #ifdef HAVE_LCD_SLEEP | ||
59 | backlight_lcd_sleep_countdown(true); /* start countdown */ | ||
60 | #endif | ||
61 | } | ||
62 | |||
63 | void _buttonlight_on(void) | ||
64 | { | ||
65 | /* TODO */ | ||
66 | } | ||
67 | |||
68 | void _buttonlight_off(void) | ||
69 | { | ||
70 | /* TODO */ | ||
71 | } | ||
diff --git a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h index 9533d0a6b5..db2cecc07a 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2008 ?? | 10 | * Copyright (C) 2006 Barry Wardell |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
13 | * modify it under the terms of the GNU General Public License | 13 | * modify it under the terms of the GNU General Public License |
@@ -21,17 +21,12 @@ | |||
21 | #ifndef BACKLIGHT_TARGET_H | 21 | #ifndef BACKLIGHT_TARGET_H |
22 | #define BACKLIGHT_TARGET_H | 22 | #define BACKLIGHT_TARGET_H |
23 | 23 | ||
24 | static inline bool _backlight_init(void) | 24 | #define _backlight_init() true |
25 | { | 25 | void _backlight_on(void); |
26 | return true; | 26 | void _backlight_off(void); |
27 | } | 27 | void _backlight_set_brightness(int brightness); |
28 | 28 | int __backlight_is_on(void); | |
29 | static inline void _backlight_on(void) | ||
30 | { | ||
31 | } | ||
32 | |||
33 | static inline void _backlight_off(void) | ||
34 | { | ||
35 | } | ||
36 | 29 | ||
30 | void _buttonlight_on(void); | ||
31 | void _buttonlight_off(void); | ||
37 | #endif | 32 | #endif |