Clipv2: charging curve + voltage limits

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26200 a1c6a512-1295-4272-9138-f99709370657

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 @@
 #include "config.h"
 
 #if defined(SANSA_CLIP) \
-    || defined(SANSA_CLIPV2)    /* FIXME */ \
     || defined(SANSA_CLIPPLUS)  /* FIXME */
 
 /* Check if topped-off and monitor voltage while plugged. */
@@ -35,6 +34,15 @@
 #define BATT_CHG_I          CHG_I_100MA
 #define CHARGER_TOTAL_TIMER (6*3600*2)  /* about 1.5 * capacity / current */
 
+#elif defined(SANSA_CLIPV2)
+
+/* 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_100MA
+#define CHARGER_TOTAL_TIMER (6*3600*2)  /* about 1.5 * capacity / current */
+
 #elif defined(SANSA_E200V2)
 
 /* 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] =
 /* 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
+    3379, 3766, 3828, 3855, 3875, 3911, 3975, 4035, 4117, 4217, 4219
+
 };
 #endif /* CONFIG_CHARGING */