diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-06-20 14:29:21 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-06-20 14:29:21 +0000 |
commit | f81ce592e5a48c95a0c125a73092217c53014874 (patch) | |
tree | f3224a7f52ca66c56c37574b3ecf9bd407677c06 | |
parent | f289b9f591746e5ff85835194bf7eae8ff088e6b (diff) | |
download | rockbox-f81ce592e5a48c95a0c125a73092217c53014874.tar.gz rockbox-f81ce592e5a48c95a0c125a73092217c53014874.zip |
Enable charging on the Sansa Fuze (charging/discharging curves are still uncalibrated)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21394 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/debug_menu.c | 4 | ||||
-rw-r--r-- | firmware/SOURCES | 3 | ||||
-rw-r--r-- | firmware/export/config-fuze.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/as3525/powermgmt-target.h | 10 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c | 52 |
5 files changed, 68 insertions, 5 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 92ef222d98..bb6dd1033a 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -107,7 +107,7 @@ | |||
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | #if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) \ | 109 | #if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) \ |
110 | || defined(SANSA_CLIP) | 110 | || defined(SANSA_CLIP) || defined(SANSA_FUZE) |
111 | #include "ascodec.h" | 111 | #include "ascodec.h" |
112 | #include "as3514.h" | 112 | #include "as3514.h" |
113 | #endif | 113 | #endif |
@@ -1765,7 +1765,7 @@ static bool view_battery(void) | |||
1765 | } | 1765 | } |
1766 | 1766 | ||
1767 | lcd_puts(0, line++, buf); | 1767 | lcd_puts(0, line++, buf); |
1768 | #elif defined(SANSA_E200) || defined(SANSA_C200) || defined(SANSA_CLIP) | 1768 | #elif defined(SANSA_E200) || defined(SANSA_C200) || defined(SANSA_CLIP) || defined(SANSA_FUZE) |
1769 | const int first = CHARGE_STATE_DISABLED; | 1769 | const int first = CHARGE_STATE_DISABLED; |
1770 | static const char * const chrgstate_strings[] = | 1770 | static const char * const chrgstate_strings[] = |
1771 | { | 1771 | { |
diff --git a/firmware/SOURCES b/firmware/SOURCES index 742a582d6f..65652b8523 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1166,7 +1166,8 @@ target/arm/as3525/sansa-fuze/lcd-fuze.c | |||
1166 | target/arm/as3525/lcd-as-e200v2-fuze.S | 1166 | target/arm/as3525/lcd-as-e200v2-fuze.S |
1167 | target/arm/as3525/backlight-e200v2-fuze.c | 1167 | target/arm/as3525/backlight-e200v2-fuze.c |
1168 | #ifndef BOOTLOADER | 1168 | #ifndef BOOTLOADER |
1169 | target/arm/as3525/powermgmt-as3525.c | 1169 | target/arm/powermgmt-ascodec.c |
1170 | target/arm/as3525/sansa-fuze/powermgmt-fuze.c | ||
1170 | #endif /* !BOOTLOADER */ | 1171 | #endif /* !BOOTLOADER */ |
1171 | #endif /* !SIMULATOR */ | 1172 | #endif /* !SIMULATOR */ |
1172 | #endif /* SANSA_FUZE */ | 1173 | #endif /* SANSA_FUZE */ |
diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index a30f95e5b0..c8fae9aca9 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h | |||
@@ -148,8 +148,8 @@ | |||
148 | #define BATTERY_CAPACITY_INC 0 /* capacity increment */ | 148 | #define BATTERY_CAPACITY_INC 0 /* capacity increment */ |
149 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 149 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
150 | 150 | ||
151 | /* Hardware controlled charging? FIXME */ | 151 | /* Charging implemented in a target-specific algorithm */ |
152 | #define CONFIG_CHARGING CHARGING_SIMPLE | 152 | #define CONFIG_CHARGING CHARGING_TARGET |
153 | 153 | ||
154 | /* define this if the unit can be powered or charged via USB */ | 154 | /* define this if the unit can be powered or charged via USB */ |
155 | #define HAVE_USB_POWER | 155 | #define HAVE_USB_POWER |
diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h index 3f23d6d3d7..d458508275 100644 --- a/firmware/target/arm/as3525/powermgmt-target.h +++ b/firmware/target/arm/as3525/powermgmt-target.h | |||
@@ -42,6 +42,16 @@ | |||
42 | #define CHARGER_TOTAL_TIMER (4*3600*2) | 42 | #define CHARGER_TOTAL_TIMER (4*3600*2) |
43 | #define ADC_BATTERY ADC_BVDD | 43 | #define ADC_BATTERY ADC_BVDD |
44 | 44 | ||
45 | #elif defined(SANSA_FUZE) | ||
46 | |||
47 | /* Check if topped-off and monitor voltage while plugged. */ | ||
48 | #define BATT_FULL_VOLTAGE 4160 | ||
49 | #define BATT_VAUTO_RECHARGE 4100 | ||
50 | #define BATT_CHG_V CHG_V_4_20V | ||
51 | #define BATT_CHG_I CHG_I_200MA | ||
52 | #define CHARGER_TOTAL_TIMER (4*3600*2) | ||
53 | #define ADC_BATTERY ADC_BVDD | ||
54 | |||
45 | #else | 55 | #else |
46 | #error "Charger settings not defined!" | 56 | #error "Charger settings not defined!" |
47 | #endif | 57 | #endif |
diff --git a/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c b/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c new file mode 100644 index 0000000000..d0d39912f2 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c | |||
@@ -0,0 +1,52 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright © 2008 Rafaël Carré | ||
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 | |||
22 | #include "config.h" | ||
23 | |||
24 | /* The battery manufacturer's website shows discharge curves down to 3.0V, | ||
25 | so 'dangerous' and 'shutoff' levels of 3.4V and 3.3V should be safe. | ||
26 | */ | ||
27 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = | ||
28 | { | ||
29 | 3400 | ||
30 | }; | ||
31 | |||
32 | const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = | ||
33 | { | ||
34 | 3300 | ||
35 | }; | ||
36 | |||
37 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ | ||
38 | const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | ||
39 | { | ||
40 | /* TODO: simple linear uncalibrated curve */ | ||
41 | { 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 } | ||
42 | }; | ||
43 | |||
44 | #if CONFIG_CHARGING | ||
45 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ | ||
46 | const unsigned short percent_to_volt_charge[11] = | ||
47 | { | ||
48 | /* TODO: simple linear uncalibrated curve */ | ||
49 | 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 | ||
50 | }; | ||
51 | #endif /* CONFIG_CHARGING */ | ||
52 | |||