CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-06-21 11:50:48 +12:00
Code Issues Projects Releases Wiki Activity

add power to get_battery function output

Browse source
This commit is contained in:
jkre 2023-12-14 00:53:01 +01:00
parent 419a7d4ca3
commit 6e575116fe
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/btop_shared.hpp
View file

@ -178,7 +178,7 @@ namespace Cpu {
extern string cpuName, cpuHz; extern string cpuName, cpuHz;
extern vector<string> available_fields; extern vector<string> available_fields;
extern vector<string> available_sensors; extern vector<string> available_sensors;
extern tuple<int, long, string> current_bat; extern tuple<int, float, long, string> current_bat;
struct cpu_info { struct cpu_info {
unordered_flat_map<string, deque<long long>> cpu_percent = { unordered_flat_map<string, deque<long long>> cpu_percent = {
@ -213,7 +213,7 @@ namespace Cpu {
auto get_cpuHz() -> string; auto get_cpuHz() -> string;
//* Get battery info from /sys //* Get battery info from /sys
auto get_battery() -> tuple<int, long, string>; auto get_battery() -> tuple<int, float, long, string>;
} }
namespace Mem { namespace Mem {

12
src/linux/btop_collect.cpp
View file

@ -291,7 +291,7 @@ namespace Cpu {
string cpuName; string cpuName;
string cpuHz; string cpuHz;
bool has_battery = true; bool has_battery = true;
tuple<int, long, string> current_bat; tuple<int, float, long, string> current_bat;
const array time_names { const array time_names {
"user"s, "nice"s, "system"s, "idle"s, "iowait"s, "user"s, "nice"s, "system"s, "idle"s, "iowait"s,
@ -667,8 +667,8 @@ namespace Cpu {
bool use_power = true; bool use_power = true;
}; };
auto get_battery() -> tuple<int, long, string> { auto get_battery() -> tuple<int, float, long, string> {
if (not has_battery) return {0, 0, ""}; if (not has_battery) return {0, 0, 0, ""};
static string auto_sel; static string auto_sel;
static unordered_flat_map<string, battery> batteries; static unordered_flat_map<string, battery> batteries;
@ -735,7 +735,7 @@ namespace Cpu {
} }
if (batteries.empty()) { if (batteries.empty()) {
has_battery = false; has_battery = false;
return {0, 0, ""}; return {0, 0, 0, ""};
} }
} }
@ -781,7 +781,7 @@ namespace Cpu {
} }
if (percent < 0) { if (percent < 0) {
has_battery = false; has_battery = false;
return {0, 0, ""}; return {0, 0, 0, ""};
} }
//? Get charging/discharging status //? Get charging/discharging status
@ -840,7 +840,7 @@ namespace Cpu {
} }
return {percent, seconds, status}; return {percent, watts, seconds, status};
} }
auto collect(bool no_update) -> cpu_info& { auto collect(bool no_update) -> cpu_info& {