xbattmon

simple battery monitor for X
git clone git://git.2f30.org/xbattmon.git
Log | Files | Refs | README | LICENSE

commit 10e94bc186026cc1758c45ecdc1b7d6a47d0ff1d
parent 6d47c3f7d9d73abdd7da88b186e9570fae496226
Author: Lazaros Koromilas <lostd@2f30.org>
Date:   Mon, 31 Jul 2017 17:39:31 +0300

Use battery path list and warn instead of error

Diffstat:
config.linux.mk | 4++--
xbattmon.c | 58+++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/config.linux.mk b/config.linux.mk @@ -1,9 +1,9 @@ PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man -# If you have a second battery, specify PATH_BAT1_CAP too. +# You can specify more than one battery paths CPPFLAGS = \ -DVERSION=\"${VERSION}\" \ - -DPATH_BAT0_CAP=\"/sys/class/power_supply/BAT0/capacity\" \ + -DPATH_LIST_BAT='{ "/sys/class/power_supply/BAT0" }' \ -DPATH_AC_ONLINE=\"/sys/class/power_supply/AC/online\" LDLIBS = -lX11 diff --git a/xbattmon.c b/xbattmon.c @@ -269,33 +269,45 @@ void pollbat(void) { FILE *fp; - int bat0cap, bat1cap = -1; /* secondary battery is optional */ + char *path_list_bat[] = PATH_LIST_BAT; + char path_energy_full[PATH_MAX]; + char path_energy_now[PATH_MAX]; + int total_energy_full = 0; + int total_energy_now = 0; + int energy_full; + int energy_now; int acon; + int i; + + for (i = 0; i < LEN(path_list_bat); i++) { + snprintf(path_energy_full, sizeof(path_energy_full), + "%s/energy_full", path_list_bat[i]); + fp = fopen(path_energy_full, "r"); + if (!fp) { + warn("fopen %s", path_energy_full); + continue; + } + fscanf(fp, "%d", &energy_full); + fclose(fp); + + snprintf(path_energy_now, sizeof(path_energy_now), + "%s/energy_now", path_list_bat[i]); + fp = fopen(path_energy_now, "r"); + if (!fp) { + warn("fopen %s", path_energy_now); + continue; + } + fscanf(fp, "%d", &energy_now); + fclose(fp); - fp = fopen(PATH_BAT0_CAP, "r"); - if (!fp) - err(1, "fopen %s", PATH_BAT0_CAP); - fscanf(fp, "%d", &bat0cap); - fclose(fp); - - if (bat0cap > 100) - bat0cap = 100; - -#ifdef PATH_BAT1_CAP - fp = fopen(PATH_BAT1_CAP, "r"); - if (!fp) - err(1, "fopen %s", PATH_BAT1_CAP); - fscanf(fp, "%d", &bat1cap); - fclose(fp); - - if (bat1cap > 100) - bat1cap = 100; -#endif + total_energy_full += energy_full / 1000; + total_energy_now += energy_now / 1000; + } - if (bat1cap != -1) - batcap = 100 * (bat0cap + bat1cap) / 200; + if (total_energy_full > 0) + batcap = 100 * total_energy_now / total_energy_full; else - batcap = bat0cap; + batcap = 0; if (batcap > maxcap) batcap = maxcap;