diff options
Diffstat (limited to 'firmware/target/arm/as3525')
3 files changed, 55 insertions, 8 deletions
diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h index 2fe311db30..42efe1d2dc 100644 --- a/firmware/target/arm/as3525/powermgmt-target.h +++ b/firmware/target/arm/as3525/powermgmt-target.h | |||
@@ -36,11 +36,11 @@ | |||
36 | #elif defined(SANSA_CLIPPLUS) | 36 | #elif defined(SANSA_CLIPPLUS) |
37 | 37 | ||
38 | /* Check if topped-off and monitor voltage while plugged. */ | 38 | /* Check if topped-off and monitor voltage while plugged. */ |
39 | #define BATT_FULL_VOLTAGE 4200 | 39 | #define BATT_FULL_VOLTAGE 4160 |
40 | #define BATT_VAUTO_RECHARGE 4100 | 40 | #define BATT_VAUTO_RECHARGE 4100 |
41 | #define BATT_CHG_V CHG_V_4_20V | 41 | #define BATT_CHG_V CHG_V_4_20V |
42 | #define BATT_CHG_I CHG_I_100MA | 42 | #define BATT_CHG_I CHG_I_150MA |
43 | #define CHARGER_TOTAL_TIMER (6*3600*2) /* about 1.5 * capacity / current */ | 43 | #define CHARGER_TOTAL_TIMER (4*3600*2) /* about 1.5 * capacity / current */ |
44 | 44 | ||
45 | #elif defined(SANSA_CLIPV2) | 45 | #elif defined(SANSA_CLIPV2) |
46 | 46 | ||
@@ -48,8 +48,8 @@ | |||
48 | #define BATT_FULL_VOLTAGE 4200 | 48 | #define BATT_FULL_VOLTAGE 4200 |
49 | #define BATT_VAUTO_RECHARGE 4100 | 49 | #define BATT_VAUTO_RECHARGE 4100 |
50 | #define BATT_CHG_V CHG_V_4_20V | 50 | #define BATT_CHG_V CHG_V_4_20V |
51 | #define BATT_CHG_I CHG_I_100MA | 51 | #define BATT_CHG_I CHG_I_150MA |
52 | #define CHARGER_TOTAL_TIMER (6*3600*2) /* about 1.5 * capacity / current */ | 52 | #define CHARGER_TOTAL_TIMER (4*3600*2) /* about 1.5 * capacity / current */ |
53 | 53 | ||
54 | #elif defined(SANSA_E200V2) | 54 | #elif defined(SANSA_E200V2) |
55 | 55 | ||
diff --git a/firmware/target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c b/firmware/target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c new file mode 100644 index 0000000000..c209535406 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-clipplus/powermgmt-clipplus.c | |||
@@ -0,0 +1,49 @@ | |||
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 | { 3300, 3653, 3701, 3735, 3768, 3790, 3833, 3900, 3966, 4056, 4140 } | ||
41 | }; | ||
42 | |||
43 | #if CONFIG_CHARGING | ||
44 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ | ||
45 | const unsigned short percent_to_volt_charge[11] = | ||
46 | { | ||
47 | 3333, 3757, 3815, 3845, 3867, 3900, 3950, 4008, 4078, 4166, 4167 | ||
48 | }; | ||
49 | #endif /* CONFIG_CHARGING */ | ||
diff --git a/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c index 3e8aaacad8..7ba5dd7b5c 100644 --- a/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c +++ b/firmware/target/arm/as3525/sansa-clipv2/powermgmt-clipv2.c | |||
@@ -44,8 +44,6 @@ 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 | 3379, 3766, 3828, 3855, 3875, 3911, 3975, 4035, 4117, 4217, 4219 | 47 | 3417, 3802, 3856, 3888, 3905, 3931, 3973, 4025, 4084, 4161, 4219 |
48 | |||
49 | }; | 48 | }; |
50 | #endif /* CONFIG_CHARGING */ | 49 | #endif /* CONFIG_CHARGING */ |
51 | |||