From d1aa135d2801d361f2eccc5efab08a6385ecb440 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 20 May 2015 19:17:23 +0200 Subject: [PATCH] Clamp the percentage at 100% when last_full_capacity is enabled. --- src/print_battery_info.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/print_battery_info.c b/src/print_battery_info.c index 85b0a75..0853e18 100644 --- a/src/print_battery_info.c +++ b/src/print_battery_info.c @@ -137,6 +137,14 @@ void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char (void)snprintf(statusbuf, sizeof(statusbuf), "%s", BATT_STATUS_NAME(status)); float percentage_remaining = (((float)remaining / (float)full_design) * 100); + /* Some batteries report POWER_SUPPLY_CHARGE_NOW= when fully + * charged, even though that’s plainly wrong. For people who chose to see + * the percentage calculated based on the last full capacity, we clamp the + * value to 100%, as that makes more sense. + * See http://bugs.debian.org/785398 */ + if (last_full_capacity && percentage_remaining > 100) { + percentage_remaining = 100; + } if (integer_battery_capacity) { (void)snprintf(percentagebuf, sizeof(percentagebuf), "%.00f%%", percentage_remaining); } else { -- 2.39.5