mirror of
https://gitlab.com/asus-linux/asusctl.git
synced 2026-02-06 00:15:04 +01:00
aa063c20fd
base_charge_control_end_threshold was marked #[serde(skip)] so it only lived in memory. triggering one-shot charge then restarting asusd would permanently lose the original charge limit. - remove #[serde(skip)] so the field gets persisted - add serde default of 0 for backwards compat (skips restore for upgraded configs missing the field) - add comments explaining Default vs serde default asymmetry
268 lines
10 KiB
Rust
268 lines
10 KiB
Rust
use std::collections::HashMap;
|
|
|
|
use config_traits::{StdConfig, StdConfigLoad2};
|
|
use rog_platform::asus_armoury::FirmwareAttribute;
|
|
use rog_platform::cpu::CPUEPP;
|
|
use rog_platform::platform::PlatformProfile;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
const CONFIG_FILE: &str = "asusd.ron";
|
|
|
|
/// Default value for base_charge_control_end_threshold when not present in config.
|
|
/// Returns 0 so restore_charge_limit() skips restoration for upgraded configs.
|
|
fn default_base_charge_limit() -> u8 {
|
|
0
|
|
}
|
|
|
|
#[derive(Default, Clone, Deserialize, Serialize, PartialEq)]
|
|
pub struct Tuning {
|
|
pub enabled: bool,
|
|
pub group: HashMap<FirmwareAttribute, i32>,
|
|
}
|
|
type Tunings = HashMap<PlatformProfile, Tuning>;
|
|
|
|
#[derive(Deserialize, Serialize, PartialEq)]
|
|
pub struct Config {
|
|
// The current charge limit applied
|
|
pub charge_control_end_threshold: u8,
|
|
/// Save charge limit for restoring after one-shot full charge
|
|
#[serde(default = "default_base_charge_limit")]
|
|
pub base_charge_control_end_threshold: u8,
|
|
pub disable_nvidia_powerd_on_battery: bool,
|
|
/// An optional command/script to run when power is changed to AC
|
|
pub ac_command: String,
|
|
/// An optional command/script to run when power is changed to battery
|
|
pub bat_command: String,
|
|
/// Set true if energy_performance_preference should be set if the
|
|
/// platform profile is changed
|
|
pub platform_profile_linked_epp: bool,
|
|
/// Which platform profile to use on battery power
|
|
pub platform_profile_on_battery: PlatformProfile,
|
|
/// Should the throttle policy be set on bat/ac change?
|
|
pub change_platform_profile_on_battery: bool,
|
|
/// Which platform profile to use on AC power
|
|
pub platform_profile_on_ac: PlatformProfile,
|
|
/// Should the platform profile be set on bat/ac change?
|
|
pub change_platform_profile_on_ac: bool,
|
|
/// The energy_performance_preference for this platform profile
|
|
pub profile_quiet_epp: CPUEPP,
|
|
/// The energy_performance_preference for this platform profile
|
|
pub profile_balanced_epp: CPUEPP,
|
|
/// The energy_performance_preference for this platform profile
|
|
pub profile_custom_epp: CPUEPP,
|
|
/// The energy_performance_preference for this platform profile
|
|
pub profile_performance_epp: CPUEPP,
|
|
pub ac_profile_tunings: Tunings,
|
|
pub dc_profile_tunings: Tunings,
|
|
pub armoury_settings: HashMap<FirmwareAttribute, i32>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub screenpad_gamma: Option<f32>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub screenpad_sync_primary: Option<bool>,
|
|
/// Temporary state for AC/Batt
|
|
#[serde(skip)]
|
|
pub last_power_plugged: u8,
|
|
}
|
|
|
|
impl Config {
|
|
pub fn select_tunings(&mut self, power_plugged: bool, profile: PlatformProfile) -> &mut Tuning {
|
|
let config = if power_plugged {
|
|
&mut self.ac_profile_tunings
|
|
} else {
|
|
&mut self.dc_profile_tunings
|
|
};
|
|
config.entry(profile).or_insert_with(Tuning::default)
|
|
}
|
|
|
|
pub fn select_tunings_ref(
|
|
&self,
|
|
power_plugged: bool,
|
|
profile: PlatformProfile,
|
|
) -> Option<&Tuning> {
|
|
let config = if power_plugged {
|
|
&self.ac_profile_tunings
|
|
} else {
|
|
&self.dc_profile_tunings
|
|
};
|
|
config.get(&profile)
|
|
}
|
|
}
|
|
|
|
impl Default for Config {
|
|
fn default() -> Self {
|
|
Self {
|
|
charge_control_end_threshold: 100,
|
|
// NOTE: This is intentionally 100 (not 0 like the serde default).
|
|
// New installs get 100 (no limit). Upgraded configs missing this
|
|
// field get 0 via serde, which skips restore_charge_limit().
|
|
base_charge_control_end_threshold: 100,
|
|
disable_nvidia_powerd_on_battery: true,
|
|
ac_command: Default::default(),
|
|
bat_command: Default::default(),
|
|
platform_profile_linked_epp: true,
|
|
platform_profile_on_battery: PlatformProfile::Quiet,
|
|
change_platform_profile_on_battery: true,
|
|
platform_profile_on_ac: PlatformProfile::Performance,
|
|
change_platform_profile_on_ac: true,
|
|
profile_quiet_epp: CPUEPP::Power,
|
|
profile_balanced_epp: CPUEPP::BalancePower,
|
|
profile_performance_epp: CPUEPP::Performance,
|
|
profile_custom_epp: CPUEPP::Performance,
|
|
ac_profile_tunings: HashMap::default(),
|
|
dc_profile_tunings: HashMap::default(),
|
|
armoury_settings: HashMap::default(),
|
|
last_power_plugged: Default::default(),
|
|
screenpad_gamma: Default::default(),
|
|
screenpad_sync_primary: Default::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl StdConfig for Config {
|
|
fn new() -> Self {
|
|
Config {
|
|
charge_control_end_threshold: 100,
|
|
disable_nvidia_powerd_on_battery: true,
|
|
platform_profile_on_battery: PlatformProfile::Quiet,
|
|
platform_profile_on_ac: PlatformProfile::Performance,
|
|
ac_command: String::new(),
|
|
bat_command: String::new(),
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
fn file_name(&self) -> String {
|
|
CONFIG_FILE.to_owned()
|
|
}
|
|
|
|
fn config_dir() -> std::path::PathBuf {
|
|
std::path::PathBuf::from(crate::CONFIG_PATH_BASE)
|
|
}
|
|
}
|
|
|
|
impl StdConfigLoad2<Config611, Config601> for Config {}
|
|
|
|
#[derive(Deserialize, Serialize)]
|
|
pub struct Config611 {
|
|
pub charge_control_end_threshold: u8,
|
|
#[serde(skip)]
|
|
pub base_charge_control_end_threshold: u8,
|
|
pub disable_nvidia_powerd_on_battery: bool,
|
|
pub ac_command: String,
|
|
pub bat_command: String,
|
|
pub platform_profile_linked_epp: bool,
|
|
pub platform_profile_on_battery: PlatformProfile,
|
|
pub change_platform_profile_on_battery: bool,
|
|
pub platform_profile_on_ac: PlatformProfile,
|
|
pub change_platform_profile_on_ac: bool,
|
|
pub profile_quiet_epp: CPUEPP,
|
|
pub profile_balanced_epp: CPUEPP,
|
|
pub profile_custom_epp: CPUEPP,
|
|
pub profile_performance_epp: CPUEPP,
|
|
pub ac_profile_tunings: Tunings,
|
|
pub dc_profile_tunings: Tunings,
|
|
pub armoury_settings: HashMap<FirmwareAttribute, i32>,
|
|
#[serde(skip)]
|
|
pub last_power_plugged: u8,
|
|
}
|
|
|
|
impl From<Config611> for Config {
|
|
fn from(c: Config611) -> Self {
|
|
let mut config = Self {
|
|
// Restore the base charge limit
|
|
charge_control_end_threshold: c.charge_control_end_threshold,
|
|
base_charge_control_end_threshold: c.charge_control_end_threshold,
|
|
disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
|
|
ac_command: c.ac_command,
|
|
bat_command: c.bat_command,
|
|
platform_profile_linked_epp: c.platform_profile_linked_epp,
|
|
platform_profile_on_battery: c.platform_profile_on_battery,
|
|
change_platform_profile_on_battery: c.change_platform_profile_on_battery,
|
|
platform_profile_on_ac: c.platform_profile_on_ac,
|
|
change_platform_profile_on_ac: c.change_platform_profile_on_ac,
|
|
profile_quiet_epp: c.profile_quiet_epp,
|
|
profile_balanced_epp: c.profile_balanced_epp,
|
|
profile_performance_epp: c.profile_performance_epp,
|
|
profile_custom_epp: c.profile_performance_epp,
|
|
last_power_plugged: c.last_power_plugged,
|
|
ac_profile_tunings: HashMap::default(),
|
|
dc_profile_tunings: HashMap::default(),
|
|
armoury_settings: HashMap::default(),
|
|
screenpad_gamma: None,
|
|
screenpad_sync_primary: Default::default(),
|
|
};
|
|
|
|
config.ac_profile_tunings = c.ac_profile_tunings;
|
|
config.dc_profile_tunings = c.dc_profile_tunings;
|
|
config.armoury_settings = c.armoury_settings;
|
|
config
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize, Serialize)]
|
|
pub struct Config601 {
|
|
pub charge_control_end_threshold: u8,
|
|
#[serde(skip)]
|
|
pub base_charge_control_end_threshold: u8,
|
|
pub panel_od: bool,
|
|
pub boot_sound: bool,
|
|
pub mini_led_mode: bool,
|
|
pub disable_nvidia_powerd_on_battery: bool,
|
|
pub ac_command: String,
|
|
pub bat_command: String,
|
|
pub platform_profile_linked_epp: bool,
|
|
pub platform_profile_on_battery: PlatformProfile,
|
|
pub change_platform_profile_on_battery: bool,
|
|
pub platform_profile_on_ac: PlatformProfile,
|
|
pub change_platform_profile_on_ac: bool,
|
|
pub profile_quiet_epp: CPUEPP,
|
|
pub profile_balanced_epp: CPUEPP,
|
|
pub profile_performance_epp: CPUEPP,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub ppt_pl1_spl: Option<u8>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub ppt_pl2_sppt: Option<u8>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub ppt_pl3_fppt: Option<u8>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub ppt_fppt: Option<u8>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub ppt_apu_sppt: Option<u8>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub ppt_platform_sppt: Option<u8>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub nv_dynamic_boost: Option<u8>,
|
|
#[serde(skip_serializing_if = "Option::is_none", default)]
|
|
pub nv_temp_target: Option<u8>,
|
|
#[serde(skip)]
|
|
pub last_power_plugged: u8,
|
|
}
|
|
|
|
impl From<Config601> for Config {
|
|
fn from(c: Config601) -> Self {
|
|
Self {
|
|
// Restore the base charge limit
|
|
charge_control_end_threshold: c.charge_control_end_threshold,
|
|
base_charge_control_end_threshold: c.charge_control_end_threshold,
|
|
disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
|
|
ac_command: c.ac_command,
|
|
bat_command: c.bat_command,
|
|
platform_profile_linked_epp: c.platform_profile_linked_epp,
|
|
platform_profile_on_battery: c.platform_profile_on_battery,
|
|
change_platform_profile_on_battery: c.change_platform_profile_on_battery,
|
|
platform_profile_on_ac: c.platform_profile_on_ac,
|
|
change_platform_profile_on_ac: c.change_platform_profile_on_ac,
|
|
profile_quiet_epp: c.profile_quiet_epp,
|
|
profile_balanced_epp: c.profile_balanced_epp,
|
|
profile_performance_epp: c.profile_performance_epp,
|
|
profile_custom_epp: c.profile_performance_epp,
|
|
last_power_plugged: c.last_power_plugged,
|
|
ac_profile_tunings: HashMap::default(),
|
|
dc_profile_tunings: HashMap::default(),
|
|
armoury_settings: HashMap::default(),
|
|
screenpad_gamma: None,
|
|
screenpad_sync_primary: Default::default(),
|
|
}
|
|
}
|
|
}
|