diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-20 17:03:24 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-20 17:03:24 +0000 |
commit | 0a21ffabbe63f8dd5c893266bdd39bebc2231adc (patch) | |
tree | 17a13e534e0546aa09cf6807efcc16fd6db7c6bd /firmware | |
parent | 5a379bce60b22f0a5d469ec5b4d03e7089f49316 (diff) | |
download | rockbox-0a21ffabbe63f8dd5c893266bdd39bebc2231adc.tar.gz rockbox-0a21ffabbe63f8dd5c893266bdd39bebc2231adc.zip |
Clipv2: charging curve + voltage limits
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26200 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/target/arm/as3525/powermgmt-target.h | 10 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h index 76fe8ee433..3fc1fe69f7 100644 --- a/firmware/target/arm/as3525/powermgmt-target.h +++ b/firmware/target/arm/as3525/powermgmt-target.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | #if defined(SANSA_CLIP) \ | 27 | #if defined(SANSA_CLIP) \ |
28 | || defined(SANSA_CLIPV2) /* FIXME */ \ | ||
29 | || defined(SANSA_CLIPPLUS) /* FIXME */ | 28 | || defined(SANSA_CLIPPLUS) /* FIXME */ |
30 | 29 | ||
31 | /* Check if topped-off and monitor voltage while plugged. */ | 30 | /* Check if topped-off and monitor voltage while plugged. */ |
@@ -35,6 +34,15 @@ | |||
35 | #define BATT_CHG_I CHG_I_100MA | 34 | #define BATT_CHG_I CHG_I_100MA |
36 | #define CHARGER_TOTAL_TIMER (6*3600*2) /* about 1.5 * capacity / current */ | 35 | #define CHARGER_TOTAL_TIMER (6*3600*2) /* about 1.5 * capacity / current */ |
37 | 36 | ||
37 | #elif defined(SANSA_CLIPV2) | ||
38 | |||
39 | /* Check if topped-off and monitor voltage while plugged. */ | ||
40 | #define BATT_FULL_VOLTAGE 4200 | ||
41 | #define BATT_VAUTO_RECHARGE 4100 | ||
42 | #define BATT_CHG_V CHG_V_4_20V | ||
43 | #define BATT_CHG_I CHG_I_100MA | ||
44 | #define CHARGER_TOTAL_TIMER (6*3600*2) /* about 1.5 * capacity / current */ | ||
45 | |||
38 | #elif defined(SANSA_E200V2) | 46 | #elif defined(SANSA_E200V2) |
39 | 47 | ||
40 | /* Check if topped-off and monitor voltage while plugged. */ | 48 | /* Check if topped-off and monitor voltage while plugged. */ |
diff --git a/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c index 7e4cc78995..3e8aaacad8 100644 --- a/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c +++ b/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c | |||
@@ -44,8 +44,8 @@ const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | |||
44 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ | 44 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ |
45 | const unsigned short percent_to_volt_charge[11] = | 45 | const unsigned short percent_to_volt_charge[11] = |
46 | { | 46 | { |
47 | /* TODO: simple linear uncalibrated curve */ | 47 | 3379, 3766, 3828, 3855, 3875, 3911, 3975, 4035, 4117, 4217, 4219 |
48 | 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 | 48 | |
49 | }; | 49 | }; |
50 | #endif /* CONFIG_CHARGING */ | 50 | #endif /* CONFIG_CHARGING */ |
51 | 51 | ||