Fix battery meter on Sansa Connect.

Use the battery capacity percents reported by AVR. Internally fake linear voltage scale is used (1 mV = 1%).


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

2 files changed, 20 insertions, 5 deletions

diff --git a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
index 3a6a748621..62a25e879f 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
@@ -297,6 +297,8 @@ void avr_hid_init(void)
     avr_hid_sync();
 }
 
+/* defined in powermgmt-sansaconnect.c */
+void set_battery_level(unsigned int level);
 
 static void avr_hid_get_state(void)
 {
@@ -309,6 +311,12 @@ static void avr_hid_get_state(void)
 
     spi_txrx(cmd, buf, sizeof(cmd));
 
+    /*
+     *  buf[8] contains some battery/charger related information (unknown)
+     *  buf[9] contains battery level in percents (0-100)
+     */
+    set_battery_level((unsigned int)buf[9]);
+
     spi_txrx(cmd_empty, NULL, 1); /* request interrupt on button press */
 
     parse_button_state(buf);
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c
index bd90c51072..9085679b32 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/powermgmt-sansaconnect.c
@@ -24,9 +24,10 @@
 #include "powermgmt.h"
 #include "kernel.h"
 
-/* THIS CONTAINS CURRENTLY DUMMY CODE! */
+/* Use fake linear scale as AVR does the voltage to percentage conversion */
+
+static unsigned int current_battery_level = 100;
 
-static const unsigned short current_voltage = 3910;
 const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
 {
     0
@@ -40,17 +41,23 @@ const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
 /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
 const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
 {
-    { 100, 300, 400, 500, 600, 700, 800, 900, 1000, 1200, 1320 },
+    { 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 },
 };
 
 /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
 const unsigned short percent_to_volt_charge[11] =
 {
-    100, 300, 400, 500, 600, 700, 800, 900, 1000, 1200, 1320,
+    0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100,
 };
 
 /* Returns battery voltage from ADC [millivolts] */
 unsigned int battery_adc_voltage(void)
 {
-    return current_voltage;
+    return current_battery_level;
 }
+
+void set_battery_level(unsigned int level)
+{
+    current_battery_level = level;
+}
+