7 files changed, 84 insertions, 46 deletions

diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index df24850892..3e835605da 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -113,12 +113,13 @@
 #define CPU_FREQ      11289600
 
 /* Type of mobile power */
-#define CONFIG_BATTERY BATT_LIPOL1300
-#define BATTERY_CAPACITY_MIN 950   /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 2250  /* max. capacity selectable */
-#define BATTERY_CAPACITY_INC 50    /* capacity increment */
-#define BATTERY_TYPES_COUNT  1     /* only one type */
-#define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */
+#define X5_BATT_CONFIG          2
+#define CONFIG_BATTERY          BATT_IAUDIO_X5
+#define BATTERY_CAPACITY_MIN    950   /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX    2250  /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC    50    /* capacity increment */
+#define BATTERY_TYPES_COUNT     1     /* only one type */
+#define BATTERY_SCALE_FACTOR    5859  /* (420703125 + 35900) / 71800 */
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50606
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 6f6d253fe9..765bcfdb07 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -70,6 +70,7 @@
 #define BATT_LIION2200  2200 /* FM/V2 recorder type */
 #define BATT_4AA_NIMH   1500
 #define BATT_3AAA       1000 /* Ondio */
+#define BATT_IAUDIO_X5   950
 #define BATT_LIPOL1300  1300 /* the type used in iRiver h1x0 models */
 #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */
 #define BATT_BP009       820 /* iriver H10 5/6Gb - iriver BP009 */
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index 30fe60c293..ba2cc02318 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -63,7 +63,7 @@ extern int trickle_sec;          /* trickle charge: How many seconds per minute
 
 #if CONFIG_CHARGING >= CHARGING_MONITOR
 typedef enum {       /* sorted by increasing charging current */
-    DISCHARGING = 0, 
+    DISCHARGING = 0,
     TRICKLE,         /* Can occur for CONFIG_CHARGING >= CHARGING_MONITOR */
     TOPOFF,          /* Can occur for CONFIG_CHARGING == CHARGING_CONTROL */
     CHARGING         /* Can occur for all CONFIG_CHARGING options */
@@ -126,6 +126,9 @@ int battery_time(void); /* minutes */
 
 unsigned int battery_voltage(void); /* filtered batt. voltage in centivolts */
 
+/* read unfiltered battery info */
+void battery_read_info(int *adc, int *voltage, int *level);
+
 /* Tells if the battery level is safe for disk writes */
 bool battery_level_safe(void);
 
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 50b734bbbd..f18ea3c636 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -112,6 +112,20 @@ static void battery_status_update(void)
     }
 }
 
