diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-e200.h | 2 | ||||
-rw-r--r-- | firmware/export/config.h | 1 | ||||
-rw-r--r-- | firmware/powermgmt.c | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 094bd7f7b0..589883d10e 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h | |||
@@ -83,7 +83,7 @@ | |||
83 | #define CONFIG_I2C I2C_PP5020 | 83 | #define CONFIG_I2C I2C_PP5020 |
84 | 84 | ||
85 | /* Type of mobile power */ | 85 | /* Type of mobile power */ |
86 | #define CONFIG_BATTERY BATT_LPCS355385 | 86 | #define CONFIG_BATTERY BATT_LIION750 |
87 | #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ | 87 | #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ |
88 | #define BATTERY_CAPACITY_MAX 750 /* max. capacity selectable */ | 88 | #define BATTERY_CAPACITY_MAX 750 /* max. capacity selectable */ |
89 | #define BATTERY_CAPACITY_INC 0 /* capacity increment */ | 89 | #define BATTERY_CAPACITY_INC 0 /* capacity increment */ |
diff --git a/firmware/export/config.h b/firmware/export/config.h index c935ac466f..2d7b3e131a 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -77,6 +77,7 @@ | |||
77 | #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */ | 77 | #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */ |
78 | #define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */ | 78 | #define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */ |
79 | #define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */ | 79 | #define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */ |
80 | #define BATT_LIION750 750 /* Sansa e200 LiIon 3,7V */ | ||
80 | #define BATT_1AA 333 /* iRiver iFP: Alkaline, NiHM */ | 81 | #define BATT_1AA 333 /* iRiver iFP: Alkaline, NiHM */ |
81 | 82 | ||
82 | /* CONFIG_CHARGING */ | 83 | /* CONFIG_CHARGING */ |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index eced1a21a6..5f112c3545 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -190,6 +190,8 @@ static const unsigned int battery_level_dangerous[BATTERY_TYPES_COUNT] = | |||
190 | 105, 115 | 190 | 105, 115 |
191 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver H1x0: LiPolymer */ | 191 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver H1x0: LiPolymer */ |
192 | 338 | 192 | 338 |
193 | #elif CONFIG_BATTERY == BATT_LIION750 /* Sansa e200 */ | ||
194 | 340 | ||
193 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ | 195 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ |
194 | 345 | 196 | 345 |
195 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */ | 197 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */ |
@@ -211,6 +213,8 @@ static const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = | |||
211 | 270, 280 | 213 | 270, 280 |
212 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver Hxxx */ | 214 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver Hxxx */ |
213 | 302 | 215 | 302 |
216 | #elif CONFIG_BATTERY == BATT_LIION750 /* Sansa e200 */ | ||
217 | 330 | ||
214 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ | 218 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ |
215 | 340 | 219 | 340 |
216 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */ | 220 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5M5 /* iAudio X5 */ |
@@ -258,6 +262,9 @@ static const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | |||
258 | #elif CONFIG_BATTERY == BATT_LIION830 | 262 | #elif CONFIG_BATTERY == BATT_LIION830 |
259 | /* Toshiba Gigabeat Li Ion 830mAH figured from discharge curve */ | 263 | /* Toshiba Gigabeat Li Ion 830mAH figured from discharge curve */ |
260 | { 354, 357, 359, 361, 364, 366, 372, 381, 377, 381, 394 }, | 264 | { 354, 357, 359, 361, 364, 366, 372, 381, 377, 381, 394 }, |
265 | #elif CONFIG_BATTERY == BATT_LIION750 | ||
266 | /* Sansa Li Ion 750mAH FIXME this is a first linear approach */ | ||
267 | { 330, 339, 348, 357, 366, 375, 384, 393, 402, 411, 420 }, | ||
261 | #else /* NiMH */ | 268 | #else /* NiMH */ |
262 | /* original values were taken directly after charging, but it should show | 269 | /* original values were taken directly after charging, but it should show |
263 | 100% after turning off the device for some hours, too */ | 270 | 100% after turning off the device for some hours, too */ |
@@ -276,6 +283,9 @@ static const unsigned short percent_to_volt_charge[11] = | |||
276 | #if CONFIG_BATTERY == BATT_LIPOL1300 | 283 | #if CONFIG_BATTERY == BATT_LIPOL1300 |
277 | /* values measured over one full charging cycle */ | 284 | /* values measured over one full charging cycle */ |
278 | 354, 386, 393, 398, 400, 402, 404, 408, 413, 418, 423 /* LiPo */ | 285 | 354, 386, 393, 398, 400, 402, 404, 408, 413, 418, 423 /* LiPo */ |
286 | #elif CONFIG_BATTERY == BATT_LIION750 | ||
287 | /* Sansa Li Ion 750mAH FIXME*/ | ||
288 | 330, 339, 348, 357, 366, 375, 384, 393, 402, 411, 420 | ||
279 | #elif CONFIG_BATTERY == BATT_LIION830 | 289 | #elif CONFIG_BATTERY == BATT_LIION830 |
280 | /* Toshiba Gigabeat Li Ion 830mAH */ | 290 | /* Toshiba Gigabeat Li Ion 830mAH */ |
281 | 354, 357, 359, 361, 364, 366, 372, 381, 377, 381, 394 | 291 | 354, 357, 359, 361, 364, 366, 372, 381, 377, 381, 394 |