mirror of
https://gitlab.com/asus-linux/asusctl.git
synced 2026-02-06 00:15:04 +01:00
ROGCC: fix fancurve quiet fans incorrect enablement
This commit is contained in:
@@ -8,6 +8,7 @@
|
|||||||
- Testing CI for opensuse RPM build
|
- Testing CI for opensuse RPM build
|
||||||
- ROGCC: Fixes to showing the PPT enablement toggle
|
- ROGCC: Fixes to showing the PPT enablement toggle
|
||||||
- ROGCC: Fixes to how PPT and NV sliders work and enable/disable
|
- ROGCC: Fixes to how PPT and NV sliders work and enable/disable
|
||||||
|
- RGOCC: Fix quiet fan-curves availability
|
||||||
|
|
||||||
## [v6.1.7]
|
## [v6.1.7]
|
||||||
|
|
||||||
|
|||||||
@@ -54,14 +54,17 @@ pub fn update_fan_data(
|
|||||||
global.set_performance_available(true);
|
global.set_performance_available(true);
|
||||||
match fan.fan {
|
match fan.fan {
|
||||||
rog_profiles::FanCurvePU::CPU => {
|
rog_profiles::FanCurvePU::CPU => {
|
||||||
|
global.set_cpu_fan_available(true);
|
||||||
global.set_performance_cpu_enabled(fan.enabled);
|
global.set_performance_cpu_enabled(fan.enabled);
|
||||||
global.set_performance_cpu(collect(&fan.temp, &fan.pwm))
|
global.set_performance_cpu(collect(&fan.temp, &fan.pwm))
|
||||||
}
|
}
|
||||||
rog_profiles::FanCurvePU::GPU => {
|
rog_profiles::FanCurvePU::GPU => {
|
||||||
|
global.set_gpu_fan_available(true);
|
||||||
global.set_performance_gpu_enabled(fan.enabled);
|
global.set_performance_gpu_enabled(fan.enabled);
|
||||||
global.set_performance_gpu(collect(&fan.temp, &fan.pwm))
|
global.set_performance_gpu(collect(&fan.temp, &fan.pwm))
|
||||||
}
|
}
|
||||||
rog_profiles::FanCurvePU::MID => {
|
rog_profiles::FanCurvePU::MID => {
|
||||||
|
global.set_mid_fan_available(true);
|
||||||
global.set_performance_mid_enabled(fan.enabled);
|
global.set_performance_mid_enabled(fan.enabled);
|
||||||
global.set_performance_mid(collect(&fan.temp, &fan.pwm))
|
global.set_performance_mid(collect(&fan.temp, &fan.pwm))
|
||||||
}
|
}
|
||||||
@@ -71,12 +74,18 @@ pub fn update_fan_data(
|
|||||||
global.set_quiet_available(true);
|
global.set_quiet_available(true);
|
||||||
match fan.fan {
|
match fan.fan {
|
||||||
rog_profiles::FanCurvePU::CPU => {
|
rog_profiles::FanCurvePU::CPU => {
|
||||||
|
global.set_cpu_fan_available(true);
|
||||||
|
global.set_quiet_cpu_enabled(fan.enabled);
|
||||||
global.set_quiet_cpu(collect(&fan.temp, &fan.pwm))
|
global.set_quiet_cpu(collect(&fan.temp, &fan.pwm))
|
||||||
}
|
}
|
||||||
rog_profiles::FanCurvePU::GPU => {
|
rog_profiles::FanCurvePU::GPU => {
|
||||||
|
global.set_gpu_fan_available(true);
|
||||||
|
global.set_quiet_gpu_enabled(fan.enabled);
|
||||||
global.set_quiet_gpu(collect(&fan.temp, &fan.pwm))
|
global.set_quiet_gpu(collect(&fan.temp, &fan.pwm))
|
||||||
}
|
}
|
||||||
rog_profiles::FanCurvePU::MID => {
|
rog_profiles::FanCurvePU::MID => {
|
||||||
|
global.set_mid_fan_available(true);
|
||||||
|
global.set_quiet_mid_enabled(fan.enabled);
|
||||||
global.set_quiet_mid(collect(&fan.temp, &fan.pwm))
|
global.set_quiet_mid(collect(&fan.temp, &fan.pwm))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -129,6 +138,7 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
|
|||||||
else {
|
else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
dbg!(&quiet);
|
||||||
update_fan_data(handle, balanced, perf, quiet);
|
update_fan_data(handle, balanced, perf, quiet);
|
||||||
|
|
||||||
let handle_next1 = handle_copy.clone();
|
let handle_next1 = handle_copy.clone();
|
||||||
@@ -195,6 +205,8 @@ fn fan_data_for(fan: FanType, enabled: bool, data: Vec<Node>) -> CurveData {
|
|||||||
pwm[i] = n.y as u8;
|
pwm[i] = n.y as u8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dbg!(&fan, enabled);
|
||||||
|
|
||||||
CurveData {
|
CurveData {
|
||||||
fan: fan.into(),
|
fan: fan.into(),
|
||||||
pwm,
|
pwm,
|
||||||
|
|||||||
Reference in New Issue
Block a user