summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZakk Roberts <midk@rockbox.org>2006-04-15 12:31:33 +0000
committerZakk Roberts <midk@rockbox.org>2006-04-15 12:31:33 +0000
commitb61e2632194956912437905c1fa03315ca7ef520 (patch)
treeaa15e2de0db82cfe51cabe61485e82b4dbfa2376
parent13ade06d4a2d3ae39198c569b319bcdd155fae57 (diff)
downloadrockbox-b61e2632194956912437905c1fa03315ca7ef520.zip
rockbox-b61e2632194956912437905c1fa03315ca7ef520.tar.gz
rockbox-b61e2632194956912437905c1fa03315ca7ef520.tar.bz2
rockbox-b61e2632194956912437905c1fa03315ca7ef520.tar.xz
Move the battery min/max capacity to player config files and add an increment setting (amount of mAh to increase/decrease by in the settings menu) for more precise battery value tweaking/limiting per-model. This allows the proper range for iAudio X5 - 950mAh, or 2250mAh for the X5L.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9678 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--apps/settings_menu.c2
-rw-r--r--firmware/export/config-fmrecorder.h5
-rw-r--r--firmware/export/config-gigabeat.h4
-rw-r--r--firmware/export/config-gmini120.h4
-rw-r--r--firmware/export/config-gminisp.h4
-rw-r--r--firmware/export/config-h100.h5
-rw-r--r--firmware/export/config-h120.h5
-rw-r--r--firmware/export/config-h300.h5
-rw-r--r--firmware/export/config-iaudiox5.h7
-rw-r--r--firmware/export/config-ipod3g.h5
-rw-r--r--firmware/export/config-ipod4g.h5
-rw-r--r--firmware/export/config-ipodcolor.h5
-rw-r--r--firmware/export/config-ipodmini.h5
-rwxr-xr-xfirmware/export/config-ipodmini2g.h5
-rw-r--r--firmware/export/config-ipodnano.h5
-rw-r--r--firmware/export/config-ipodvideo.h5
-rw-r--r--firmware/export/config-ondiofm.h8
-rw-r--r--firmware/export/config-ondiosp.h8
-rw-r--r--firmware/export/config-player.h6
-rw-r--r--firmware/export/config-recorder.h6
-rw-r--r--firmware/export/config-recorderv2.h5
-rw-r--r--firmware/export/powermgmt.h18
22 files changed, 84 insertions, 43 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 04f8c0c..14f1b57 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -915,7 +915,7 @@ static bool battery_capacity(void)
{
return set_int(str(LANG_BATTERY_CAPACITY), "mAh", UNIT_MAH,
&global_settings.battery_capacity,
- &set_battery_capacity, 50, BATTERY_CAPACITY_MIN,
+ &set_battery_capacity, BATTERY_CAPACITY_INC, BATTERY_CAPACITY_MIN,
BATTERY_CAPACITY_MAX, NULL );
}
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 27e2f10..1259566 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -63,7 +63,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIION2200
-
+#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
/* Battery scale factor (guessed, seems to be 1,25 * value from recorder) */
#define BATTERY_SCALE_FACTOR 8081
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h
index db99bf5..ec36de4 100644
--- a/firmware/export/config-gigabeat.h
+++ b/firmware/export/config-gigabeat.h
@@ -52,6 +52,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
+#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* 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 */
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h
index 8ffe51c..e402d9e 100644
--- a/firmware/export/config-gmini120.h
+++ b/firmware/export/config-gmini120.h
@@ -45,6 +45,10 @@
/* Type of mobile power, FIXME: probably different, make new type */
#define CONFIG_BATTERY BATT_LIION2200
+#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 6465
/* chosen values at random -- jyp */
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h
index 4aa4723..aa0bf09 100644
--- a/firmware/export/config-gminisp.h
+++ b/firmware/export/config-gminisp.h
@@ -36,6 +36,10 @@
/* Type of mobile power, FIXME: probably different, make new type */
#define CONFIG_BATTERY BATT_LIION2200
+#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 6465
/* chosen values at random -- jyp */
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 20fcb75..62d262c 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -81,7 +81,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index 34c10b7..a577a36 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -73,7 +73,10 @@
#define CONFIG_I2C I2C_COLDFIRE
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */
/* Define if we have a hardware defect that causes ticking on the audio line */
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 41e3c82..947a42e 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -74,7 +74,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* 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 if we have a hardware defect that causes ticking on the audio line */
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index b33bae9..2a16baf 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -77,12 +77,15 @@
/* 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 this if you have a real-time clock */
#define CONFIG_RTC RTC_PCF50606
-#define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */
-
/* Define this if you have ATA power-off control */
#define HAVE_ATA_POWER_OFF
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 3ac0844..62950b8 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -60,7 +60,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 10 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 3eb3543..68b5d5f 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -62,7 +62,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 10 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 42cdf0f..7da7f0f 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -61,7 +61,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 10 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index 04ea219..047c992 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -62,7 +62,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 800 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 10 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index 82d282b..cd3daa9 100755
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -65,7 +65,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 800 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 98e307f..026355a 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -66,7 +66,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 1f57432..54b3226 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -66,7 +66,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300
-
+#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865
/* Define this if the platform can charge batteries */
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index 9ec7e46..acaba63 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -41,9 +41,11 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_3AAA
-
-/* Battery scale factor (average from 3 Ondios) */
-#define BATTERY_SCALE_FACTOR 4735
+#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */
+#define BATTERY_SCALE_FACTOR 4735 /* average from 3 Ondios */
/* Define this if you control power on PB5 (instead of the OFF button) */
#define HAVE_POWEROFF_ON_PB5
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index a856450..567bc0a 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -31,9 +31,11 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_3AAA
-
-/* Battery scale factor (average from 3 Ondios) */
-#define BATTERY_SCALE_FACTOR 4735
+#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */
+#define BATTERY_SCALE_FACTOR 4735 /* average from 3 Ondios */
/* Define this if you control power on PB5 (instead of the OFF button) */
#define HAVE_POWEROFF_ON_PB5
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index aea9dde..d587a8a 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -40,8 +40,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_4AA_NIMH
-
-/* Battery scale factor (?) */
+#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 6546
/* Define this if you must discharge the data line by driving it low
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index 130e199..e4865d7 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -57,8 +57,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_4AA_NIMH
-
-/* Battery scale factor (?) */
+#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 6465
/* Define this if you control power on PBDR (instead of PADR) */
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index b3136f1..eed46f2 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -60,7 +60,10 @@
/* Type of mobile power */
#define CONFIG_BATTERY BATT_LIION2200
-
+#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 50 /* capacity increment */
+#define BATTERY_TYPES_COUNT 1 /* only one type */
/* Battery scale factor (guessed, seems to be 1,25 * value from recorder) */
#define BATTERY_SCALE_FACTOR 8081
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index b9ac996..da78857 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -19,24 +19,6 @@
#ifndef _POWERMGMT_H_
#define _POWERMGMT_H_
-#if CONFIG_BATTERY == BATT_LIION2200 /* FM Recorder, LiIon */
-#define BATTERY_CAPACITY_MIN 2200
-#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */
-#define BATTERY_TYPES_COUNT 1
-#elif CONFIG_BATTERY == BATT_3AAA /* Ondio */
-#define BATTERY_CAPACITY_MIN 500
-#define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable in settings */
-#define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */
-#elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver H1x0 */
-#define BATTERY_CAPACITY_MIN 1300
-#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */
-#define BATTERY_TYPES_COUNT 1
-#else /* Recorder, NiMH */
-#define BATTERY_CAPACITY_MIN 1500
-#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */
-#define BATTERY_TYPES_COUNT 1
-#endif
-
#define POWER_HISTORY_LEN 2*60 /* 2 hours of samples, one per minute */
#define CHARGE_END_SHORTD 6 /* stop when N minutes have passed with
generated by cgit v1.1 at 2026-05-05 01:03:19 +0000