RGBCube/superfreq
1
Fork 0
mirror of https://github.com/RGBCube/superfreq synced 2025-07-27 17:07:44 +00:00
Code Issues Activity

engine: simplify default handling

Browse source
This commit is contained in:
NotAShelf 2025-05-18 03:52:21 +03:00
parent 1655886af0
commit 8a92c124b1
No known key found for this signature in database
GPG key ID: 29D95B64378DB4BF
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/config/types.rs
View file

@ -50,7 +50,7 @@ pub struct ProfileConfig {
pub min_freq_mhz: Option<u32>, pub min_freq_mhz: Option<u32>,
pub max_freq_mhz: Option<u32>, pub max_freq_mhz: Option<u32>,
pub platform_profile: Option<String>, pub platform_profile: Option<String>,
pub turbo_auto_settings: Option<TurboAutoSettings>, pub turbo_auto_settings: TurboAutoSettings,
pub enable_auto_turbo: bool, pub enable_auto_turbo: bool,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub battery_charge_thresholds: Option<BatteryChargeThresholds>, pub battery_charge_thresholds: Option<BatteryChargeThresholds>,
@ -66,7 +66,7 @@ impl Default for ProfileConfig {
min_freq_mhz: None, // no override min_freq_mhz: None, // no override
max_freq_mhz: None, // no override max_freq_mhz: None, // no override
platform_profile: None, // no override platform_profile: None, // no override
turbo_auto_settings: Some(TurboAutoSettings::default()), turbo_auto_settings: TurboAutoSettings::default(),
enable_auto_turbo: default_enable_auto_turbo(), enable_auto_turbo: default_enable_auto_turbo(),
battery_charge_thresholds: None, battery_charge_thresholds: None,
} }
@ -224,7 +224,7 @@ impl From<ProfileConfigToml> for ProfileConfig {
platform_profile: toml_config.platform_profile, platform_profile: toml_config.platform_profile,
turbo_auto_settings: toml_config turbo_auto_settings: toml_config
.turbo_auto_settings .turbo_auto_settings
.or_else(|| Some(TurboAutoSettings::default())), .unwrap_or_default(),
enable_auto_turbo: toml_config.enable_auto_turbo, enable_auto_turbo: toml_config.enable_auto_turbo,
battery_charge_thresholds: toml_config.battery_charge_thresholds, battery_charge_thresholds: toml_config.battery_charge_thresholds,
} }

4
src/engine.rs
View file

@ -290,8 +290,8 @@ fn manage_auto_turbo(
config: &ProfileConfig, config: &ProfileConfig,
on_ac_power: bool, on_ac_power: bool,
) -> Result<(), EngineError> { ) -> Result<(), EngineError> {
// Get the auto turbo settings from the config, or use defaults // Get the auto turbo settings from the config
let turbo_settings = config.turbo_auto_settings.clone().unwrap_or_default(); let turbo_settings = config.turbo_auto_settings.clone();
// Validate the complete configuration to ensure it's usable // Validate the complete configuration to ensure it's usable
validate_turbo_auto_settings(&turbo_settings)?; validate_turbo_auto_settings(&turbo_settings)?;