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

fix build

pull/1703/head
Loïc Bartoletti 2022-10-18 20:44:55 +02:00
parent 72a2ada82c
commit 692b90c995
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/battery.cpp
View File

@ -171,8 +171,6 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
std::lock_guard<std::mutex> guard(battery_list_mutex_); std::lock_guard<std::mutex> guard(battery_list_mutex_);
try { try {
uint32_t total_power = 0; // μW
bool total_power_exists = false;
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
/* Allocate state of battery units reported via ACPI. */ /* Allocate state of battery units reported via ACPI. */
int battery_units = 0; int battery_units = 0;
@ -225,8 +223,8 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
return {capacity, time / 60.0, status, rate}; return {capacity, time / 60.0, status, rate};
#elif defined(__linux__) #elif defined(__linux__)
uint32_t total_power = 0; // μW uint32_t total_power = 0; // μW
>>>>>>> 246e377 (FreeBSD: Add support to battery) bool total_power_exists = false;
uint32_t total_energy = 0; // μWh uint32_t total_energy = 0; // μWh
bool total_energy_exists = false; bool total_energy_exists = false;
uint32_t total_energy_full = 0; uint32_t total_energy_full = 0;
@ -540,6 +538,7 @@ const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) c
throw std::runtime_error("sysctl hw.acpi.battery.state failed"); throw std::runtime_error("sysctl hw.acpi.battery.state failed");
} }
bool online = state == 2; bool online = state == 2;
std::string status{"Unknown"}; // TODO: add status in FreeBSD
{ {
#else #else
if (!adapter_.empty()) { if (!adapter_.empty()) {
@ -547,13 +546,6 @@ const std::string waybar::modules::Battery::getAdapterStatus(uint8_t capacity) c
std::string status; std::string status;
std::ifstream(adapter_ / "online") >> online; std::ifstream(adapter_ / "online") >> online;
std::getline(std::ifstream(adapter_ / "status"), status); std::getline(std::ifstream(adapter_ / "status"), status);
#else
int state;
size_t size_state = sizeof state;
if (sysctlbyname("hw.acpi.battery.state", &state, &size_state, NULL,0) != 0) {
throw std::runtime_error("sysctl hw.acpi.battery.state failed");
}
bool online = state == 2;
#endif #endif
if (capacity == 100) { if (capacity == 100) {
return "Full"; return "Full";