pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

Make default battery state as unknown

Browse source 
When a given battery is not found or otherwise state cannot be read - we
default to "unknown" state instead of discharging with incomplete data
This commit is contained in:
Stanislav Ochotnický 2021-09-20 08:36:53 +02:00
parent 7bbcad55e4
commit 8709e8da38
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/battery.c
View file

@ -20,7 +20,7 @@
#include "../config-verify.h" #include "../config-verify.h"
#include "../plugin.h" #include "../plugin.h"
enum state { STATE_FULL, STATE_NOTCHARGING, STATE_CHARGING, STATE_DISCHARGING }; enum state { STATE_FULL, STATE_NOTCHARGING, STATE_CHARGING, STATE_DISCHARGING, STATE_UNKNOWN };
struct private { struct private {
struct particle *label; struct particle *label;
@ -76,7 +76,8 @@ content(struct module *mod)
assert(m->state == STATE_FULL || assert(m->state == STATE_FULL ||
m->state == STATE_NOTCHARGING || m->state == STATE_NOTCHARGING ||
m->state == STATE_CHARGING || m->state == STATE_CHARGING ||
m->state == STATE_DISCHARGING); m->state == STATE_DISCHARGING ||
m->state == STATE_UNKNOWN);
unsigned long hours; unsigned long hours;
unsigned long minutes; unsigned long minutes;
@ -357,7 +358,7 @@ update_status(struct module *mod)
if (status == NULL) { if (status == NULL) {
LOG_WARN("failed to read battery state"); LOG_WARN("failed to read battery state");
state = STATE_DISCHARGING; state = STATE_UNKNOWN;
} else if (strcmp(status, "Full") == 0) } else if (strcmp(status, "Full") == 0)
state = STATE_FULL; state = STATE_FULL;
else if (strcmp(status, "Not charging") == 0) else if (strcmp(status, "Not charging") == 0)
@ -367,10 +368,10 @@ update_status(struct module *mod)
else if (strcmp(status, "Discharging") == 0) else if (strcmp(status, "Discharging") == 0)
state = STATE_DISCHARGING; state = STATE_DISCHARGING;
else if (strcmp(status, "Unknown") == 0) else if (strcmp(status, "Unknown") == 0)
state = STATE_DISCHARGING; state = STATE_UNKNOWN;
else { else {
LOG_ERR("unrecognized battery state: %s", status); LOG_ERR("unrecognized battery state: %s", status);
state = STATE_DISCHARGING; state = STATE_UNKNOWN;
} }
LOG_DBG("capacity: %ld, energy: %ld, power: %ld, charge=%ld, current=%ld, " LOG_DBG("capacity: %ld, energy: %ld, power: %ld, charge=%ld, current=%ld, "
@ -464,7 +465,7 @@ battery_new(const char *battery, struct particle *label, int poll_interval_secs)
m->label = label; m->label = label;
m->poll_interval = poll_interval_secs; m->poll_interval = poll_interval_secs;
m->battery = strdup(battery); m->battery = strdup(battery);
m->state = STATE_DISCHARGING; m->state = STATE_UNKNOWN;
struct module *mod = module_common_new(); struct module *mod = module_common_new();
mod->private = m; mod->private = m;