diff options
Diffstat (limited to 'firmware/powermgmt.c')
-rw-r--r-- | firmware/powermgmt.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index c4582a7302..65dd42810e 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -191,6 +191,8 @@ static const unsigned int battery_level_dangerous[BATTERY_TYPES_COUNT] = | |||
191 | 105, 115 | 191 | 105, 115 |
192 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver H1x0: LiPolymer */ | 192 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver H1x0: LiPolymer */ |
193 | 338 | 193 | 338 |
194 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ | ||
195 | 340 | ||
194 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */ | 196 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */ |
195 | 354 | 197 | 354 |
196 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB: LiPolymer*/ | 198 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB: LiPolymer*/ |
@@ -210,6 +212,8 @@ static const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = | |||
210 | 270, 280 | 212 | 270, 280 |
211 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver Hxxx */ | 213 | #elif CONFIG_BATTERY == BATT_LIPOL1300 /* iRiver Hxxx */ |
212 | 299 | 214 | 299 |
215 | #elif CONFIG_BATTERY == BATT_LIION830 /* Gigabeat F */ | ||
216 | 338 | ||
213 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */ | 217 | #elif CONFIG_BATTERY == BATT_IAUDIO_X5 /* iAudio X5 */ |
214 | 350 | 218 | 350 |
215 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB */ | 219 | #elif CONFIG_BATTERY == BATT_LPCS355385 /* iriver H10 20GB */ |
@@ -252,6 +256,9 @@ static const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | |||
252 | /* May need recalibration. */ | 256 | /* May need recalibration. */ |
253 | { 93, 108, 114, 118, 121, 125, 128, 132, 136, 142, 158 }, /* alkaline */ | 257 | { 93, 108, 114, 118, 121, 125, 128, 132, 136, 142, 158 }, /* alkaline */ |
254 | { 103, 118, 121, 123, 124, 125, 126, 127, 128, 129, 135 } /* NiMH */ | 258 | { 103, 118, 121, 123, 124, 125, 126, 127, 128, 129, 135 } /* NiMH */ |
259 | #elif CONFIG_BATTERY == BATT_LIION830 | ||
260 | /* Toshiba Gigabeat Li Ion 830mAH figured from discharge curve */ | ||
261 | { 342, 358, 361, 368, 371, 374, 377, 381, 387, 390, 397 } | ||
255 | #else /* NiMH */ | 262 | #else /* NiMH */ |
256 | /* original values were taken directly after charging, but it should show | 263 | /* original values were taken directly after charging, but it should show |
257 | 100% after turning off the device for some hours, too */ | 264 | 100% after turning off the device for some hours, too */ |
@@ -263,12 +270,16 @@ static const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | |||
263 | #ifdef CONFIG_CHARGING | 270 | #ifdef CONFIG_CHARGING |
264 | charger_input_state_type charger_input_state IDATA_ATTR; | 271 | charger_input_state_type charger_input_state IDATA_ATTR; |
265 | 272 | ||
273 | |||
266 | /* voltages (centivolt) of 0%, 10%, ... 100% when charging enabled */ | 274 | /* voltages (centivolt) of 0%, 10%, ... 100% when charging enabled */ |
267 | static const unsigned short percent_to_volt_charge[11] = | 275 | static const unsigned short percent_to_volt_charge[11] = |
268 | { | 276 | { |
269 | #if CONFIG_BATTERY == BATT_LIPOL1300 | 277 | #if CONFIG_BATTERY == BATT_LIPOL1300 |
270 | /* values measured over one full charging cycle */ | 278 | /* values measured over one full charging cycle */ |
271 | 354, 386, 393, 398, 400, 402, 404, 408, 413, 418, 423 /* LiPo */ | 279 | 354, 386, 393, 398, 400, 402, 404, 408, 413, 418, 423 /* LiPo */ |
280 | #elif CONFIG_BATTERY == BATT_LIION830 | ||
281 | /* Toshiba Gigabeat Li Ion 830mAH */ | ||
282 | 347, 363, 366, 373, 376, 379, 382, 386, 393, 403, 411 | ||
272 | #elif CONFIG_BATTERY == BATT_LPCS355385 | 283 | #elif CONFIG_BATTERY == BATT_LPCS355385 |
273 | /* iriver H10 20GB */ | 284 | /* iriver H10 20GB */ |
274 | 399, 403, 406, 408, 410, 412, 415, 418, 422, 426, 431 | 285 | 399, 403, 406, 408, 410, 412, 415, 418, 422, 426, 431 |