General: changed local adc to voltage conversions in several places to use battery_voltage. Added battery_read_info function for unfiltered battery information. x5: removed adc_read as a distinct function. Removed adc tick task. adc_init is empty inline. Adjusted battery scale, voltage to level array and read 10 bits from the ADC for battery since 255 levels is not enough for true centivolt resolution.

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

3 files changed, 12 insertions, 7 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);