+void battery_read_info(int *adc, int *voltage, int *level)
+{
+    battery_status_update();
+
+    if (adc)
+        *adc = batt_centivolts*10000 / BATTERY_SCALE_FACTOR;
+
+    if (voltage)
+        *voltage = batt_centivolts;
+
+    if (level)
+        *level = batt_level;
+}
+
 unsigned int battery_voltage(void)
 {
     battery_status_update();
@@ -167,6 +181,8 @@ static const unsigned int battery_level_dangerous[BATTERY_TYPES_COUNT] =
     105, 115    /* alkaline, NiHM */
 #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver H1x0 */
     339
+#elif CONFIG_BATTERY == BATT_IAUDIO_X5
+    354
 #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB */
     376
 #elif CONFIG_BATTERY == BATT_BP009 /* iriver H10 5/6GB */
@@ -192,6 +208,13 @@ static const short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
      * for the 1300 mAh stock battery. */
 //  { 337, 358, 365, 369, 372, 377, 383, 389, 397, 406, 413 }
     { 337, 366, 372, 374, 378, 381, 385, 392, 399, 408, 417 }
+#elif CONFIG_BATTERY == BATT_IAUDIO_X5
+    /* iAudio x5 series  - still experimenting with best curve */
+// Lithium ion discharge curve
+    { 355, 356, 357, 359, 362, 365, 369, 374, 380, 387, 395 }
+// Linear
+//  { 355, 360, 364, 369, 373, 378, 382, 387, 391, 390, 400 }
+//  { 355, 359, 363, 367, 371, 375, 379, 383, 387, 391, 395 }
 #elif CONFIG_BATTERY == BATT_LPCS355385
     /* iriver H10 20GB */
     { 376, 380, 385, 387, 390, 395, 402, 407, 411, 418, 424 }
@@ -289,9 +312,25 @@ static long sleeptimer_endtick;
 
 static long last_event_tick;
 
+static int voltage_to_battery_level(int battery_centivolts);
 static void battery_status_update(void);
 static int runcurrent(void);
 
+void battery_read_info(int *adc, int *voltage, int *level)
+{
+    int adc_battery = adc_read(ADC_UNREG_POWER);
+    int centivolts  = adc_battery*BATTERY_SCALE_FACTOR / 10000;
+
+    if (adc)
+        *adc = adc_battery;
+
+    if (voltage)
+        *voltage = centivolts;
+
+    if (level)
+        *level = voltage_to_battery_level(centivolts);
+}
+
 unsigned int battery_voltage(void)
 {
     return battery_centivolts;
@@ -387,14 +426,14 @@ static int voltage_to_percent(int voltage, const short* table)
 
 /* update battery level and estimated runtime, called once per minute or
  * when battery capacity / type settings are changed */
-static void battery_status_update(void)
+static int voltage_to_battery_level(int battery_centivolts)
 {
     int level;
 
 #if CONFIG_CHARGING >= CHARGING_MONITOR
     if (charge_state == DISCHARGING) {
         level = voltage_to_percent(battery_centivolts,
-                percent_to_volt_discharge[battery_type]);
+                    percent_to_volt_discharge[battery_type]);
     }
     else if (charge_state == CHARGING) {
         /* battery level is defined to be < 100% until charging is finished */
@@ -407,9 +446,16 @@ static void battery_status_update(void)
 #else
     /* always use the discharge table */
     level = voltage_to_percent(battery_centivolts,
-            percent_to_volt_discharge[battery_type]);
+                percent_to_volt_discharge[battery_type]);
 #endif
 
+    return level;
+}
+
+static void battery_status_update(void)
+{
+    int level = voltage_to_battery_level(battery_centivolts);
+
 #ifndef HAVE_MMC  /* this adjustment is only needed for HD based */
     if (battery_percent == -1) { /* first run of this procedure */
         /* The battery voltage is usually a little lower directly after
@@ -699,7 +745,6 @@ static void power_thread(void)
 #endif
 
     /* initialize the voltages for the exponential filter */
-
     avgbat = adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR *
         BATT_AVE_SAMPLES;
     battery_centivolts = avgbat / BATT_AVE_SAMPLES / 10000;
@@ -1010,7 +1055,6 @@ void powermgmt_init(void)
 {
     /* init history to 0 */
     memset(power_history, 0x00, sizeof(power_history));
-
     create_thread(power_thread, power_stack, sizeof(power_stack),
                   power_thread_name IF_PRIO(, PRIORITY_SYSTEM));
 }
diff --git a/firmware/target/coldfire/iaudio/x5/adc-target.h b/firmware/target/coldfire/iaudio/x5/adc-target.h
index 4081562fe5..28ba6225d1 100644
--- a/firmware/target/coldfire/iaudio/x5/adc-target.h
+++ b/firmware/target/coldfire/iaudio/x5/adc-target.h
@@ -28,5 +28,8 @@
 
 /* Force a scan now */
 unsigned short adc_scan(int channel);
-
+static inline unsigned short adc_read(int channel)
+    { return adc_scan(channel); }
+static inline void adc_init(void)
+    {}
 #endif /* _ADC_TARGET_H_ */
diff --git a/firmware/target/coldfire/iaudio/x5/adc-x5.c b/firmware/target/coldfire/iaudio/x5/adc-x5.c
index 72aec7d547..1895cacfe9 100755
--- a/firmware/target/coldfire/iaudio/x5/adc-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/adc-x5.c
@@ -24,49 +24,35 @@
 #include "adc.h"
 #include "pcf50606.h"
 
-static unsigned short adcdata[NUM_ADC_CHANNELS];
-
-static const int adcc2_parms[] =
+/* get remaining 2 bits and return 10 bit value */
+static int get_10bit_voltage(int msbdata)
 {
-    [ADC_BUTTONS] = 0x80 | (5 << 1) | 1, /* ADCIN2 */
-    [ADC_REMOTE]  = 0x80 | (6 << 1) | 1, /* ADCIN3 */
-    [ADC_BATTERY] = 0x80 | (0 << 1) | 1, /* BATVOLT, resistive divider */
-};
+    int data = msbdata << 2;
+    data |= pcf50606_read(0x31) & 0x3;
+    return data;
+}
 
 unsigned short adc_scan(int channel)
 {
+    static const int adcc2_parms[] =
+    {
+        [ADC_BUTTONS] = 0x81 | (5 << 1), /* 8b  - ADCIN2 */
+        [ADC_REMOTE]  = 0x81 | (6 << 1), /* 8b  - ADCIN3 */
+        [ADC_BATTERY] = 0x01 | (0 << 1), /* 10b - BATVOLT, resistive divider */
+    };
+
     int level;
-    unsigned char data;
+    int data;
 
     level = set_irq_level(HIGHEST_IRQ_LEVEL);
 
     pcf50606_write(0x2f, adcc2_parms[channel]);
     data = pcf50606_read(0x30);
 
-    adcdata[channel] = data;
+    if (channel == ADC_BATTERY)
+        data = get_10bit_voltage(data);
 
     set_irq_level(level);
-    return data;
-}
-
-unsigned short adc_read(int channel)
-{
-    return adcdata[channel];
-}
-
-static int adc_counter;
-
-static void adc_tick(void)
-{
-    if (++adc_counter == HZ)
-    {
-        adc_counter = 0;
-        adc_scan(ADC_BATTERY);
-    }
-}
 
-void adc_init(void)
-{
-    adc_scan(ADC_BATTERY);
-    tick_add_task(adc_tick);
+    return (unsigned short)data;
 }
diff --git a/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c b/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c
index 3443d1e567..59140667ef 100644
--- a/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c
@@ -128,8 +128,8 @@ void GPI0(void)
     if (data[2] & 0x06)
     {
         /* ACDINS/ACDREM */
-        /* Check if adc_scan should actually scan main buttons or not -
-           bias towards "yes" out of paranoia. */
+        /* Check if main buttons should be actually be scanned or not
+           - bias towards "yes" out of paranoia. */
         button_enable_scan((data[2] & 0x02) != 0 ||
                            (pcf50606_read(0x33) & 0x01) != 0);
     }