diff options
Diffstat (limited to 'src/freebsd/btop_collect.cpp')
| -rw-r--r-- | src/freebsd/btop_collect.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/freebsd/btop_collect.cpp b/src/freebsd/btop_collect.cpp index 2db49a2..38f4368 100644 --- a/src/freebsd/btop_collect.cpp +++ b/src/freebsd/btop_collect.cpp @@ -207,7 +207,7 @@ namespace Cpu { string cpuName; string cpuHz; bool has_battery = true; - tuple<int, long, string> current_bat; + tuple<int, float, long, string> current_bat; const array<string, 10> time_names = {"user", "nice", "system", "idle"}; @@ -373,10 +373,11 @@ namespace Cpu { return core_map; } - auto get_battery() -> tuple<int, long, string> { - if (not has_battery) return {0, 0, ""}; + auto get_battery() -> tuple<int, float, long, string> { + if (not has_battery) return {0, 0, 0, ""}; long seconds = -1; + float watts = -1; uint32_t percent = -1; size_t size = sizeof(percent); string status = "discharging"; @@ -388,6 +389,10 @@ namespace Cpu { if (sysctlbyname("hw.acpi.battery.time", &seconds, &size, nullptr, 0) < 0) { seconds = 0; } + size = sizeof(watts); + if (sysctlbyname("hw.acpi.battery.rate", &watts, &size, nullptr, 0) < 0) { + watts = -1; + } int state; size = sizeof(state); if (sysctlbyname("hw.acpi.battery.state", &state, &size, nullptr, 0) < 0) { @@ -402,7 +407,7 @@ namespace Cpu { } } - return {percent, seconds, status}; + return {percent, watts, seconds, status}; } auto collect(bool no_update) -> cpu_info & { |