enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

and use last_full if there... 

SVN revision: 37686
This commit is contained in:
Carsten Haitzler 2008-11-17 03:57:32 +00:00
parent c646bbdc51
commit d6c689e422
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/battery/e_mod_main.c
View File

@ -319,7 +319,12 @@ _battery_hal_update(void)
have_battery = 1;
batnum++;
if (hbat->is_charging) have_power = 1;
full += hbat->percent;
if (hbat->last_full_charge > 0)
full += (hbat->current_charge * 100) / hbat->last_full_charge;
else if (hbat->design_charge > 0)
full += (hbat->current_charge * 100) / hbat->design_charge;
else
full += hbat->percent;
if (hbat->time_left > 0)
{
if (time_left < 0) time_left = hbat->time_left;
@ -330,9 +335,6 @@ _battery_hal_update(void)
}
if (batnum > 0) full /= batnum;
printf("full = %i, time_left = %i, have_battery = %i, have_power = %i\n",
full, time_left, have_battery, have_power);
if ((disch == 0) && (chrg == 0)) time_left = -1;
if (time_left < 1) time_left = -1;