amiconn: firmware/export config-ondiofm.h, 1.22, 1.23 config-ondiosp.h, 1.22, 1.23 config.h, 1.19, 1.20 powermgmt.h, 1.13, 1.14

Update of /cvsroot/rockbox/firmware/export
In directory labb:/tmp/cvs-serv22759/firmware/export

Modified Files:
        config-ondiofm.h config-ondiosp.h config.h powermgmt.h 
Log Message:
New Ondio feature: Battery type setting, for correct battery level display.

Index: config.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/config.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- config.h    27 Jan 2005 19:16:20 -0000      1.19
+++ config.h    30 Jan 2005 16:25:46 -0000      1.20
@@ -45,9 +45,9 @@
 #define GMINI100_PAD    4
 
 /* CONFIG_BATTERY */
-#define BATT_LIION2200      2200 /* FM/V2 recorder type */
-#define BATT_4AA_NIMH       1500
-#define BATT_3AAA_ALKALINE  1000
+#define BATT_LIION2200  2200 /* FM/V2 recorder type */
+#define BATT_4AA_NIMH   1500
+#define BATT_3AAA       1000 /* Ondio */
 
 /* CONFIG_LCD */
 #define LCD_GMINI100 0

Index: powermgmt.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/powermgmt.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- powermgmt.h 25 Oct 2004 00:08:38 -0000      1.13
+++ powermgmt.h 30 Jan 2005 16:25:46 -0000      1.14
@@ -26,13 +26,15 @@
 #define BATTERY_LEVEL_FULL       400 /* 4.00V */
 #define BATTERY_CAPACITY_MIN 2200
 #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */
-#elif CONFIG_BATTERY == BATT_3AAA_ALKALINE /* Ondio, Alkalines */
+#define BATTERY_TYPES_COUNT      1
+#elif CONFIG_BATTERY == BATT_3AAA /* Ondio */
 #define BATTERY_LEVEL_SHUTDOWN   260 /* 2.60V */
 #define BATTERY_LEVEL_EMPTY      270 /* 2.70V */
 #define BATTERY_LEVEL_DANGEROUS  280 /* 2.80V */
-#define BATTERY_LEVEL_FULL       450 /* 4.50V */
+#define BATTERY_LEVEL_FULL       475 /* 4.75V */
 #define BATTERY_CAPACITY_MIN 500
 #define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable in settings */
+#define BATTERY_TYPES_COUNT      2   /* Alkalines or NiMH */
 #else /* Recorder, NiMH */
 #define BATTERY_LEVEL_SHUTDOWN   450 /* 4.50V */
 #define BATTERY_LEVEL_EMPTY      465 /* 4.65V */
@@ -40,6 +42,7 @@
 #define BATTERY_LEVEL_FULL       585 /* 5.85V */
 #define BATTERY_CAPACITY_MIN 1500
 #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */
+#define BATTERY_TYPES_COUNT      1
 #endif
 
 #define BATTERY_RANGE (BATTERY_LEVEL_FULL - BATTERY_LEVEL_EMPTY)
@@ -111,6 +114,7 @@
 
 void set_poweroff_timeout(int timeout);
 void set_battery_capacity(int capacity); /* set local battery capacity value */
+void set_battery_type(int type); /* set local battery type */
 
 void set_sleep_timer(int seconds);
 int get_sleep_timer(void);

Index: config-ondiosp.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/config-ondiosp.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- config-ondiosp.h    30 Jan 2005 12:21:47 -0000      1.22
+++ config-ondiosp.h    30 Jan 2005 16:25:46 -0000      1.23
@@ -20,7 +20,7 @@
 #define CPU_FREQ      12000000
 
 /* Type of mobile power */
-#define CONFIG_BATTERY BATT_3AAA_ALKALINE
+#define CONFIG_BATTERY BATT_3AAA
 
 /* Battery scale factor (average from 3 Ondios) */
 #define BATTERY_SCALE_FACTOR 4735

Index: config-ondiofm.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/config-ondiofm.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- config-ondiofm.h    30 Jan 2005 12:21:47 -0000      1.22
+++ config-ondiofm.h    30 Jan 2005 16:25:46 -0000      1.23
@@ -26,7 +26,7 @@
 #define CONFIG_I2C I2C_ONDIO
 
 /* Type of mobile power */
-#define CONFIG_BATTERY BATT_3AAA_ALKALINE
+#define CONFIG_BATTERY BATT_3AAA
 
 /* Battery scale factor (average from 3 Ondios) */
 #define BATTERY_SCALE_FACTOR 4735

_______________________________________________
http://cool.haxx.se/mailman/listinfo/rockbox-cvs