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

module/battery: add support for 'charge_full' and 'charge_full_design'

Browse source
This commit is contained in:
Daniel Eklöf 2020-06-05 13:44:59 +02:00
parent 1864d68961
commit 0b1333aa03
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 61 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
modules/battery.c
View file

@ -30,6 +30,8 @@ struct private {
char *model; char *model;
long energy_full_design; long energy_full_design;
long energy_full; long energy_full;
long charge_full_design;
long charge_full;
enum state state; enum state state;
long capacity; long capacity;
@ -190,26 +192,60 @@ initialize(struct private *m)
} }
} }
if (faccessat(base_dir_fd, "energy_full_design", O_RDONLY, 0) == 0 &&
faccessat(base_dir_fd, "energy_full", O_RDONLY, 0) == 0)
{ {
int fd = openat(base_dir_fd, "energy_full_design", O_RDONLY); {
if (fd == -1) { int fd = openat(base_dir_fd, "energy_full_design", O_RDONLY);
LOG_ERRNO("/sys/class/power_supply/%s/energy_full_design", m->battery); if (fd == -1) {
goto err; LOG_ERRNO("/sys/class/power_supply/%s/energy_full_design", m->battery);
goto err;
}
m->energy_full_design = readint_from_fd(fd);
close(fd);
} }
m->energy_full_design = readint_from_fd(fd); {
close(fd); int fd = openat(base_dir_fd, "energy_full", O_RDONLY);
if (fd == -1) {
LOG_ERRNO("/sys/class/power_supply/%s/energy_full", m->battery);
goto err;
}
m->energy_full = readint_from_fd(fd);
close(fd);
}
} else {
m->energy_full = m->energy_full_design = -1;
} }
if (faccessat(base_dir_fd, "charge_full_design", O_RDONLY, 0) == 0 &&
faccessat(base_dir_fd, "charge_full", O_RDONLY, 0) == 0)
{ {
int fd = openat(base_dir_fd, "energy_full", O_RDONLY); {
if (fd == -1) { int fd = openat(base_dir_fd, "charge_full_design", O_RDONLY);
LOG_ERRNO("/sys/class/power_supply/%s/energy_full", m->battery); if (fd == -1) {
goto err; LOG_ERRNO("/sys/class/power_supply/%s/charge_full_design", m->battery);
goto err;
}
m->charge_full_design = readint_from_fd(fd);
close(fd);
} }
m->energy_full = readint_from_fd(fd); {
close(fd); int fd = openat(base_dir_fd, "charge_full", O_RDONLY);
if (fd == -1) {
LOG_ERRNO("/sys/class/power_supply/%s/charge_full", m->battery);
goto err;
}
m->charge_full = readint_from_fd(fd);
close(fd);
}
} else {
m->charge_full = m->charge_full_design = -1;
} }
return base_dir_fd; return base_dir_fd;
@ -246,7 +282,8 @@ update_status(struct module *mod, int capacity_fd, int energy_fd, int power_fd,
state = STATE_DISCHARGING; state = STATE_DISCHARGING;
} }
LOG_DBG("capacity: %ld, energy: %ld, power: %ld", capacity, energy, power); LOG_DBG("capacity: %ld, energy: %ld, power: %ld, time-to-empty: %ld",
capacity, energy, power, time_to_empty);
mtx_lock(&mod->lock); mtx_lock(&mod->lock);
m->state = state; m->state = state;
@ -269,7 +306,11 @@ run(struct module *mod)
LOG_INFO("%s: %s %s (at %.1f%% of original capacity)", LOG_INFO("%s: %s %s (at %.1f%% of original capacity)",
m->battery, m->manufacturer, m->model, m->battery, m->manufacturer, m->model,
100.0 * m->energy_full / m->energy_full_design); (m->energy_full > 0
? 100.0 * m->energy_full / m->energy_full_design
: m->charge_full > 0
? 100.0 * m->charge_full / m->charge_full_design
: 0.0));
int ret = 1; int ret = 1;
int status_fd = openat(base_dir_fd, "status", O_RDONLY); int status_fd = openat(base_dir_fd, "status", O_RDONLY);
@ -281,20 +322,14 @@ run(struct module *mod)
struct udev *udev = udev_new(); struct udev *udev = udev_new();
struct udev_monitor *mon = udev_monitor_new_from_netlink(udev, "udev"); struct udev_monitor *mon = udev_monitor_new_from_netlink(udev, "udev");
#if 0
if (status_fd == -1 || capacity_fd == -1 || energy_fd == -1 ||
power_fd == -1 || udev == NULL || mon == NULL)
{
goto out;
}
#endif
if (status_fd < 0 || capacity_fd < 0 || udev == NULL || mon == NULL) if (status_fd < 0 || capacity_fd < 0 || udev == NULL || mon == NULL)
goto out; goto out;
udev_monitor_filter_add_match_subsystem_devtype(mon, "power_supply", NULL); udev_monitor_filter_add_match_subsystem_devtype(mon, "power_supply", NULL);
udev_monitor_enable_receiving(mon); udev_monitor_enable_receiving(mon);
update_status(mod, capacity_fd, energy_fd, power_fd, status_fd, time_to_empty_fd); update_status(mod, capacity_fd, energy_fd, power_fd, status_fd,
time_to_empty_fd);
bar->refresh(bar); bar->refresh(bar);
while (true) { while (true) {
@ -320,7 +355,8 @@ run(struct module *mod)
continue; continue;
} }
update_status(mod, capacity_fd, energy_fd, power_fd, status_fd, time_to_empty_fd); update_status(mod, capacity_fd, energy_fd, power_fd, status_fd,
time_to_empty_fd);
bar->refresh(bar); bar->refresh(bar);
} }
@ -338,6 +374,8 @@ out:
close(capacity_fd); close(capacity_fd);
if (status_fd != -1) if (status_fd != -1)
close(status_fd); close(status_fd);
if (time_to_empty_fd != -1)
close(time_to_empty_fd);
close(base_dir_fd); close(base_dir_fd);
return ret; return ret;