IntenseWebs/LACT
3
0
Fork 0
mirror of https://github.com/ilya-zlobintsev/LACT.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: handle scenarios when only the fan PWM is present, without speed readings

Browse Source
This commit is contained in:
Ilya Zlobintsev 2024-02-25 10:15:08 +02:00
parent 487b35ec18
commit 1e7d0873ff
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lact-daemon/src/server/gpu_controller/mod.rs
View File

@ -264,6 +264,7 @@ impl GpuController {
speed_current: self.hw_mon_and_then(HwMon::get_fan_current), speed_current: self.hw_mon_and_then(HwMon::get_fan_current),
speed_max: self.hw_mon_and_then(HwMon::get_fan_max), speed_max: self.hw_mon_and_then(HwMon::get_fan_max),
speed_min: self.hw_mon_and_then(HwMon::get_fan_min), speed_min: self.hw_mon_and_then(HwMon::get_fan_min),
pwm_current: self.hw_mon_and_then(HwMon::get_fan_pwm),
pmfw_info: PmfwInfo { pmfw_info: PmfwInfo {
acoustic_limit: self.handle.get_fan_acoustic_limit().ok(), acoustic_limit: self.handle.get_fan_acoustic_limit().ok(),
acoustic_target: self.handle.get_fan_acoustic_target().ok(), acoustic_target: self.handle.get_fan_acoustic_target().ok(),

31
lact-gui/src/app/root_stack/thermals_page/mod.rs
View File

@ -147,22 +147,33 @@ impl ThermalsPage {
self.temperatures_label self.temperatures_label
.set_markup(&format!("<b>{temperatures_text}</b>",)); .set_markup(&format!("<b>{temperatures_text}</b>",));
match stats.fan.speed_current { let fan_label = if let Some(current_rpm) = stats.fan.speed_current {
Some(fan_speed_current) => self.fan_speed_label.set_markup(&format!( let text = match stats.fan.speed_max {
"<b>{} RPM ({}%)</b>", Some(max_rpm) => format!(
fan_speed_current, "<b>{current_rpm} RPM ({}%)</b>",
(fan_speed_current as f64 ((current_rpm as f64 / max_rpm as f64) * 100.0).round(),
/ stats.fan.speed_max.unwrap_or(fan_speed_current) as f64 ),
* 100.0) None => format!("<b>{current_rpm} RPM</b>"),
.round() };
)), Some(text)
} else {
stats.fan.pwm_current.map(|current_pwm| {
format!(
"<b>{}%</b>",
((current_pwm as f64 / u8::MAX as f64) * 100.0).round()
)
})
};
match &fan_label {
Some(label) => self.fan_speed_label.set_markup(label),
None => self.fan_speed_label.set_text("No fan detected"), None => self.fan_speed_label.set_text("No fan detected"),
} }
if initial { if initial {
self.fan_control_mode_stack_switcher.set_visible(true); self.fan_control_mode_stack_switcher.set_visible(true);
self.fan_control_mode_stack_switcher self.fan_control_mode_stack_switcher
.set_sensitive(stats.fan.speed_current.is_some()); .set_sensitive(fan_label.is_some());
let child_name = match stats.fan.control_mode { let child_name = match stats.fan.control_mode {
Some(mode) if stats.fan.control_enabled => match mode { Some(mode) if stats.fan.control_enabled => match mode {

1
lact-schema/src/lib.rs
View File

@ -188,6 +188,7 @@ pub struct FanStats {
pub control_mode: Option<FanControlMode>, pub control_mode: Option<FanControlMode>,
pub static_speed: Option<f64>, pub static_speed: Option<f64>,
pub curve: Option<FanCurveMap>, pub curve: Option<FanCurveMap>,
pub pwm_current: Option<u8>,
pub speed_current: Option<u32>, pub speed_current: Option<u32>,
pub speed_max: Option<u32>, pub speed_max: Option<u32>,
pub speed_min: Option<u32>, pub speed_min: Option<u32>,