marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Calculate the consumption if POWER_SUPPLY_POWER_NOW does not exist in uevent

Browse Source
This commit is contained in:
Marcel Hellwig 2012-07-10 11:45:45 +02:00 committed by Michael Stapelberg
parent f5c96008b0
commit 1271ff2aa4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/print_battery_info.c
View File

@ -42,7 +42,9 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
char *outwalk = buffer;
int full_design = -1,
remaining = -1,
present_rate = -1;
present_rate = -1,
voltage = -1,
current = -1;
charging_status_t status = CS_DISCHARGING;
memset(statusbuf, '\0', sizeof(statusbuf));
@ -74,7 +76,9 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW"))
remaining = atoi(walk+1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW"))
present_rate = atoi(walk+1);
current = atoi(walk+1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW"))
voltage = atoi(walk+1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW"))
present_rate = atoi(walk+1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging"))
@ -97,6 +101,9 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
}
}
if (present_rate == -1) /* on some systems POWER_SUPPLY_POWER_NOW does not exist, so we have to calculate it */
present_rate = ((float)voltage / 1000.0) * ((float)current / 1000.0);
if ((full_design == -1) || (remaining == -1)) {
OUTPUT_FULL_TEXT("No battery");
return;