nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Little tidy-up on previous commit. 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15433 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Steve Bavin 2007-11-03 13:45:12 +00:00
parent 8d03282f91
commit 4d822319e9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/powermgmt.c
View File

@ -111,8 +111,7 @@ static void battery_status_update(void)
/* change the values: */
if (charging)
{
battery_millivolts += (unsigned int)(BATT_MAXMVOLT - BATT_MINMVOLT) / 101;
if (battery_millivolts >= (unsigned int)BATT_MAXMVOLT)
if (battery_millivolts >= BATT_MAXMVOLT)
{
/* Pretend the charger was disconnected */
charging = false;
@ -122,8 +121,7 @@ static void battery_status_update(void)
}
else
{
battery_millivolts -= (unsigned int)(BATT_MAXMVOLT - BATT_MINMVOLT) / 101;
if (battery_millivolts <= (unsigned int)BATT_MINMVOLT)
if (battery_millivolts <= BATT_MINMVOLT)
{
/* Pretend the charger was connected */
charging = true;
@ -131,6 +129,10 @@ static void battery_status_update(void)
last_sent_battery_level = 0;
}
}
if (charging)
battery_millivolts += (BATT_MAXMVOLT - BATT_MINMVOLT) / 50;
else
battery_millivolts -= (BATT_MAXMVOLT - BATT_MINMVOLT) / 100;
battery_percent = 100 * (battery_millivolts - BATT_MINMVOLT) / (BATT_MAXMVOLT - BATT_MINMVOLT);
powermgmt_est_runningtime_min = battery_percent * BATT_MAXRUNTIME / 100;
@ -1220,7 +1222,7 @@ void shutdown_hw(void)
#endif /* #ifndef SIMULATOR */
}
/* Send system battery level update events on reaching certain significant
/* Send system battery level update events on reaching certain significant
levels. This must be called after battery_percent has been updated. */
static void send_battery_level_event(void)
{