Skip to content

Add total power as a widget #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NicholasClooney wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add total power as a widget #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,20 +400,8 @@ impl App {
self.render_freq_block(f, c2, "GPU", &self.igpu_freq);

// 3rd row
let label_l = format!(
"Power: {:.2}W (avg {:.2}W, max {:.2}W)",
self.all_power.top_value, self.all_power.avg_value, self.all_power.max_value,
);

// Show label only if sensor is available
let label_r = if self.sys_power.top_value > 0.0 {
format!(
"Total {:.2}W ({:.2}, {:.2})",
self.sys_power.top_value, self.sys_power.avg_value, self.sys_power.max_value
)
} else {
"".to_string()
};
let label_l = "Power";
let label_r = "";

let block = self.title_block(&label_l, &label_r);
let usage = format!(" 'q' – quit, 'c' – color, 'v' – view | -/+ {}ms ", self.cfg.interval);
Expand All @@ -423,12 +411,16 @@ impl App {

let ha = Layout::default()
.direction(Direction::Horizontal)
.constraints([Constraint::Fill(1), Constraint::Fill(1), Constraint::Fill(1)].as_ref())
.constraints(
[Constraint::Fill(1), Constraint::Fill(1), Constraint::Fill(1), Constraint::Fill(1)]
.as_ref(),
)
.split(iarea);

f.render_widget(self.get_power_block("CPU", &self.cpu_power, self.cpu_temp.last()), ha[0]);
f.render_widget(self.get_power_block("GPU", &self.gpu_power, self.gpu_temp.last()), ha[1]);
f.render_widget(self.get_power_block("ANE", &self.ane_power, 0.0), ha[2]);
f.render_widget(self.get_power_block("Total", &self.sys_power, 0.0), ha[3]);
}

pub fn run_loop(&mut self, interval: Option<u32>) -> WithError<()> {
Expand Down