summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-05-20 12:53:20 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-05-20 12:53:20 +0000
commitddecf431e0793597c86456773291478579193ac2 (patch)
tree598a944f33c28176e12be2996a4bafb7fab7fe93 /firmware
parent6b5fc853b68849cc7747d443223df46938e2e2a9 (diff)
downloadrockbox-ddecf431e0793597c86456773291478579193ac2.tar.gz
rockbox-ddecf431e0793597c86456773291478579193ac2.tar.bz2
rockbox-ddecf431e0793597c86456773291478579193ac2.zip
fuzev2: charging curve and voltage limits
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26190 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/as3525/powermgmt-target.h11
-rw-r--r--firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c4
2 files changed, 12 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h
index 50736b1e56..76fe8ee433 100644
--- a/firmware/target/arm/as3525/powermgmt-target.h
+++ b/firmware/target/arm/as3525/powermgmt-target.h
@@ -44,7 +44,7 @@
#define BATT_CHG_I CHG_I_300MA
#define CHARGER_TOTAL_TIMER (4*3600*2)
-#elif defined(SANSA_FUZE) || defined(SANSA_FUZEV2) /* FIXME */
+#elif defined(SANSA_FUZE)
/* Check if topped-off and monitor voltage while plugged. */
#define BATT_FULL_VOLTAGE 4160
@@ -53,6 +53,15 @@
#define BATT_CHG_I CHG_I_200MA
#define CHARGER_TOTAL_TIMER (4*3600*2)
+#elif defined(SANSA_FUZEV2)
+
+/* Check if topped-off and monitor voltage while plugged. */
+#define BATT_FULL_VOLTAGE 4200
+#define BATT_VAUTO_RECHARGE 4100
+#define BATT_CHG_V CHG_V_4_20V
+#define BATT_CHG_I CHG_I_200MA
+#define CHARGER_TOTAL_TIMER (4*3600*2)
+
#elif defined(SANSA_C200V2)
/* Check if topped-off and monitor voltage while plugged. */
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
index 5b3447fd76..4aaa2c7793 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/powermgmt-fuzev2.c
@@ -44,8 +44,8 @@ const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
const unsigned short percent_to_volt_charge[11] =
{
- /* TODO: simple linear uncalibrated curve */
- 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200
+ 3408, 3832, 3892, 3925, 3950, 3986, 4036, 4100, 4177, 4213, 4213
+
};
#endif /* CONFIG_CHARGING */