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

Merge pull request #237 from kousu/215-battery

Browse Source 
Be more cautious about handling invalid battery measurements.
This commit is contained in:
Michael Stapelberg 2017-10-05 22:53:58 -07:00 committed by GitHub
commit 7ea12e3dff
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/print_battery_info.c
View File

@ -175,12 +175,20 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
* POWER_SUPPLY_CHARGE_NOW is the unit of measurement. The energy is * POWER_SUPPLY_CHARGE_NOW is the unit of measurement. The energy is
* given in mWh, the charge in mAh. So calculate every value given in * given in mWh, the charge in mAh. So calculate every value given in
* ampere to watt */ * ampere to watt */
if (!watt_as_unit && voltage != -1) { if (!watt_as_unit && voltage >= 0) {
if (batt_info->present_rate > 0) {
batt_info->present_rate = (((float)voltage / 1000.0) * ((float)batt_info->present_rate / 1000.0)); batt_info->present_rate = (((float)voltage / 1000.0) * ((float)batt_info->present_rate / 1000.0));
}
if (batt_info->remaining > 0) {
batt_info->remaining = (((float)voltage / 1000.0) * ((float)batt_info->remaining / 1000.0)); batt_info->remaining = (((float)voltage / 1000.0) * ((float)batt_info->remaining / 1000.0));
}
if (batt_info->full_design > 0) {
batt_info->full_design = (((float)voltage / 1000.0) * ((float)batt_info->full_design / 1000.0)); batt_info->full_design = (((float)voltage / 1000.0) * ((float)batt_info->full_design / 1000.0));
}
if (batt_info->full_last > 0) {
batt_info->full_last = (((float)voltage / 1000.0) * ((float)batt_info->full_last / 1000.0)); batt_info->full_last = (((float)voltage / 1000.0) * ((float)batt_info->full_last / 1000.0));
} }
}
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
int state; int state;
int sysctl_rslt; int sysctl_rslt;
@ -499,8 +507,19 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char
return; return;
} }
int full = (last_full_capacity ? batt_info.full_last : batt_info.full_design); // *Choose* a measure of the 'full' battery. It is whichever is better of
if (full < 0 && batt_info.percentage_remaining < 0) { // the battery's (hardware-given) design capacity (batt_info.full_design)
// and the battery's last known good charge (batt_info.full_last).
// We prefer the design capacity, but use the last capacity if we don't have it,
// or if we are asked to (last_full_capacity == true); but similarly we use
// the design capacity if we don't have the last capacity.
// If we don't have either then both full_design and full_last < 0,
// which implies full < 0, which bails out on the following line.
int full = batt_info.full_design;
if (full < 0 || (last_full_capacity && batt_info.full_last >= 0)) {
full = batt_info.full_last;
}
if (full < 0 && batt_info.remaining < 0 && batt_info.percentage_remaining < 0) {
/* We have no physical measurements and no estimates. Nothing /* We have no physical measurements and no estimates. Nothing
* much we can report, then. */ * much we can report, then. */
OUTPUT_FULL_TEXT(format_down); OUTPUT_FULL_TEXT(format_down);