mirror of
https://gitlab.com/asus-linux/asusctl.git
synced 2026-02-06 00:15:04 +01:00
Fix: asusd should reload defualt fan-curves if the config file fails
Closes #385
This commit is contained in:
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
### Changed
|
||||||
|
- Fixes to asusctl CLI tool to show fan curves
|
||||||
|
- Fixes to asusd to ensure fan curve defaults are loaded if the config file fails
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
- Support for GV601V LED modes
|
- Support for GV601V LED modes
|
||||||
|
|||||||
@@ -48,13 +48,13 @@ impl StdConfig for FanCurveConfig {
|
|||||||
Self::default()
|
Self::default()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn config_dir() -> std::path::PathBuf {
|
|
||||||
PathBuf::from(CONFIG_PATH_BASE)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn file_name(&self) -> String {
|
fn file_name(&self) -> String {
|
||||||
CONFIG_FAN_FILE.to_owned()
|
CONFIG_FAN_FILE.to_owned()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn config_dir() -> std::path::PathBuf {
|
||||||
|
PathBuf::from(CONFIG_PATH_BASE)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl StdConfigLoad for FanCurveConfig {}
|
impl StdConfigLoad for FanCurveConfig {}
|
||||||
|
|||||||
@@ -87,7 +87,11 @@ impl CtrlPlatformProfile {
|
|||||||
info!("{MOD_NAME}: Device has fan curves available");
|
info!("{MOD_NAME}: Device has fan curves available");
|
||||||
let fan_config = FanCurveConfig::new();
|
let fan_config = FanCurveConfig::new();
|
||||||
// Only do defaults if the config doesn't already exist
|
// Only do defaults if the config doesn't already exist
|
||||||
if !fan_config.file_path().exists() {
|
if !fan_config.file_path().exists()
|
||||||
|
|| fan_config.balanced.is_empty()
|
||||||
|
|| fan_config.performance.is_empty()
|
||||||
|
|| fan_config.quiet.is_empty()
|
||||||
|
{
|
||||||
info!("{MOD_NAME}: Fetching default fan curves");
|
info!("{MOD_NAME}: Fetching default fan curves");
|
||||||
controller.fan_curves = Some(FanCurves {
|
controller.fan_curves = Some(FanCurves {
|
||||||
config_file: fan_config,
|
config_file: fan_config,
|
||||||
|
|||||||
Reference in New Issue
Block a user