diff options
author | Zakk Roberts <midk@rockbox.org> | 2006-04-15 12:31:33 +0000 |
---|---|---|
committer | Zakk Roberts <midk@rockbox.org> | 2006-04-15 12:31:33 +0000 |
commit | b61e2632194956912437905c1fa03315ca7ef520 (patch) | |
tree | aa15e2de0db82cfe51cabe61485e82b4dbfa2376 | |
parent | 13ade06d4a2d3ae39198c569b319bcdd155fae57 (diff) | |
download | rockbox-b61e2632194956912437905c1fa03315ca7ef520.tar.gz rockbox-b61e2632194956912437905c1fa03315ca7ef520.zip |
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
-rw-r--r-- | apps/settings_menu.c | 2 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 5 | ||||
-rw-r--r-- | firmware/export/config-gigabeat.h | 4 | ||||
-rw-r--r-- | firmware/export/config-gmini120.h | 4 | ||||
-rw-r--r-- | firmware/export/config-gminisp.h | 4 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 5 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 5 | ||||
-rw-r--r-- | firmware/export/config-h300.h | 5 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 7 | ||||
-rw-r--r-- | firmware/export/config-ipod3g.h | 5 | ||||
-rw-r--r-- | firmware/export/config-ipod4g.h | 5 | ||||
-rw-r--r-- | firmware/export/config-ipodcolor.h | 5 | ||||
-rw-r--r-- | firmware/export/config-ipodmini.h | 5 | ||||
-rwxr-xr-x | firmware/export/config-ipodmini2g.h | 5 | ||||
-rw-r--r-- | firmware/export/config-ipodnano.h | 5 | ||||
-rw-r--r-- | firmware/export/config-ipodvideo.h | 5 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 8 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 8 | ||||
-rw-r--r-- | firmware/export/config-player.h | 6 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 6 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 5 | ||||
-rw-r--r-- | firmware/export/powermgmt.h | 18 |
22 files changed, 84 insertions, 43 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 04f8c0c9af..14f1b57776 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -915,7 +915,7 @@ static bool battery_capacity(void) | |||
915 | { | 915 | { |
916 | return set_int(str(LANG_BATTERY_CAPACITY), "mAh", UNIT_MAH, | 916 | return set_int(str(LANG_BATTERY_CAPACITY), "mAh", UNIT_MAH, |
917 | &global_settings.battery_capacity, | 917 | &global_settings.battery_capacity, |
918 | &set_battery_capacity, 50, BATTERY_CAPACITY_MIN, | 918 | &set_battery_capacity, BATTERY_CAPACITY_INC, BATTERY_CAPACITY_MIN, |
919 | BATTERY_CAPACITY_MAX, NULL ); | 919 | BATTERY_CAPACITY_MAX, NULL ); |
920 | } | 920 | } |
921 | 921 | ||
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 27e2f10f88..125956691b 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -63,7 +63,10 @@ | |||
63 | 63 | ||
64 | /* Type of mobile power */ | 64 | /* Type of mobile power */ |
65 | #define CONFIG_BATTERY BATT_LIION2200 | 65 | #define CONFIG_BATTERY BATT_LIION2200 |
66 | 66 | #define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */ | |
67 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
68 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
69 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
67 | /* Battery scale factor (guessed, seems to be 1,25 * value from recorder) */ | 70 | /* Battery scale factor (guessed, seems to be 1,25 * value from recorder) */ |
68 | #define BATTERY_SCALE_FACTOR 8081 | 71 | #define BATTERY_SCALE_FACTOR 8081 |
69 | 72 | ||
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index db99bf5d57..ec36de413e 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h | |||
@@ -52,6 +52,10 @@ | |||
52 | 52 | ||
53 | /* Type of mobile power */ | 53 | /* Type of mobile power */ |
54 | #define CONFIG_BATTERY BATT_LIPOL1300 | 54 | #define CONFIG_BATTERY BATT_LIPOL1300 |
55 | #define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ | ||
56 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
57 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
58 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
55 | 59 | ||
56 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ | 60 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ |
57 | 61 | ||
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h index 8ffe51c433..e402d9e3c1 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h | |||
@@ -45,6 +45,10 @@ | |||
45 | 45 | ||
46 | /* Type of mobile power, FIXME: probably different, make new type */ | 46 | /* Type of mobile power, FIXME: probably different, make new type */ |
47 | #define CONFIG_BATTERY BATT_LIION2200 | 47 | #define CONFIG_BATTERY BATT_LIION2200 |
48 | #define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */ | ||
49 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
50 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
51 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
48 | #define BATTERY_SCALE_FACTOR 6465 | 52 | #define BATTERY_SCALE_FACTOR 6465 |
49 | /* chosen values at random -- jyp */ | 53 | /* chosen values at random -- jyp */ |
50 | 54 | ||
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h index 4aa4723ca0..aa0bf09bb4 100644 --- a/firmware/export/config-gminisp.h +++ b/firmware/export/config-gminisp.h | |||
@@ -36,6 +36,10 @@ | |||
36 | 36 | ||
37 | /* Type of mobile power, FIXME: probably different, make new type */ | 37 | /* Type of mobile power, FIXME: probably different, make new type */ |
38 | #define CONFIG_BATTERY BATT_LIION2200 | 38 | #define CONFIG_BATTERY BATT_LIION2200 |
39 | #define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */ | ||
40 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
41 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
42 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
39 | #define BATTERY_SCALE_FACTOR 6465 | 43 | #define BATTERY_SCALE_FACTOR 6465 |
40 | /* chosen values at random -- jyp */ | 44 | /* chosen values at random -- jyp */ |
41 | 45 | ||
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 20fcb75fdf..62d262c16b 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -81,7 +81,10 @@ | |||
81 | 81 | ||
82 | /* Type of mobile power */ | 82 | /* Type of mobile power */ |
83 | #define CONFIG_BATTERY BATT_LIPOL1300 | 83 | #define CONFIG_BATTERY BATT_LIPOL1300 |
84 | 84 | #define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ | |
85 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
86 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
87 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
85 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ | 88 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ |
86 | 89 | ||
87 | /* Define this if the platform can charge batteries */ | 90 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 34c10b7682..a577a369c7 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -73,7 +73,10 @@ | |||
73 | #define CONFIG_I2C I2C_COLDFIRE | 73 | #define CONFIG_I2C I2C_COLDFIRE |
74 | 74 | ||
75 | #define CONFIG_BATTERY BATT_LIPOL1300 | 75 | #define CONFIG_BATTERY BATT_LIPOL1300 |
76 | 76 | #define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ | |
77 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
78 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
79 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
77 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ | 80 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ |
78 | 81 | ||
79 | /* Define if we have a hardware defect that causes ticking on the audio line */ | 82 | /* 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 41e3c827d5..947a42e776 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -74,7 +74,10 @@ | |||
74 | 74 | ||
75 | /* Type of mobile power */ | 75 | /* Type of mobile power */ |
76 | #define CONFIG_BATTERY BATT_LIPOL1300 | 76 | #define CONFIG_BATTERY BATT_LIPOL1300 |
77 | 77 | #define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ | |
78 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
79 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
80 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
78 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ | 81 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ |
79 | 82 | ||
80 | /* Define if we have a hardware defect that causes ticking on the audio line */ | 83 | /* 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 b33bae913b..2a16bafc07 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -77,12 +77,15 @@ | |||
77 | 77 | ||
78 | /* Type of mobile power */ | 78 | /* Type of mobile power */ |
79 | #define CONFIG_BATTERY BATT_LIPOL1300 | 79 | #define CONFIG_BATTERY BATT_LIPOL1300 |
80 | #define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ | ||
81 | #define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ | ||
82 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
83 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
84 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ | ||
80 | 85 | ||
81 | /* define this if you have a real-time clock */ | 86 | /* define this if you have a real-time clock */ |
82 | #define CONFIG_RTC RTC_PCF50606 | 87 | #define CONFIG_RTC RTC_PCF50606 |
83 | 88 | ||
84 | #define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ | ||
85 | |||
86 | /* Define this if you have ATA power-off control */ | 89 | /* Define this if you have ATA power-off control */ |
87 | #define HAVE_ATA_POWER_OFF | 90 | #define HAVE_ATA_POWER_OFF |
88 | 91 | ||
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 3ac0844548..62950b8d09 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h | |||
@@ -60,7 +60,10 @@ | |||
60 | 60 | ||
61 | /* Type of mobile power */ | 61 | /* Type of mobile power */ |
62 | #define CONFIG_BATTERY BATT_LIPOL1300 | 62 | #define CONFIG_BATTERY BATT_LIPOL1300 |
63 | 63 | #define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */ | |
64 | #define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ | ||
65 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ | ||
66 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
64 | #define BATTERY_SCALE_FACTOR 5865 | 67 | #define BATTERY_SCALE_FACTOR 5865 |
65 | 68 | ||
66 | /* Define this if the platform can charge batteries */ | 69 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index 3eb354363a..68b5d5f3b9 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h | |||
@@ -62,7 +62,10 @@ | |||
62 | 62 | ||
63 | /* Type of mobile power */ | 63 | /* Type of mobile power */ |
64 | #define CONFIG_BATTERY BATT_LIPOL1300 | 64 | #define CONFIG_BATTERY BATT_LIPOL1300 |
65 | 65 | #define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */ | |
66 | #define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ | ||
67 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ | ||
68 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
66 | #define BATTERY_SCALE_FACTOR 5865 | 69 | #define BATTERY_SCALE_FACTOR 5865 |
67 | 70 | ||
68 | /* Define this if the platform can charge batteries */ | 71 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index 42cdf0fb5e..7da7f0fc4e 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h | |||
@@ -61,7 +61,10 @@ | |||
61 | 61 | ||
62 | /* Type of mobile power */ | 62 | /* Type of mobile power */ |
63 | #define CONFIG_BATTERY BATT_LIPOL1300 | 63 | #define CONFIG_BATTERY BATT_LIPOL1300 |
64 | 64 | #define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */ | |
65 | #define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ | ||
66 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ | ||
67 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
65 | #define BATTERY_SCALE_FACTOR 5865 | 68 | #define BATTERY_SCALE_FACTOR 5865 |
66 | 69 | ||
67 | /* Define this if the platform can charge batteries */ | 70 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 04ea2190ea..047c9926ef 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h | |||
@@ -62,7 +62,10 @@ | |||
62 | 62 | ||
63 | /* Type of mobile power */ | 63 | /* Type of mobile power */ |
64 | #define CONFIG_BATTERY BATT_LIPOL1300 | 64 | #define CONFIG_BATTERY BATT_LIPOL1300 |
65 | 65 | #define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */ | |
66 | #define BATTERY_CAPACITY_MAX 800 /* max. capacity selectable */ | ||
67 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ | ||
68 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
66 | #define BATTERY_SCALE_FACTOR 5865 | 69 | #define BATTERY_SCALE_FACTOR 5865 |
67 | 70 | ||
68 | /* Define this if the platform can charge batteries */ | 71 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 82d282be3f..cd3daa9b81 100755 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h | |||
@@ -65,7 +65,10 @@ | |||
65 | 65 | ||
66 | /* Type of mobile power */ | 66 | /* Type of mobile power */ |
67 | #define CONFIG_BATTERY BATT_LIPOL1300 | 67 | #define CONFIG_BATTERY BATT_LIPOL1300 |
68 | 68 | #define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */ | |
69 | #define BATTERY_CAPACITY_MAX 800 /* max. capacity selectable */ | ||
70 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
71 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
69 | #define BATTERY_SCALE_FACTOR 5865 | 72 | #define BATTERY_SCALE_FACTOR 5865 |
70 | 73 | ||
71 | /* Define this if the platform can charge batteries */ | 74 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 98e307fa86..026355af60 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h | |||
@@ -66,7 +66,10 @@ | |||
66 | 66 | ||
67 | /* Type of mobile power */ | 67 | /* Type of mobile power */ |
68 | #define CONFIG_BATTERY BATT_LIPOL1300 | 68 | #define CONFIG_BATTERY BATT_LIPOL1300 |
69 | 69 | #define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ | |
70 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
71 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
72 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
70 | #define BATTERY_SCALE_FACTOR 5865 | 73 | #define BATTERY_SCALE_FACTOR 5865 |
71 | 74 | ||
72 | /* Define this if the platform can charge batteries */ | 75 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 1f57432c56..54b32265e1 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h | |||
@@ -66,7 +66,10 @@ | |||
66 | 66 | ||
67 | /* Type of mobile power */ | 67 | /* Type of mobile power */ |
68 | #define CONFIG_BATTERY BATT_LIPOL1300 | 68 | #define CONFIG_BATTERY BATT_LIPOL1300 |
69 | 69 | #define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ | |
70 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
71 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
72 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
70 | #define BATTERY_SCALE_FACTOR 5865 | 73 | #define BATTERY_SCALE_FACTOR 5865 |
71 | 74 | ||
72 | /* Define this if the platform can charge batteries */ | 75 | /* Define this if the platform can charge batteries */ |
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 9ec7e46753..acaba63264 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -41,9 +41,11 @@ | |||
41 | 41 | ||
42 | /* Type of mobile power */ | 42 | /* Type of mobile power */ |
43 | #define CONFIG_BATTERY BATT_3AAA | 43 | #define CONFIG_BATTERY BATT_3AAA |
44 | 44 | #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ | |
45 | /* Battery scale factor (average from 3 Ondios) */ | 45 | #define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable */ |
46 | #define BATTERY_SCALE_FACTOR 4735 | 46 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
47 | #define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */ | ||
48 | #define BATTERY_SCALE_FACTOR 4735 /* average from 3 Ondios */ | ||
47 | 49 | ||
48 | /* Define this if you control power on PB5 (instead of the OFF button) */ | 50 | /* Define this if you control power on PB5 (instead of the OFF button) */ |
49 | #define HAVE_POWEROFF_ON_PB5 | 51 | #define HAVE_POWEROFF_ON_PB5 |
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index a856450972..567bc0a161 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -31,9 +31,11 @@ | |||
31 | 31 | ||
32 | /* Type of mobile power */ | 32 | /* Type of mobile power */ |
33 | #define CONFIG_BATTERY BATT_3AAA | 33 | #define CONFIG_BATTERY BATT_3AAA |
34 | 34 | #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ | |
35 | /* Battery scale factor (average from 3 Ondios) */ | 35 | #define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable */ |
36 | #define BATTERY_SCALE_FACTOR 4735 | 36 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
37 | #define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */ | ||
38 | #define BATTERY_SCALE_FACTOR 4735 /* average from 3 Ondios */ | ||
37 | 39 | ||
38 | /* Define this if you control power on PB5 (instead of the OFF button) */ | 40 | /* Define this if you control power on PB5 (instead of the OFF button) */ |
39 | #define HAVE_POWEROFF_ON_PB5 | 41 | #define HAVE_POWEROFF_ON_PB5 |
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index aea9dde2ee..d587a8aa89 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -40,8 +40,10 @@ | |||
40 | 40 | ||
41 | /* Type of mobile power */ | 41 | /* Type of mobile power */ |
42 | #define CONFIG_BATTERY BATT_4AA_NIMH | 42 | #define CONFIG_BATTERY BATT_4AA_NIMH |
43 | 43 | #define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ | |
44 | /* Battery scale factor (?) */ | 44 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ |
45 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
46 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
45 | #define BATTERY_SCALE_FACTOR 6546 | 47 | #define BATTERY_SCALE_FACTOR 6546 |
46 | 48 | ||
47 | /* Define this if you must discharge the data line by driving it low | 49 | /* 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 130e199783..e4865d7e8f 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -57,8 +57,10 @@ | |||
57 | 57 | ||
58 | /* Type of mobile power */ | 58 | /* Type of mobile power */ |
59 | #define CONFIG_BATTERY BATT_4AA_NIMH | 59 | #define CONFIG_BATTERY BATT_4AA_NIMH |
60 | 60 | #define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ | |
61 | /* Battery scale factor (?) */ | 61 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ |
62 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
63 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
62 | #define BATTERY_SCALE_FACTOR 6465 | 64 | #define BATTERY_SCALE_FACTOR 6465 |
63 | 65 | ||
64 | /* Define this if you control power on PBDR (instead of PADR) */ | 66 | /* 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 b3136f13cc..eed46f2823 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -60,7 +60,10 @@ | |||
60 | 60 | ||
61 | /* Type of mobile power */ | 61 | /* Type of mobile power */ |
62 | #define CONFIG_BATTERY BATT_LIION2200 | 62 | #define CONFIG_BATTERY BATT_LIION2200 |
63 | 63 | #define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */ | |
64 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ | ||
65 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | ||
66 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | ||
64 | /* Battery scale factor (guessed, seems to be 1,25 * value from recorder) */ | 67 | /* Battery scale factor (guessed, seems to be 1,25 * value from recorder) */ |
65 | #define BATTERY_SCALE_FACTOR 8081 | 68 | #define BATTERY_SCALE_FACTOR 8081 |
66 | 69 | ||
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index b9ac996fc0..da78857072 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h | |||
@@ -19,24 +19,6 @@ | |||
19 | #ifndef _POWERMGMT_H_ | 19 | #ifndef _POWERMGMT_H_ |
20 | #define _POWERMGMT_H_ | 20 | #define _POWERMGMT_H_ |
21 | 21 | ||
22 | #if CONFIG_BATTERY == BATT_LIION2200 /* FM Recorder, LiIon */ | ||
23 | #define BATTERY_CAPACITY_MIN 2200 | ||
24 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */ | ||
25 | #define BATTERY_TYPES_COUNT 1 | ||
26 | #elif CONFIG_BATTERY == BATT_3AAA /* Ondio */ | ||
27 | #define BATTERY_CAPACITY_MIN 500 | ||
28 | #define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable in settings */ | ||
29 | #define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */ | ||
30 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver H1x0 */ | ||
31 | #define BATTERY_CAPACITY_MIN 1300 | ||
32 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */ | ||
33 | #define BATTERY_TYPES_COUNT 1 | ||
34 | #else /* Recorder, NiMH */ | ||
35 | #define BATTERY_CAPACITY_MIN 1500 | ||
36 | #define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable in settings */ | ||
37 | #define BATTERY_TYPES_COUNT 1 | ||
38 | #endif | ||
39 | |||
40 | #define POWER_HISTORY_LEN 2*60 /* 2 hours of samples, one per minute */ | 22 | #define POWER_HISTORY_LEN 2*60 /* 2 hours of samples, one per minute */ |
41 | 23 | ||
42 | #define CHARGE_END_SHORTD 6 /* stop when N minutes have passed with | 24 | #define CHARGE_END_SHORTD 6 /* stop when N minutes have passed with |