blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3381 from OpenSauce04/deprioritize-battery-capacity 

modules/battery: Deprioritize `capacity` /sys value for battery calculation if other methods are available
This commit is contained in:
Alexis Rouillard 2024-06-24 08:57:30 +02:00 committed by GitHub
parent 1c1089bade d68bcbd292
commit 1003c220be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/battery.cpp
View File

@ -272,13 +272,6 @@ waybar::modules::Battery::getInfos() {
// Some battery will report current and charge in μA/μAh. // Some battery will report current and charge in μA/μAh.
// Scale these by the voltage to get μW/μWh. // Scale these by the voltage to get μW/μWh.
uint32_t capacity = 0;
bool capacity_exists = false;
if (fs::exists(bat / "capacity")) {
capacity_exists = true;
std::ifstream(bat / "capacity") >> capacity;
}
uint32_t current_now = 0; uint32_t current_now = 0;
bool current_now_exists = false; bool current_now_exists = false;
if (fs::exists(bat / "current_now")) { if (fs::exists(bat / "current_now")) {
@ -382,6 +375,19 @@ waybar::modules::Battery::getInfos() {
} }
} }
uint32_t capacity = 0;
bool capacity_exists = false;
if (charge_now_exists && charge_full_exists && charge_full != 0) {
capacity_exists = true;
capacity = 100 * (uint64_t)charge_now / (uint64_t)charge_full;
} else if (energy_now_exists && energy_full_exists && energy_full != 0) {
capacity_exists = true;
capacity = 100 * (uint64_t)energy_now / (uint64_t)energy_full;
} else if (fs::exists(bat / "capacity")) {
capacity_exists = true;
std::ifstream(bat / "capacity") >> capacity;
}
if (!voltage_now_exists) { if (!voltage_now_exists) {
if (power_now_exists && current_now_exists && current_now != 0) { if (power_now_exists && current_now_exists && current_now != 0) {
voltage_now_exists = true; voltage_now_exists = true;
@ -422,13 +428,7 @@ waybar::modules::Battery::getInfos() {
} }
if (!capacity_exists) { if (!capacity_exists) {
if (charge_now_exists && charge_full_exists && charge_full != 0) { if (charge_now_exists && energy_full_exists && voltage_now_exists) {
capacity_exists = true;
capacity = 100 * (uint64_t)charge_now / (uint64_t)charge_full;
} else if (energy_now_exists && energy_full_exists && energy_full != 0) {
capacity_exists = true;
capacity = 100 * (uint64_t)energy_now / (uint64_t)energy_full;
} else if (charge_now_exists && energy_full_exists && voltage_now_exists) {
if (!charge_full_exists && voltage_now != 0) { if (!charge_full_exists && voltage_now != 0) {
charge_full_exists = true; charge_full_exists = true;
charge_full = 1000000 * (uint64_t)energy_full / (uint64_t)voltage_now; charge_full = 1000000 * (uint64_t)energy_full / (uint64_t)voltage_now;