Prep 6.1.0-rc6

throttle_thermal_policy is not ideal anymore and may be
removed from kernel in the future.

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [v6.1.0-rc6]
+
+### Changed
+- Two small fixes, one for `low-power` profile name, and one for base gpu tdp
+- Move to using platform_profile api only (no throttle_thermal_policy)
+
+## [v6.1.0-rc5]
+
+### Changed
+- Per-AC/DC, per-profile tunings enabled (Battery vs AC power +  platform profile)
+- Add ability to restore PPT defaults
+- Add PPT help dialogue to UI
+- Bug fix: correctly set charge limit from UI
+
 ## [v6.1.0-rc4]
 
 ### Changed

Cargo.lock

@@ -176,7 +176,7 @@ dependencies = [
 
 [[package]]
 name = "asusctl"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "dmi_id",
  "env_logger",
@@ -195,7 +195,7 @@ dependencies = [
 
 [[package]]
 name = "asusd"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "cargo-husky",
  "concat-idents",
@@ -221,7 +221,7 @@ dependencies = [
 
 [[package]]
 name = "asusd-user"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "config-traits",
  "dirs",
@@ -901,7 +901,7 @@ dependencies = [
 
 [[package]]
 name = "config-traits"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "log",
  "ron",
@@ -1293,7 +1293,7 @@ dependencies = [
 
 [[package]]
 name = "dmi_id"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "log",
  "udev 0.8.0",
@@ -4092,7 +4092,7 @@ dependencies = [
 
 [[package]]
 name = "rog-control-center"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "asusd",
  "concat-idents",
@@ -4122,7 +4122,7 @@ dependencies = [
 
 [[package]]
 name = "rog_anime"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "dmi_id",
  "gif 0.12.0",
@@ -4136,7 +4136,7 @@ dependencies = [
 
 [[package]]
 name = "rog_aura"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "dmi_id",
  "log",
@@ -4147,7 +4147,7 @@ dependencies = [
 
 [[package]]
 name = "rog_dbus"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "asusd",
  "rog_anime",
@@ -4161,7 +4161,7 @@ dependencies = [
 
 [[package]]
 name = "rog_platform"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "concat-idents",
  "inotify",
@@ -4174,7 +4174,7 @@ dependencies = [
 
 [[package]]
 name = "rog_profiles"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "log",
  "rog_platform",
@@ -4185,7 +4185,7 @@ dependencies = [
 
 [[package]]
 name = "rog_scsi"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "ron",
  "serde",
@@ -4195,7 +4195,7 @@ dependencies = [
 
 [[package]]
 name = "rog_simulators"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "log",
  "rog_anime",
@@ -4205,7 +4205,7 @@ dependencies = [
 
 [[package]]
 name = "rog_slash"
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 dependencies = [
  "dmi_id",
  "serde",

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "6.1.0-rc4"
+version = "6.1.0-rc6"
 rust-version = "1.82"
 license = "MPL-2.0"
 readme = "README.md"

asusctl/src/cli_opts.rs

@@ -1,5 +1,5 @@
 use gumdrop::Options;
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 
 use crate::anime_cli::AnimeCommand;
 use crate::aura_cli::{LedBrightness, LedPowerCommand1, LedPowerCommand2, SetAuraBuiltin};
@@ -71,7 +71,7 @@ pub struct ProfileCommand {
     pub profile_get: bool,
 
     #[options(meta = "", help = "set the active profile")]
-    pub profile_set: Option<ThrottlePolicy>
+    pub profile_set: Option<PlatformProfile>
 }
 
 #[derive(Options)]
@@ -96,6 +96,9 @@ pub struct GraphicsCommand {
 pub struct ArmouryCommand {
     #[options(help = "print help message")]
     pub help: bool,
-    #[options(free)]
+    #[options(
+        free,
+        help = "append each value name followed by the value to set. `-1` sets to default"
+    )]
     pub free: Vec<String>
 }

asusctl/src/fan_curve_cli.rs

@@ -1,5 +1,5 @@
 use gumdrop::Options;
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::FanCurvePU;
 
@@ -18,7 +18,7 @@ pub struct FanCurveCommand {
         meta = "",
         help = "profile to modify fan-curve for. Shows data if no options provided"
     )]
-    pub mod_profile: Option<ThrottlePolicy>,
+    pub mod_profile: Option<PlatformProfile>,
 
     #[options(
         meta = "",

asusctl/src/main.rs

@@ -9,7 +9,7 @@ use aura_cli::{LedPowerCommand1, LedPowerCommand2};
 use dmi_id::DMIID;
 use fan_curve_cli::FanCurveCommand;
 use gumdrop::{Opt, Options};
-use log::error;
+use log::{error, info};
 use rog_anime::usb::get_anime_type;
 use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2};
 use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower};
@@ -22,7 +22,7 @@ use rog_dbus::zbus_aura::AuraProxyBlocking;
 use rog_dbus::zbus_fan_curves::FanCurvesProxyBlocking;
 use rog_dbus::zbus_platform::PlatformProxyBlocking;
 use rog_dbus::zbus_slash::SlashProxyBlocking;
-use rog_platform::platform::{Properties, ThrottlePolicy};
+use rog_platform::platform::{PlatformProfile, Properties};
 use rog_profiles::error::ProfileError;
 use rog_scsi::AuraMode;
 use rog_slash::SlashMode;
@@ -918,16 +918,16 @@ fn handle_throttle_profile(
     }
 
     let proxy = PlatformProxyBlocking::new(conn)?;
-    let current = proxy.throttle_thermal_policy()?;
+    let current = proxy.platform_profile()?;
 
     if cmd.next {
-        proxy.set_throttle_thermal_policy(current.next())?;
+        proxy.set_platform_profile(current.next())?;
     } else if let Some(profile) = cmd.profile_set {
-        proxy.set_throttle_thermal_policy(profile)?;
+        proxy.set_platform_profile(profile)?;
     }
 
     if cmd.list {
-        let res = ThrottlePolicy::list();
+        let res = PlatformProfile::list();
         for p in &res {
             println!("{:?}", p);
         }
@@ -974,7 +974,7 @@ fn handle_fan_curve(
 
     let plat_proxy = PlatformProxyBlocking::new(conn)?;
     if cmd.get_enabled {
-        let profile = plat_proxy.throttle_thermal_policy()?;
+        let profile = plat_proxy.platform_profile()?;
         let curves = fan_proxy.fan_curve_data(profile)?;
         for curve in curves.iter() {
             println!("{}", String::from(curve));
@@ -982,7 +982,7 @@ fn handle_fan_curve(
     }
 
     if cmd.default {
-        let active = plat_proxy.throttle_thermal_policy()?;
+        let active = plat_proxy.platform_profile()?;
         fan_proxy.set_curves_to_defaults(active)?;
     }
 
@@ -1122,7 +1122,12 @@ fn handle_armoury_command(cmd: &ArmouryCommand) -> Result<(), Box<dyn std::error
                 for attr in attr.iter() {
                     let name = attr.name()?;
                     if <&str>::from(name) == cmd[0] {
-                        attr.set_current_value(cmd[1].parse()?)?;
+                        let mut value: i32 = cmd[1].parse()?;
+                        if value == -1 {
+                            info!("Setting to default");
+                            value = attr.default_value()?;
+                        }
+                        attr.set_current_value(value)?;
                         print_firmware_attr(attr)?;
                     }
                 }

asusd/src/asus_armoury.rs

@@ -1,12 +1,11 @@
-use std::collections::HashMap;
-use std::str::FromStr;
 use std::sync::Arc;
 
 use ::zbus::export::futures_util::lock::Mutex;
 use config_traits::StdConfig;
 use log::{debug, error, info};
 use rog_platform::asus_armoury::{AttrValue, Attribute, FirmwareAttribute, FirmwareAttributes};
-use rog_platform::platform::{RogPlatform, ThrottlePolicy};
+use rog_platform::platform::{PlatformProfile, RogPlatform};
+use rog_platform::power::AsusPower;
 use serde::{Deserialize, Serialize};
 use zbus::object_server::SignalEmitter;
 use zbus::zvariant::{ObjectPath, OwnedObjectPath, OwnedValue, Type, Value};
@@ -33,15 +32,22 @@ pub struct AsusArmouryAttribute {
     attr: Attribute,
     config: Arc<Mutex<Config>>,
     /// platform control required here for access to PPD or Throttle profile
-    platform: RogPlatform
+    platform: RogPlatform,
+    power: AsusPower
 }
 
 impl AsusArmouryAttribute {
-    pub fn new(attr: Attribute, platform: RogPlatform, config: Arc<Mutex<Config>>) -> Self {
+    pub fn new(
+        attr: Attribute,
+        platform: RogPlatform,
+        power: AsusPower,
+        config: Arc<Mutex<Config>>
+    ) -> Self {
         Self {
             attr,
             config,
-            platform
+            platform,
+            power
         }
     }
 
@@ -93,12 +99,24 @@ impl AsusArmouryAttribute {
 impl crate::Reloadable for AsusArmouryAttribute {
     async fn reload(&mut self) -> Result<(), RogError> {
         info!("Reloading {}", self.attr.name());
-        let profile: ThrottlePolicy =
-            ThrottlePolicy::from_str(self.platform.get_platform_profile()?.as_str())?;
-        if let Some(tunings) = self.config.lock().await.profile_tunings.get(&profile) {
+        let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
+        let power_plugged = self
+            .power
+            .get_online()
+            .map_err(|e| {
+                error!("Could not get power status: {e:?}");
+                e
+            })
+            .unwrap_or_default();
+        let config = if power_plugged == 1 {
+            &self.config.lock().await.ac_profile_tunings
+        } else {
+            &self.config.lock().await.dc_profile_tunings
+        };
+        if let Some(tunings) = config.get(&profile) {
             if let Some(tune) = tunings.get(&self.name()) {
                 self.attr
-                    .set_current_value(AttrValue::Integer(*tune))
+                    .set_current_value(&AttrValue::Integer(*tune))
                     .map_err(|e| {
                         error!("Could not set value: {e:?}");
                         e
@@ -159,6 +177,31 @@ impl AsusArmouryAttribute {
         }
     }
 
+    async fn restore_default(&self) -> fdo::Result<()> {
+        self.attr.restore_default()?;
+        if self.name().is_ppt() {
+            let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
+            let power_plugged = self
+                .power
+                .get_online()
+                .map_err(|e| {
+                    error!("Could not get power status: {e:?}");
+                    e
+                })
+                .unwrap_or_default();
+
+            let mut config = self.config.lock().await;
+            let tunings = config.select_tunings(power_plugged == 1, profile);
+            if let Some(tune) = tunings.get_mut(&self.name()) {
+                if let AttrValue::Integer(i) = self.attr.default_value() {
+                    *tune = *i;
+                }
+            }
+            config.write();
+        }
+        Ok(())
+    }
+
     #[zbus(property)]
     async fn min_value(&self) -> i32 {
         match self.attr.min_value() {
@@ -204,39 +247,30 @@ impl AsusArmouryAttribute {
     #[zbus(property)]
     async fn set_current_value(&mut self, value: i32) -> fdo::Result<()> {
         self.attr
-            .set_current_value(AttrValue::Integer(value))
+            .set_current_value(&AttrValue::Integer(value))
             .map_err(|e| {
                 error!("Could not set value: {e:?}");
                 e
             })?;
 
         if self.name().is_ppt() {
-            let profile: ThrottlePolicy =
-                ThrottlePolicy::from_str(self.platform.get_platform_profile()?.as_str())?;
+            let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
 
-            // var here to prevent async deadlock on else clause
-            let has_profile = self
-                .config
-                .lock()
-                .await
-                .profile_tunings
-                .contains_key(&profile);
-            if has_profile {
-                if let Some(tunings) = self.config.lock().await.profile_tunings.get_mut(&profile) {
-                    if let Some(tune) = tunings.get_mut(&self.name()) {
-                        *tune = value;
-                    } else {
-                        tunings.insert(self.name(), value);
-                        debug!("Set tuning config for {} = {:?}", self.attr.name(), value);
-                    }
-                }
+            let power_plugged = self
+                .power
+                .get_online()
+                .map_err(|e| {
+                    error!("Could not get power status: {e:?}");
+                    e
+                })
+                .unwrap_or_default();
+            let mut config = self.config.lock().await;
+            let tunings = config.select_tunings(power_plugged == 1, profile);
+
+            if let Some(tune) = tunings.get_mut(&self.name()) {
+                *tune = value;
             } else {
-                debug!("Adding tuning config for {}", profile);
-                self.config
-                    .lock()
-                    .await
-                    .profile_tunings
-                    .insert(profile, HashMap::from([(self.name(), value)]));
+                tunings.insert(self.name(), value);
                 debug!("Set tuning config for {} = {:?}", self.attr.name(), value);
             }
         } else {
@@ -274,10 +308,16 @@ impl AsusArmouryAttribute {
 pub async fn start_attributes_zbus(
     conn: &Connection,
     platform: RogPlatform,
+    power: AsusPower,
     config: Arc<Mutex<Config>>
 ) -> Result<(), RogError> {
     for attr in FirmwareAttributes::new().attributes() {
-        let mut attr = AsusArmouryAttribute::new(attr.clone(), platform.clone(), config.clone());
+        let mut attr = AsusArmouryAttribute::new(
+            attr.clone(),
+            platform.clone(),
+            power.clone(),
+            config.clone()
+        );
         attr.reload().await?;
 
         let path = dbus_path_for_attr(attr.attr.name());
@@ -288,3 +328,41 @@ pub async fn start_attributes_zbus(
     }
     Ok(())
 }
+
+pub async fn set_config_or_default(
+    attrs: &FirmwareAttributes,
+    config: &mut Config,
+    power_plugged: bool,
+    profile: PlatformProfile
+) {
+    for attr in attrs.attributes().iter() {
+        let name: FirmwareAttribute = attr.name().into();
+        if name.is_ppt() {
+            let tunings = config.select_tunings(power_plugged, profile);
+
+            if let Some(tune) = tunings.get(&name) {
+                attr.set_current_value(&AttrValue::Integer(*tune))
+                    .map_err(|e| {
+                        error!("Failed to set {}: {e}", <&str>::from(name));
+                    })
+                    .ok();
+            } else {
+                let default = attr.default_value();
+                attr.set_current_value(default)
+                    .map_err(|e| {
+                        error!("Failed to set {}: {e}", <&str>::from(name));
+                    })
+                    .ok();
+                if let AttrValue::Integer(i) = default {
+                    tunings.insert(name, *i);
+                    info!(
+                        "Set default tuning config for {} = {:?}",
+                        <&str>::from(name),
+                        i
+                    );
+                    config.write();
+                }
+            }
+        }
+    }
+}

asusd/src/config.rs

@@ -3,10 +3,11 @@ use std::collections::HashMap;
 use config_traits::{StdConfig, StdConfigLoad1};
 use rog_platform::asus_armoury::FirmwareAttribute;
 use rog_platform::cpu::CPUEPP;
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 use serde::{Deserialize, Serialize};
 
 const CONFIG_FILE: &str = "asusd.ron";
+type Tunings = HashMap<PlatformProfile, HashMap<FirmwareAttribute, i32>>;
 
 #[derive(Deserialize, Serialize, PartialEq)]
 pub struct Config {
@@ -21,29 +22,45 @@ pub struct Config {
     /// 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
-    /// throttle/platform profile is changed
-    pub throttle_policy_linked_epp: bool,
-    /// Which throttle/profile to use on battery power
-    pub throttle_policy_on_battery: ThrottlePolicy,
+    /// 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_throttle_policy_on_battery: bool,
-    /// Which throttle/profile to use on AC power
-    pub throttle_policy_on_ac: ThrottlePolicy,
-    /// Should the throttle policy be set on bat/ac change?
-    pub change_throttle_policy_on_ac: bool,
-    /// The energy_performance_preference for this throttle/platform profile
-    pub throttle_quiet_epp: CPUEPP,
-    /// The energy_performance_preference for this throttle/platform profile
-    pub throttle_balanced_epp: CPUEPP,
-    /// The energy_performance_preference for this throttle/platform profile
-    pub throttle_performance_epp: CPUEPP,
-    pub profile_tunings: HashMap<ThrottlePolicy, HashMap<FirmwareAttribute, i32>>,
+    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_performance_epp: CPUEPP,
+    pub ac_profile_tunings: Tunings,
+    pub dc_profile_tunings: Tunings,
     pub armoury_settings: HashMap<FirmwareAttribute, i32>,
     /// 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 HashMap<FirmwareAttribute, i32> {
+        let config = if power_plugged {
+            &mut self.ac_profile_tunings
+        } else {
+            &mut self.dc_profile_tunings
+        };
+        config.entry(profile).or_insert_with(HashMap::new)
+    }
+}
+
 impl Default for Config {
     fn default() -> Self {
         Self {
@@ -52,15 +69,16 @@ impl Default for Config {
             disable_nvidia_powerd_on_battery: true,
             ac_command: Default::default(),
             bat_command: Default::default(),
-            throttle_policy_linked_epp: true,
-            throttle_policy_on_battery: ThrottlePolicy::Quiet,
-            change_throttle_policy_on_battery: true,
-            throttle_policy_on_ac: ThrottlePolicy::Performance,
-            change_throttle_policy_on_ac: true,
-            throttle_quiet_epp: CPUEPP::Power,
-            throttle_balanced_epp: CPUEPP::BalancePower,
-            throttle_performance_epp: CPUEPP::Performance,
-            profile_tunings: HashMap::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,
+            ac_profile_tunings: HashMap::default(),
+            dc_profile_tunings: HashMap::default(),
             armoury_settings: HashMap::default(),
             last_power_plugged: Default::default()
         }
@@ -72,8 +90,8 @@ impl StdConfig for Config {
         Config {
             charge_control_end_threshold: 100,
             disable_nvidia_powerd_on_battery: true,
-            throttle_policy_on_battery: ThrottlePolicy::Quiet,
-            throttle_policy_on_ac: ThrottlePolicy::Performance,
+            platform_profile_on_battery: PlatformProfile::Quiet,
+            platform_profile_on_ac: PlatformProfile::Performance,
             ac_command: String::new(),
             bat_command: String::new(),
             ..Default::default()
@@ -102,14 +120,14 @@ pub struct Config601 {
     pub disable_nvidia_powerd_on_battery: bool,
     pub ac_command: String,
     pub bat_command: String,
-    pub throttle_policy_linked_epp: bool,
-    pub throttle_policy_on_battery: ThrottlePolicy,
-    pub change_throttle_policy_on_battery: bool,
-    pub throttle_policy_on_ac: ThrottlePolicy,
-    pub change_throttle_policy_on_ac: bool,
-    pub throttle_quiet_epp: CPUEPP,
-    pub throttle_balanced_epp: CPUEPP,
-    pub throttle_performance_epp: CPUEPP,
+    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)]
@@ -139,16 +157,17 @@ impl From<Config601> for Config {
             disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
             ac_command: c.ac_command,
             bat_command: c.bat_command,
-            throttle_policy_linked_epp: c.throttle_policy_linked_epp,
-            throttle_policy_on_battery: c.throttle_policy_on_battery,
-            change_throttle_policy_on_battery: c.change_throttle_policy_on_battery,
-            throttle_policy_on_ac: c.throttle_policy_on_ac,
-            change_throttle_policy_on_ac: c.change_throttle_policy_on_ac,
-            throttle_quiet_epp: c.throttle_quiet_epp,
-            throttle_balanced_epp: c.throttle_balanced_epp,
-            throttle_performance_epp: c.throttle_performance_epp,
+            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,
             last_power_plugged: c.last_power_plugged,
-            profile_tunings: HashMap::default(),
+            ac_profile_tunings: HashMap::default(),
+            dc_profile_tunings: HashMap::default(),
             armoury_settings: HashMap::default()
         }
     }

asusd/src/ctrl_fancurves.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use config_traits::{StdConfig, StdConfigLoad};
 use futures_lite::StreamExt;
 use log::{debug, error, info, warn};
-use rog_platform::platform::{RogPlatform, ThrottlePolicy};
+use rog_platform::platform::{PlatformProfile, RogPlatform};
 use rog_profiles::error::ProfileError;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::{find_fan_curve_node, FanCurvePU, FanCurveProfiles};
@@ -23,7 +23,7 @@ pub const FAN_CURVE_ZBUS_PATH: &str = "/xyz/ljones";
 pub struct FanCurveConfig {
     pub profiles: FanCurveProfiles,
     #[serde(skip)]
-    pub current: u8
+    pub current: PlatformProfile
 }
 
 impl StdConfig for FanCurveConfig {
@@ -54,7 +54,7 @@ pub struct CtrlFanCurveZbus {
 impl CtrlFanCurveZbus {
     pub fn new() -> Result<Self, RogError> {
         let platform = RogPlatform::new()?;
-        if platform.has_throttle_thermal_policy() {
+        if platform.has_platform_profile() {
             info!("Device has profile control available");
             find_fan_curve_node()?;
             info!("Device has fan curves available");
@@ -65,16 +65,16 @@ impl CtrlFanCurveZbus {
             if config.profiles.balanced.is_empty() || !config.file_path().exists() {
                 info!("Fetching default fan curves");
 
-                let current = platform.get_throttle_thermal_policy()?;
+                let current = platform.get_platform_profile()?;
                 for this in [
-                    ThrottlePolicy::Balanced,
-                    ThrottlePolicy::Performance,
-                    ThrottlePolicy::Quiet
+                    PlatformProfile::Balanced,
+                    PlatformProfile::Performance,
+                    PlatformProfile::Quiet
                 ] {
                     // For each profile we need to switch to it before we
                     // can read the existing values from hardware. The ACPI method used
                     // for this is what limits us.
-                    platform.set_throttle_thermal_policy(this.into())?;
+                    platform.set_platform_profile(this.into())?;
                     let mut dev = find_fan_curve_node()?;
                     fan_curves.set_active_curve_to_defaults(this, &mut dev)?;
 
@@ -83,7 +83,7 @@ impl CtrlFanCurveZbus {
                         info!("{}", String::from(curve));
                     }
                 }
-                platform.set_throttle_thermal_policy(current)?;
+                platform.set_platform_profile(current.as_str())?;
                 config.profiles = fan_curves;
                 config.write();
             } else {
@@ -107,7 +107,7 @@ impl CtrlFanCurveZbus {
     /// fan curve if in the same profile mode
     async fn set_fan_curves_enabled(
         &mut self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         enabled: bool
     ) -> zbus::fdo::Result<()> {
         self.config
@@ -128,7 +128,7 @@ impl CtrlFanCurveZbus {
     /// activate a fan curve if in the same profile mode
     async fn set_profile_fan_curve_enabled(
         &mut self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         fan: FanCurvePU,
         enabled: bool
     ) -> zbus::fdo::Result<()> {
@@ -149,7 +149,7 @@ impl CtrlFanCurveZbus {
     /// Get the fan-curve data for the currently active ThrottlePolicy
     async fn fan_curve_data(
         &mut self,
-        profile: ThrottlePolicy
+        profile: PlatformProfile
     ) -> zbus::fdo::Result<Vec<CurveData>> {
         let curve = self
             .config
@@ -165,7 +165,7 @@ impl CtrlFanCurveZbus {
     /// Will also activate the fan curve if the user is in the same mode.
     async fn set_fan_curve(
         &mut self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         curve: CurveData
     ) -> zbus::fdo::Result<()> {
         self.config
@@ -173,7 +173,7 @@ impl CtrlFanCurveZbus {
             .await
             .profiles
             .save_fan_curve(curve, profile)?;
-        let active: ThrottlePolicy = self.platform.get_throttle_thermal_policy()?.into();
+        let active: PlatformProfile = self.platform.get_platform_profile()?.into();
         if active == profile {
             self.config
                 .lock()
@@ -190,15 +190,15 @@ impl CtrlFanCurveZbus {
     ///
     /// Each platform_profile has a different default and the default can be
     /// read only for the currently active profile.
-    async fn set_curves_to_defaults(&mut self, profile: ThrottlePolicy) -> zbus::fdo::Result<()> {
-        let active = self.platform.get_throttle_thermal_policy()?;
-        self.platform.set_throttle_thermal_policy(profile.into())?;
+    async fn set_curves_to_defaults(&mut self, profile: PlatformProfile) -> zbus::fdo::Result<()> {
+        let active = self.platform.get_platform_profile()?;
+        self.platform.set_platform_profile(profile.into())?;
         self.config
             .lock()
             .await
             .profiles
             .set_active_curve_to_defaults(profile, &mut find_fan_curve_node()?)?;
-        self.platform.set_throttle_thermal_policy(active)?;
+        self.platform.set_platform_profile(active.as_str())?;
         self.config.lock().await.write();
         Ok(())
     }
@@ -208,16 +208,16 @@ impl CtrlFanCurveZbus {
     ///
     /// Each platform_profile has a different default and the defualt can be
     /// read only for the currently active profile.
-    async fn reset_profile_curves(&self, profile: ThrottlePolicy) -> zbus::fdo::Result<()> {
-        let active = self.platform.get_throttle_thermal_policy()?;
+    async fn reset_profile_curves(&self, profile: PlatformProfile) -> zbus::fdo::Result<()> {
+        let active = self.platform.get_platform_profile()?;
 
-        self.platform.set_throttle_thermal_policy(profile.into())?;
+        self.platform.set_platform_profile(profile.into())?;
         self.config
             .lock()
             .await
             .profiles
-            .set_active_curve_to_defaults(active.into(), &mut find_fan_curve_node()?)?;
-        self.platform.set_throttle_thermal_policy(active)?;
+            .set_active_curve_to_defaults((&active).into(), &mut find_fan_curve_node()?)?;
+        self.platform.set_platform_profile(active.as_str())?;
 
         self.config.lock().await.write();
         Ok(())
@@ -236,26 +236,31 @@ impl CtrlTask for CtrlFanCurveZbus {
     }
 
     async fn create_tasks(&self, _signal_ctxt: SignalEmitter<'static>) -> Result<(), RogError> {
-        let watch_throttle_thermal_policy = self.platform.monitor_throttle_thermal_policy()?;
+        let watch_platform_profile = self.platform.monitor_platform_profile()?;
         let platform = self.platform.clone();
         let config = self.config.clone();
         let fan_curves = self.config.clone();
 
         tokio::spawn(async move {
             let mut buffer = [0; 32];
-            if let Ok(mut stream) = watch_throttle_thermal_policy.into_event_stream(&mut buffer) {
+            if let Ok(mut stream) = watch_platform_profile.into_event_stream(&mut buffer) {
                 while (stream.next().await).is_some() {
-                    debug!("watch_throttle_thermal_policy changed");
-                    if let Ok(profile) = platform.get_throttle_thermal_policy().map_err(|e| {
-                        error!("get_throttle_thermal_policy error: {e}");
-                    }) {
+                    debug!("watch_platform_profile changed");
+                    if let Ok(profile) =
+                        platform
+                            .get_platform_profile()
+                            .map(|p| p.into())
+                            .map_err(|e| {
+                                error!("get_platform_profile error: {e}");
+                            })
+                    {
                         if profile != config.lock().await.current {
                             fan_curves
                                 .lock()
                                 .await
                                 .profiles
                                 .write_profile_curve_to_platform(
-                                    profile.into(),
+                                    profile,
                                     &mut find_fan_curve_node().unwrap()
                                 )
                                 .map_err(|e| warn!("write_profile_curve_to_platform, {}", e))
@@ -274,7 +279,7 @@ impl CtrlTask for CtrlFanCurveZbus {
 impl crate::Reloadable for CtrlFanCurveZbus {
     /// Fetch the active profile and use that to set all related components up
     async fn reload(&mut self) -> Result<(), RogError> {
-        let active = self.platform.get_throttle_thermal_policy()?.into();
+        let active = self.platform.get_platform_profile()?.into();
         let mut config = self.config.lock().await;
         if let Ok(mut device) = find_fan_curve_node() {
             config

asusd/src/ctrl_platform.rs

@@ -1,19 +1,19 @@
 use std::path::Path;
 use std::process::Command;
-use std::str::FromStr;
 use std::sync::Arc;
 
 use config_traits::StdConfig;
 use log::{debug, error, info, warn};
-use rog_platform::asus_armoury::{AttrValue, FirmwareAttribute, FirmwareAttributes};
+use rog_platform::asus_armoury::FirmwareAttributes;
 use rog_platform::cpu::{CPUControl, CPUGovernor, CPUEPP};
-use rog_platform::platform::{Properties, RogPlatform, ThrottlePolicy};
+use rog_platform::platform::{PlatformProfile, Properties, RogPlatform};
 use rog_platform::power::AsusPower;
 use zbus::export::futures_util::lock::Mutex;
 use zbus::fdo::Error as FdoErr;
 use zbus::object_server::SignalEmitter;
 use zbus::{interface, Connection};
 
+use crate::asus_armoury::set_config_or_default;
 use crate::config::Config;
 use crate::error::RogError;
 use crate::{task_watch_item, CtrlTask, ReloadAndNotify};
@@ -203,40 +203,38 @@ impl CtrlPlatform {
         }
     }
 
-    async fn get_config_epp_for_throttle(&self, throttle: ThrottlePolicy) -> CPUEPP {
+    async fn get_config_epp_for_throttle(&self, throttle: PlatformProfile) -> CPUEPP {
         match throttle {
-            ThrottlePolicy::Balanced => self.config.lock().await.throttle_balanced_epp,
-            ThrottlePolicy::Performance => self.config.lock().await.throttle_performance_epp,
-            ThrottlePolicy::Quiet => self.config.lock().await.throttle_quiet_epp
+            PlatformProfile::Balanced => self.config.lock().await.profile_balanced_epp,
+            PlatformProfile::Performance => self.config.lock().await.profile_performance_epp,
+            PlatformProfile::Quiet => self.config.lock().await.profile_quiet_epp
         }
     }
 
     async fn update_policy_ac_or_bat(&self, power_plugged: bool, change_epp: bool) {
-        if power_plugged && !self.config.lock().await.change_throttle_policy_on_ac {
+        if power_plugged && !self.config.lock().await.change_platform_profile_on_ac {
             debug!(
-                "Power status changed but set_throttle_policy_on_ac set false. Not setting the \
+                "Power status changed but set_platform_profile_on_ac set false. Not setting the \
                  thing"
             );
             return;
         }
-        if !power_plugged && !self.config.lock().await.change_throttle_policy_on_battery {
+        if !power_plugged && !self.config.lock().await.change_platform_profile_on_battery {
             debug!(
-                "Power status changed but set_throttle_policy_on_battery set false. Not setting \
+                "Power status changed but set_platform_profile_on_battery set false. Not setting \
                  the thing"
             );
             return;
         }
 
         let throttle = if power_plugged {
-            self.config.lock().await.throttle_policy_on_ac
+            self.config.lock().await.platform_profile_on_ac
         } else {
-            self.config.lock().await.throttle_policy_on_battery
+            self.config.lock().await.platform_profile_on_battery
         };
         debug!("Setting {throttle:?} before EPP");
         let epp = self.get_config_epp_for_throttle(throttle).await;
-        self.platform
-            .set_throttle_thermal_policy(throttle.into())
-            .ok();
+        self.platform.set_platform_profile(throttle.into()).ok();
         self.check_and_set_epp(epp, change_epp);
     }
 }
@@ -278,7 +276,7 @@ impl CtrlPlatform {
             Properties::ChargeControlEndThreshold
         );
 
-        platform_name!(throttle_thermal_policy, Properties::ThrottlePolicy);
+        platform_name!(platform_profile, Properties::ThrottlePolicy);
 
         supported
     }
@@ -316,121 +314,119 @@ impl CtrlPlatform {
 
     /// Toggle to next platform_profile. Names provided by `Profiles`.
     /// If fan-curves are supported will also activate a fan curve for profile.
-    async fn next_throttle_thermal_policy(
+    async fn next_platform_profile(
         &mut self,
         #[zbus(signal_context)] ctxt: SignalEmitter<'_>
     ) -> Result<(), FdoErr> {
-        let policy: ThrottlePolicy =
-            platform_get_value!(self, throttle_thermal_policy, "throttle_thermal_policy")
-                .map(|n| n.into())?;
-        let policy = ThrottlePolicy::next(policy);
+        let policy: PlatformProfile =
+            platform_get_value!(self, platform_profile, "platform_profile").map(|n| n.into())?;
+        let policy = PlatformProfile::next(policy);
 
-        if self.platform.has_throttle_thermal_policy() {
-            let change_epp = self.config.lock().await.throttle_policy_linked_epp;
+        if self.platform.has_platform_profile() {
+            let change_epp = self.config.lock().await.platform_profile_linked_epp;
             let epp = self.get_config_epp_for_throttle(policy).await;
             self.check_and_set_epp(epp, change_epp);
             self.platform
-                .set_throttle_thermal_policy(policy.into())
+                .set_platform_profile(policy.into())
                 .map_err(|err| {
-                    warn!("throttle_thermal_policy {}", err);
-                    FdoErr::Failed(format!("RogPlatform: throttle_thermal_policy: {err}"))
+                    warn!("platform_profile {}", err);
+                    FdoErr::Failed(format!("RogPlatform: platform_profile: {err}"))
                 })?;
-            Ok(self.throttle_thermal_policy_changed(&ctxt).await?)
+            Ok(self.platform_profile_changed(&ctxt).await?)
         } else {
             Err(FdoErr::NotSupported(
-                "RogPlatform: throttle_thermal_policy not supported".to_owned()
+                "RogPlatform: platform_profile not supported".to_owned()
             ))
         }
     }
 
     #[zbus(property)]
-    fn throttle_thermal_policy(&self) -> Result<ThrottlePolicy, FdoErr> {
-        platform_get_value!(self, throttle_thermal_policy, "throttle_thermal_policy")
-            .map(|n| n.into())
+    fn platform_profile(&self) -> Result<PlatformProfile, FdoErr> {
+        platform_get_value!(self, platform_profile, "platform_profile").map(|n| n.into())
     }
 
     #[zbus(property)]
-    async fn set_throttle_thermal_policy(&mut self, policy: ThrottlePolicy) -> Result<(), FdoErr> {
+    async fn set_platform_profile(&mut self, policy: PlatformProfile) -> Result<(), FdoErr> {
         // TODO: watch for external changes
-        if self.platform.has_throttle_thermal_policy() {
-            let change_epp = self.config.lock().await.throttle_policy_linked_epp;
+        if self.platform.has_platform_profile() {
+            let change_epp = self.config.lock().await.platform_profile_linked_epp;
             let epp = self.get_config_epp_for_throttle(policy).await;
             self.check_and_set_epp(epp, change_epp);
             self.config.lock().await.write();
             self.platform
-                .set_throttle_thermal_policy(policy.into())
+                .set_platform_profile(policy.into())
                 .map_err(|err| {
-                    warn!("throttle_thermal_policy {}", err);
-                    FdoErr::Failed(format!("RogPlatform: throttle_thermal_policy: {err}"))
+                    warn!("platform_profile {}", err);
+                    FdoErr::Failed(format!("RogPlatform: platform_profile: {err}"))
                 })
         } else {
             Err(FdoErr::NotSupported(
-                "RogPlatform: throttle_thermal_policy not supported".to_owned()
+                "RogPlatform: platform_profile not supported".to_owned()
             ))
         }
     }
 
     #[zbus(property)]
-    async fn throttle_policy_linked_epp(&self) -> Result<bool, FdoErr> {
-        Ok(self.config.lock().await.throttle_policy_linked_epp)
+    async fn platform_profile_linked_epp(&self) -> Result<bool, FdoErr> {
+        Ok(self.config.lock().await.platform_profile_linked_epp)
     }
 
     #[zbus(property)]
-    async fn set_throttle_policy_linked_epp(&self, linked: bool) -> Result<(), zbus::Error> {
-        self.config.lock().await.throttle_policy_linked_epp = linked;
+    async fn set_platform_profile_linked_epp(&self, linked: bool) -> Result<(), zbus::Error> {
+        self.config.lock().await.platform_profile_linked_epp = linked;
         self.config.lock().await.write();
         Ok(())
     }
 
     #[zbus(property)]
-    async fn throttle_policy_on_battery(&self) -> Result<ThrottlePolicy, FdoErr> {
-        Ok(self.config.lock().await.throttle_policy_on_battery)
+    async fn platform_profile_on_battery(&self) -> Result<PlatformProfile, FdoErr> {
+        Ok(self.config.lock().await.platform_profile_on_battery)
     }
 
     #[zbus(property)]
-    async fn set_throttle_policy_on_battery(
+    async fn set_platform_profile_on_battery(
         &mut self,
-        policy: ThrottlePolicy
+        policy: PlatformProfile
     ) -> Result<(), FdoErr> {
-        self.config.lock().await.throttle_policy_on_battery = policy;
-        self.set_throttle_thermal_policy(policy).await?;
+        self.config.lock().await.platform_profile_on_battery = policy;
+        self.set_platform_profile(policy).await?;
         self.config.lock().await.write();
         Ok(())
     }
 
     #[zbus(property)]
-    async fn change_throttle_policy_on_battery(&self) -> Result<bool, FdoErr> {
-        Ok(self.config.lock().await.change_throttle_policy_on_battery)
+    async fn change_platform_profile_on_battery(&self) -> Result<bool, FdoErr> {
+        Ok(self.config.lock().await.change_platform_profile_on_battery)
     }
 
     #[zbus(property)]
-    async fn set_change_throttle_policy_on_battery(&mut self, change: bool) -> Result<(), FdoErr> {
-        self.config.lock().await.change_throttle_policy_on_battery = change;
+    async fn set_change_platform_profile_on_battery(&mut self, change: bool) -> Result<(), FdoErr> {
+        self.config.lock().await.change_platform_profile_on_battery = change;
         self.config.lock().await.write();
         Ok(())
     }
 
     #[zbus(property)]
-    async fn throttle_policy_on_ac(&self) -> Result<ThrottlePolicy, FdoErr> {
-        Ok(self.config.lock().await.throttle_policy_on_ac)
+    async fn platform_profile_on_ac(&self) -> Result<PlatformProfile, FdoErr> {
+        Ok(self.config.lock().await.platform_profile_on_ac)
     }
 
     #[zbus(property)]
-    async fn set_throttle_policy_on_ac(&mut self, policy: ThrottlePolicy) -> Result<(), FdoErr> {
-        self.config.lock().await.throttle_policy_on_ac = policy;
-        self.set_throttle_thermal_policy(policy).await?;
+    async fn set_platform_profile_on_ac(&mut self, policy: PlatformProfile) -> Result<(), FdoErr> {
+        self.config.lock().await.platform_profile_on_ac = policy;
+        self.set_platform_profile(policy).await?;
         self.config.lock().await.write();
         Ok(())
     }
 
     #[zbus(property)]
-    async fn change_throttle_policy_on_ac(&self) -> Result<bool, FdoErr> {
-        Ok(self.config.lock().await.change_throttle_policy_on_ac)
+    async fn change_platform_profile_on_ac(&self) -> Result<bool, FdoErr> {
+        Ok(self.config.lock().await.change_platform_profile_on_ac)
     }
 
     #[zbus(property)]
-    async fn set_change_throttle_policy_on_ac(&mut self, change: bool) -> Result<(), FdoErr> {
-        self.config.lock().await.change_throttle_policy_on_ac = change;
+    async fn set_change_platform_profile_on_ac(&mut self, change: bool) -> Result<(), FdoErr> {
+        self.config.lock().await.change_platform_profile_on_ac = change;
         self.config.lock().await.write();
         Ok(())
     }
@@ -438,14 +434,14 @@ impl CtrlPlatform {
     /// The energy_performance_preference for the quiet throttle/platform
     /// profile
     #[zbus(property)]
-    async fn throttle_quiet_epp(&self) -> Result<CPUEPP, FdoErr> {
-        Ok(self.config.lock().await.throttle_quiet_epp)
+    async fn profile_quiet_epp(&self) -> Result<CPUEPP, FdoErr> {
+        Ok(self.config.lock().await.profile_quiet_epp)
     }
 
     #[zbus(property)]
-    async fn set_throttle_quiet_epp(&mut self, epp: CPUEPP) -> Result<(), FdoErr> {
-        let change_pp = self.config.lock().await.throttle_policy_linked_epp;
-        self.config.lock().await.throttle_quiet_epp = epp;
+    async fn set_profile_quiet_epp(&mut self, epp: CPUEPP) -> Result<(), FdoErr> {
+        let change_pp = self.config.lock().await.platform_profile_linked_epp;
+        self.config.lock().await.profile_quiet_epp = epp;
         self.check_and_set_epp(epp, change_pp);
         self.config.lock().await.write();
         Ok(())
@@ -454,14 +450,14 @@ impl CtrlPlatform {
     /// The energy_performance_preference for the balanced throttle/platform
     /// profile
     #[zbus(property)]
-    async fn throttle_balanced_epp(&self) -> Result<CPUEPP, FdoErr> {
-        Ok(self.config.lock().await.throttle_balanced_epp)
+    async fn profile_balanced_epp(&self) -> Result<CPUEPP, FdoErr> {
+        Ok(self.config.lock().await.profile_balanced_epp)
     }
 
     #[zbus(property)]
-    async fn set_throttle_balanced_epp(&mut self, epp: CPUEPP) -> Result<(), FdoErr> {
-        let change_pp = self.config.lock().await.throttle_policy_linked_epp;
-        self.config.lock().await.throttle_balanced_epp = epp;
+    async fn set_profile_balanced_epp(&mut self, epp: CPUEPP) -> Result<(), FdoErr> {
+        let change_pp = self.config.lock().await.platform_profile_linked_epp;
+        self.config.lock().await.profile_balanced_epp = epp;
         self.check_and_set_epp(epp, change_pp);
         self.config.lock().await.write();
         Ok(())
@@ -470,14 +466,14 @@ impl CtrlPlatform {
     /// The energy_performance_preference for the performance throttle/platform
     /// profile
     #[zbus(property)]
-    async fn throttle_performance_epp(&self) -> Result<CPUEPP, FdoErr> {
-        Ok(self.config.lock().await.throttle_performance_epp)
+    async fn profile_performance_epp(&self) -> Result<CPUEPP, FdoErr> {
+        Ok(self.config.lock().await.profile_performance_epp)
     }
 
     #[zbus(property)]
-    async fn set_throttle_performance_epp(&mut self, epp: CPUEPP) -> Result<(), FdoErr> {
-        let change_pp = self.config.lock().await.throttle_policy_linked_epp;
-        self.config.lock().await.throttle_performance_epp = epp;
+    async fn set_profile_performance_epp(&mut self, epp: CPUEPP) -> Result<(), FdoErr> {
+        let change_pp = self.config.lock().await.platform_profile_linked_epp;
+        self.config.lock().await.profile_performance_epp = epp;
         self.check_and_set_epp(epp, change_pp);
         self.config.lock().await.write();
         Ok(())
@@ -518,21 +514,20 @@ impl ReloadAndNotify for CtrlPlatform {
                     .or(Some(limit));
             }
 
-            if self.platform.has_throttle_thermal_policy()
-                && config.throttle_policy_linked_epp != data.throttle_policy_linked_epp
+            if self.platform.has_platform_profile()
+                && config.platform_profile_linked_epp != data.platform_profile_linked_epp
             {
-                let profile: ThrottlePolicy =
-                    ThrottlePolicy::from_str(self.platform.get_platform_profile()?.as_str())?;
+                let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
 
                 let epp = match profile {
-                    ThrottlePolicy::Balanced => data.throttle_balanced_epp,
-                    ThrottlePolicy::Performance => data.throttle_performance_epp,
-                    ThrottlePolicy::Quiet => data.throttle_quiet_epp
+                    PlatformProfile::Balanced => data.profile_balanced_epp,
+                    PlatformProfile::Performance => data.profile_performance_epp,
+                    PlatformProfile::Quiet => data.profile_quiet_epp
                 };
                 warn!("setting epp to {epp:?}");
                 self.check_and_set_epp(epp, true);
             }
-            // reload_and_notify!(throttle_thermal_policy, "throttle_thermal_policy");
+            // reload_and_notify!(platform_profile, "platform_profile");
 
             *config = data;
             config.base_charge_control_end_threshold =
@@ -556,8 +551,8 @@ impl crate::Reloadable for CtrlPlatform {
 
         if let Ok(power_plugged) = self.power.get_online() {
             self.config.lock().await.last_power_plugged = power_plugged;
-            if self.platform.has_throttle_thermal_policy() {
-                let change_epp = self.config.lock().await.throttle_policy_linked_epp;
+            if self.platform.has_platform_profile() {
+                let change_epp = self.config.lock().await.platform_profile_linked_epp;
                 self.update_policy_ac_or_bat(power_plugged > 0, change_epp)
                     .await;
             }
@@ -604,9 +599,9 @@ impl CtrlTask for CtrlPlatform {
                     }
                     if let Ok(power_plugged) = platform1.power.get_online() {
                         if platform1.config.lock().await.last_power_plugged != power_plugged {
-                            if !sleeping && platform1.platform.has_throttle_thermal_policy() {
+                            if !sleeping && platform1.platform.has_platform_profile() {
                                 let change_epp =
-                                    platform1.config.lock().await.throttle_policy_linked_epp;
+                                    platform1.config.lock().await.platform_profile_linked_epp;
                                 platform1
                                     .update_policy_ac_or_bat(power_plugged > 0, change_epp)
                                     .await;
@@ -650,8 +645,8 @@ impl CtrlTask for CtrlPlatform {
                 let platform3 = platform3.clone();
                 // power change
                 async move {
-                    if platform3.platform.has_throttle_thermal_policy() {
-                        let change_epp = platform3.config.lock().await.throttle_policy_linked_epp;
+                    if platform3.platform.has_platform_profile() {
+                        let change_epp = platform3.config.lock().await.platform_profile_linked_epp;
                         platform3
                             .update_policy_ac_or_bat(power_plugged, change_epp)
                             .await;
@@ -661,6 +656,24 @@ impl CtrlTask for CtrlPlatform {
                     if platform3.power.has_charge_control_end_threshold() && !power_plugged {
                         platform3.restore_charge_limit().await;
                     }
+
+                    if let Ok(profile) = platform3
+                        .platform
+                        .get_platform_profile()
+                        .map(|p| p.into())
+                        .map_err(|e| {
+                            error!("Platform: get_platform_profile error: {e}");
+                        })
+                    {
+                        let attrs = FirmwareAttributes::new();
+                        set_config_or_default(
+                            &attrs,
+                            &mut *platform3.config.lock().await,
+                            power_plugged,
+                            profile
+                        )
+                        .await;
+                    }
                 }
             }
         )
@@ -671,7 +684,7 @@ impl CtrlTask for CtrlPlatform {
         self.watch_charge_control_end_threshold(signal_ctxt.clone())
             .await?;
 
-        let watch_throttle_thermal_policy = self.platform.monitor_throttle_thermal_policy()?;
+        let watch_platform_profile = self.platform.monitor_platform_profile()?;
         let ctrl = self.clone();
 
         // Need a copy here, not ideal. But first use in asus_armoury.rs is
@@ -680,53 +693,37 @@ impl CtrlTask for CtrlPlatform {
         tokio::spawn(async move {
             use futures_lite::StreamExt;
             let mut buffer = [0; 32];
-            if let Ok(mut stream) = watch_throttle_thermal_policy.into_event_stream(&mut buffer) {
+            if let Ok(mut stream) = watch_platform_profile.into_event_stream(&mut buffer) {
                 while (stream.next().await).is_some() {
                     // this blocks
-                    debug!("Platform: watch_throttle_thermal_policy changed");
+                    debug!("Platform: watch_platform_profile changed");
                     if let Ok(profile) = ctrl
                         .platform
-                        .get_throttle_thermal_policy()
-                        .map(ThrottlePolicy::from)
+                        .get_platform_profile()
+                        .map(|p| p.into())
                         .map_err(|e| {
-                            error!("Platform: get_throttle_thermal_policy error: {e}");
+                            error!("Platform: get_platform_profile error: {e}");
                         })
                     {
-                        let change_epp = ctrl.config.lock().await.throttle_policy_linked_epp;
+                        let change_epp = ctrl.config.lock().await.platform_profile_linked_epp;
                         let epp = ctrl.get_config_epp_for_throttle(profile).await;
                         ctrl.check_and_set_epp(epp, change_epp);
-                        ctrl.throttle_thermal_policy_changed(&signal_ctxt)
-                            .await
-                            .ok();
-                        for attr in attrs.attributes().iter() {
-                            let name: FirmwareAttribute = attr.name().into();
-                            if name.is_ppt() {
-                                let mut do_default = false;
-                                if let Some(tunings) =
-                                    ctrl.config.lock().await.profile_tunings.get(&profile)
-                                {
-                                    if let Some(tune) = tunings.get(&name) {
-                                        attr.set_current_value(AttrValue::Integer(*tune))
-                                            .map_err(|e| {
-                                                error!("Failed to set {}: {e}", <&str>::from(name));
-                                            })
-                                            .ok();
-                                    } else {
-                                        do_default = true;
-                                    }
-                                } else {
-                                    do_default = true;
-                                }
-                                if do_default {
-                                    let default = attr.default_value().clone();
-                                    attr.set_current_value(default)
-                                        .map_err(|e| {
-                                            error!("Failed to set {}: {e}", <&str>::from(name));
-                                        })
-                                        .ok();
-                                }
-                            }
-                        }
+                        ctrl.platform_profile_changed(&signal_ctxt).await.ok();
+                        let power_plugged = ctrl
+                            .power
+                            .get_online()
+                            .map_err(|e| {
+                                error!("Could not get power status: {e:?}");
+                                e
+                            })
+                            .unwrap_or_default();
+                        set_config_or_default(
+                            &attrs,
+                            &mut *ctrl.config.lock().await,
+                            power_plugged == 1,
+                            profile
+                        )
+                        .await;
                     }
                 }
             }

asusd/src/daemon.rs

@@ -13,6 +13,7 @@ use asusd::{print_board_info, start_tasks, CtrlTask, DBUS_NAME};
 use config_traits::{StdConfig, StdConfigLoad1};
 use log::{error, info};
 use rog_platform::platform::RogPlatform;
+use rog_platform::power::AsusPower;
 use zbus::fdo::ObjectManager;
 
 #[tokio::main]
@@ -67,7 +68,8 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
 
     // supported.add_to_server(&mut connection).await;
     let platform = RogPlatform::new()?; // TODO: maybe needs async mutex?
-    start_attributes_zbus(&server, platform, config.clone()).await?;
+    let power = AsusPower::new()?; // TODO: maybe needs async mutex?
+    start_attributes_zbus(&server, platform, power, config.clone()).await?;
 
     match CtrlFanCurveZbus::new() {
         Ok(ctrl) => {

rog-control-center/build.rs

@@ -20,7 +20,7 @@ fn main() {
         CompilerConfiguration::new()
             // .embed_resources(EmbedResourcesKind::EmbedFiles)
             .with_include_paths(vec![include])
-            .with_style("fluent-dark".into())
+            .with_style("fluent".into())
     )
     .unwrap();
 }

rog-control-center/src/types/fan_types.rs

@@ -1,24 +1,24 @@
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 use rog_profiles::FanCurvePU;
 
 use crate::{FanType, Profile};
 
-impl From<Profile> for ThrottlePolicy {
+impl From<Profile> for PlatformProfile {
     fn from(value: Profile) -> Self {
         match value {
-            Profile::Balanced => ThrottlePolicy::Balanced,
-            Profile::Performance => ThrottlePolicy::Performance,
-            Profile::Quiet => ThrottlePolicy::Quiet
+            Profile::Balanced => PlatformProfile::Balanced,
+            Profile::Performance => PlatformProfile::Performance,
+            Profile::Quiet => PlatformProfile::Quiet
         }
     }
 }
 
-impl From<ThrottlePolicy> for Profile {
-    fn from(value: ThrottlePolicy) -> Self {
+impl From<PlatformProfile> for Profile {
+    fn from(value: PlatformProfile) -> Self {
         match value {
-            ThrottlePolicy::Balanced => Profile::Balanced,
-            ThrottlePolicy::Performance => Profile::Performance,
-            ThrottlePolicy::Quiet => Profile::Quiet
+            PlatformProfile::Balanced => Profile::Balanced,
+            PlatformProfile::Performance => Profile::Performance,
+            PlatformProfile::Quiet => Profile::Quiet
         }
     }
 }

rog-control-center/src/ui/setup_fans.rs

@@ -2,7 +2,7 @@ use std::sync::{Arc, Mutex};
 
 use log::{error, info};
 use rog_dbus::zbus_fan_curves::FanCurvesProxy;
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use slint::{ComponentHandle, Model, Weak};
 
@@ -109,21 +109,21 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
         let handle_copy = handle.clone();
         // Do initial setup
         let Ok(balanced) = fans
-            .fan_curve_data(ThrottlePolicy::Balanced)
+            .fan_curve_data(PlatformProfile::Balanced)
             .await
             .map_err(|e| error!("{e:}"))
         else {
             return;
         };
         let Ok(perf) = fans
-            .fan_curve_data(ThrottlePolicy::Performance)
+            .fan_curve_data(PlatformProfile::Performance)
             .await
             .map_err(|e| error!("{e:}"))
         else {
             return;
         };
         let Ok(quiet) = fans
-            .fan_curve_data(ThrottlePolicy::Quiet)
+            .fan_curve_data(PlatformProfile::Quiet)
             .await
             .map_err(|e| error!("{e:}"))
         else {
@@ -144,21 +144,21 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
                             return;
                         }
                         let Ok(balanced) = fans
-                            .fan_curve_data(ThrottlePolicy::Balanced)
+                            .fan_curve_data(PlatformProfile::Balanced)
                             .await
                             .map_err(|e| error!("{e:}"))
                         else {
                             return;
                         };
                         let Ok(perf) = fans
-                            .fan_curve_data(ThrottlePolicy::Performance)
+                            .fan_curve_data(PlatformProfile::Performance)
                             .await
                             .map_err(|e| error!("{e:}"))
                         else {
                             return;
                         };
                         let Ok(quiet) = fans
-                            .fan_curve_data(ThrottlePolicy::Quiet)
+                            .fan_curve_data(PlatformProfile::Quiet)
                             .await
                             .map_err(|e| error!("{e:}"))
                         else {

rog-control-center/src/ui/setup_system.rs

@@ -28,8 +28,7 @@ pub fn setup_system_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
     // Null everything before the setup step
     ui.global::<SystemPageData>()
         .set_charge_control_end_threshold(-1.0);
-    ui.global::<SystemPageData>()
-        .set_throttle_thermal_policy(-1);
+    ui.global::<SystemPageData>().set_platform_profile(-1);
     ui.global::<SystemPageData>().set_panel_overdrive(-1);
     ui.global::<SystemPageData>().set_boot_sound(-1);
     ui.global::<SystemPageData>().set_mini_led_mode(-1);
@@ -132,6 +131,23 @@ macro_rules! setup_callback {
     };
 }
 
+// For handling callbacks from UI value changes
+macro_rules! setup_callback_restore_default {
+    ($property:ident, $handle:expr, $attr:expr) => {
+        let proxy_copy = $attr.clone();
+        concat_idents!(on_callback = on_cb_default_, $property {
+            $handle
+                .global::<SystemPageData>()
+                .on_callback(move || {
+                    let proxy_copy = proxy_copy.clone();
+                    tokio::spawn(async move {
+                        proxy_copy.restore_default().await.ok();
+                    });
+                });
+        });
+    };
+}
+
 macro_rules! setup_external {
     ($property:ident, $type:tt, $handle:expr, $attr:expr, $value:expr) => {{
         // EXTERNAL CHANGES
@@ -187,11 +203,11 @@ macro_rules! setup_minmax_external {
         let proxy_copy = $attr.clone();
         let platform_proxy_copy = $platform.clone();
         tokio::spawn(async move {
-            let mut x = platform_proxy_copy.receive_throttle_thermal_policy_changed().await;
+            let mut x = platform_proxy_copy.receive_platform_profile_changed().await;
             use zbus::export::futures_util::StreamExt;
             while let Some(e) = x.next().await {
                 if let Ok(_) = e.get().await {
-                    debug!("receive_throttle_thermal_policy_changed, getting new {}", stringify!(attr));
+                    debug!("receive_platform_profile_changed, getting new {}", stringify!(attr));
                     let min = proxy_copy.min_value().await.unwrap();
                     let max = proxy_copy.max_value().await.unwrap();
                     let val = proxy_copy.current_value().await.unwrap() as f32;
@@ -242,24 +258,34 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
             charge_control_end_threshold
         );
 
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_thermal_policy);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_policy_linked_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_balanced_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_performance_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_quiet_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_policy_on_battery);
+        set_ui_props_async!(handle, platform, SystemPageData, platform_profile);
         set_ui_props_async!(
             handle,
             platform,
             SystemPageData,
-            change_throttle_policy_on_battery
+            platform_profile_linked_epp
         );
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_policy_on_ac);
+        set_ui_props_async!(handle, platform, SystemPageData, profile_balanced_epp);
+        set_ui_props_async!(handle, platform, SystemPageData, profile_performance_epp);
+        set_ui_props_async!(handle, platform, SystemPageData, profile_quiet_epp);
         set_ui_props_async!(
             handle,
             platform,
             SystemPageData,
-            change_throttle_policy_on_ac
+            platform_profile_on_battery
+        );
+        set_ui_props_async!(
+            handle,
+            platform,
+            SystemPageData,
+            change_platform_profile_on_battery
+        );
+        set_ui_props_async!(handle, platform, SystemPageData, platform_profile_on_ac);
+        set_ui_props_async!(
+            handle,
+            platform,
+            SystemPageData,
+            change_platform_profile_on_ac
         );
 
         let platform_copy = platform.clone();
@@ -273,56 +299,56 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform_copy.throttle_thermal_policy(.into()),
+                    platform_copy.platform_profile(.into()),
                     "Throttle policy set to {}",
                     "Setting Throttle policy failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform_copy.throttle_balanced_epp(.into()),
+                    platform_copy.profile_balanced_epp(.into()),
                     "Throttle policy EPP set to {}",
                     "Setting Throttle policy EPP failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform_copy.throttle_performance_epp(.into()),
+                    platform_copy.profile_performance_epp(.into()),
                     "Throttle policy EPP set to {}",
                     "Setting Throttle policy EPP failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform_copy.throttle_quiet_epp(.into()),
+                    platform_copy.profile_quiet_epp(.into()),
                     "Throttle policy EPP set to {}",
                     "Setting Throttle policy EPP failed"
                 );
                 set_ui_callbacks!(
                     handle,
                     SystemPageData(),
-                    platform_copy.throttle_policy_linked_epp(),
+                    platform_copy.platform_profile_linked_epp(),
                     "Throttle policy linked to EPP: {}",
                     "Setting Throttle policy linked to EPP failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform_copy.throttle_policy_on_ac(.into()),
+                    platform_copy.platform_profile_on_ac(.into()),
                     "Throttle policy on AC set to {}",
                     "Setting Throttle policy on AC failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as bool),
-                    platform_copy.change_throttle_policy_on_ac(.into()),
+                    platform_copy.change_platform_profile_on_ac(.into()),
                     "Throttle policy on AC enabled: {}",
                     "Setting Throttle policy on AC failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform_copy.throttle_policy_on_battery(.into()),
+                    platform_copy.platform_profile_on_battery(.into()),
                     "Throttle policy on abttery set to {}",
                     "Setting Throttle policy on battery failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as bool),
-                    platform_copy.change_throttle_policy_on_battery(.into()),
+                    platform_copy.change_platform_profile_on_battery(.into()),
                     "Throttle policy on battery enabled: {}",
                     "Setting Throttle policy on AC failed"
                 );
@@ -358,41 +384,49 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                         FirmwareAttribute::PptPl1Spl => {
                             init_minmax_property!(ppt_pl1_spl, handle, attr);
                             setup_callback!(ppt_pl1_spl, handle, attr, i32);
+                            setup_callback_restore_default!(ppt_pl1_spl, handle, attr);
                             setup_minmax_external!(ppt_pl1_spl, handle, attr, platform);
                         }
                         FirmwareAttribute::PptPl2Sppt => {
                             init_minmax_property!(ppt_pl2_sppt, handle, attr);
                             setup_callback!(ppt_pl2_sppt, handle, attr, i32);
+                            setup_callback_restore_default!(ppt_pl2_sppt, handle, attr);
                             setup_minmax_external!(ppt_pl2_sppt, handle, attr, platform);
                         }
                         FirmwareAttribute::PptPl3Fppt => {
                             init_minmax_property!(ppt_pl3_fppt, handle, attr);
                             setup_callback!(ppt_pl3_fppt, handle, attr, i32);
+                            setup_callback_restore_default!(ppt_pl3_fppt, handle, attr);
                             setup_minmax_external!(ppt_pl3_fppt, handle, attr, platform);
                         }
                         FirmwareAttribute::PptFppt => {
                             init_minmax_property!(ppt_fppt, handle, attr);
                             setup_callback!(ppt_fppt, handle, attr, i32);
+                            setup_callback_restore_default!(ppt_fppt, handle, attr);
                             setup_minmax_external!(ppt_fppt, handle, attr, platform);
                         }
                         FirmwareAttribute::PptApuSppt => {
                             init_minmax_property!(ppt_apu_sppt, handle, attr);
                             setup_callback!(ppt_apu_sppt, handle, attr, i32);
+                            setup_callback_restore_default!(ppt_apu_sppt, handle, attr);
                             setup_minmax_external!(ppt_apu_sppt, handle, attr, platform);
                         }
                         FirmwareAttribute::PptPlatformSppt => {
                             init_minmax_property!(ppt_platform_sppt, handle, attr);
                             setup_callback!(ppt_platform_sppt, handle, attr, i32);
+                            setup_callback_restore_default!(ppt_platform_sppt, handle, attr);
                             setup_minmax_external!(ppt_platform_sppt, handle, attr, platform);
                         }
                         FirmwareAttribute::NvDynamicBoost => {
                             init_minmax_property!(nv_dynamic_boost, handle, attr);
                             setup_callback!(nv_dynamic_boost, handle, attr, i32);
+                            setup_callback_restore_default!(nv_dynamic_boost, handle, attr);
                             setup_minmax_external!(nv_dynamic_boost, handle, attr, platform);
                         }
                         FirmwareAttribute::NvTempTarget => {
                             init_minmax_property!(nv_temp_target, handle, attr);
                             setup_callback!(nv_temp_target, handle, attr, i32);
+                            setup_callback_restore_default!(nv_temp_target, handle, attr);
                             setup_minmax_external!(nv_temp_target, handle, attr, platform);
                         }
                         FirmwareAttribute::DgpuBaseTgp => {}

rog-control-center/translations/en/rog-control-center.po

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2025-01-18 10:11+0000\n"
+"POT-Creation-Date: 2025-01-19 10:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,81 +12,282 @@ msgstr ""
 "Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: rog-control-center/ui/pages/app_settings.slint:26
-msgctxt "PageAppSettings"
-msgid "Run in background after closing"
-msgstr ""
-
-#: rog-control-center/ui/pages/app_settings.slint:34
-msgctxt "PageAppSettings"
-msgid "Start app in background (UI closed)"
-msgstr ""
-
-#: rog-control-center/ui/pages/app_settings.slint:42
-msgctxt "PageAppSettings"
-msgid "Enable system tray icon"
-msgstr ""
-
-#: rog-control-center/ui/pages/app_settings.slint:50
-msgctxt "PageAppSettings"
-msgid "Enable dGPU notifications"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:26
-msgctxt "FanTab"
-msgid "This fan is not avilable on this machine"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:34
-msgctxt "FanTab"
-msgid "Enabled"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:43
-msgctxt "FanTab"
-msgid "Apply"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:51
-msgctxt "FanTab"
-msgid "Cancel"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:59
-msgctxt "FanTab"
-msgid "Factory Default (all fans)"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:72
-msgctxt "PageFans"
+#: rog-control-center/ui/pages/system.slint:19
+msgctxt "SystemPageData"
 msgid "Balanced"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:75 rog-control-center/ui/pages/fans.slint:134 rog-control-center/ui/pages/fans.slint:193
-msgctxt "PageFans"
-msgid "CPU"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:93 rog-control-center/ui/pages/fans.slint:152 rog-control-center/ui/pages/fans.slint:211
-msgctxt "PageFans"
-msgid "Mid"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:111 rog-control-center/ui/pages/fans.slint:170 rog-control-center/ui/pages/fans.slint:229
-msgctxt "PageFans"
-msgid "GPU"
-msgstr ""
-
-#: rog-control-center/ui/pages/fans.slint:131
-msgctxt "PageFans"
+#: rog-control-center/ui/pages/system.slint:19 rog-control-center/ui/pages/system.slint:23
+msgctxt "SystemPageData"
 msgid "Performance"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:190
-msgctxt "PageFans"
+#: rog-control-center/ui/pages/system.slint:19
+msgctxt "SystemPageData"
 msgid "Quiet"
 msgstr ""
 
+#: rog-control-center/ui/pages/system.slint:22
+msgctxt "SystemPageData"
+msgid "Default"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:24
+msgctxt "SystemPageData"
+msgid "BalancePerformance"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:25
+msgctxt "SystemPageData"
+msgid "BalancePower"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Power"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:139
+msgctxt "PageSystem"
+msgid "Power settings"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:144
+msgctxt "PageSystem"
+msgid "Charge limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:158
+msgctxt "PageSystem"
+msgid "Platform Profile"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:168
+msgctxt "PageSystem"
+msgid "Advanced"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:186
+msgctxt "PageSystem"
+msgid "Armoury settings"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:194
+msgctxt "PageSystem"
+msgid "Panel Overdrive"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:202
+msgctxt "PageSystem"
+msgid "MiniLED Mode"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:210
+msgctxt "PageSystem"
+msgid "POST boot sound"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:224
+msgctxt "no_asus_armoury_driver_2"
+msgid "The asus-armoury driver is not loaded"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:230
+msgctxt "no_asus_armoury_driver_2"
+msgid "For advanced features you will require a kernel with this driver added."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:241
+msgctxt "ppt_warning"
+msgid "The following settings may not be safe, please review the help."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:246 rog-control-center/ui/pages/system.slint:247
+msgctxt "ppt_pl1_spl"
+msgid "CPU Sustained Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:248
+msgctxt "ppt_pl1_spl_help"
+msgid ""
+"Long-term CPU power limit that affects sustained workload performance. "
+"Higher values may increase heat and power consumption."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:263 rog-control-center/ui/pages/system.slint:264
+msgctxt "ppt_pl2_sppt"
+msgid "CPU Turbo Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:265
+msgctxt "ppt_pl2_sppt_help"
+msgid ""
+"Short-term CPU power limit for boost periods. Controls maximum power during "
+"brief high-performance bursts."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:280 rog-control-center/ui/pages/system.slint:281
+msgctxt "ppt_pl3_fppt"
+msgid "CPU Fast Burst Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:282
+msgctxt "ppt_pl3_fppt_help"
+msgid ""
+"Ultra-short duration power limit for instantaneous CPU bursts. Affects "
+"responsiveness during sudden workload spikes."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:296 rog-control-center/ui/pages/system.slint:297
+msgctxt "ppt_fppt"
+msgid "Fast Package Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:298
+msgctxt "ppt_fppt_help"
+msgid ""
+"Ultra-short duration power limit for system package. Controls maximum power "
+"during millisecond-scale load spikes."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:313 rog-control-center/ui/pages/system.slint:314
+msgctxt "ppt_apu_sppt"
+msgid "APU Sustained Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:315
+msgctxt "ppt_apu_sppt_help"
+msgid ""
+"Long-term power limit for integrated graphics and CPU combined. Affects "
+"sustained performance of APU-based workloads."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:330 rog-control-center/ui/pages/system.slint:331
+msgctxt "ppt_platform_sppt"
+msgid "Platform Sustained Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:332
+msgctxt "ppt_platform_sppt_help"
+msgid ""
+"Overall system power limit for sustained operations. Controls total platform "
+"power consumption over extended periods."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:347 rog-control-center/ui/pages/system.slint:348
+msgctxt "nv_dynamic_boost"
+msgid "GPU Power Boost"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:349
+msgctxt "nv_dynamic_boost_help"
+msgid ""
+"Additional power allocation for GPU dynamic boost. Higher values increase "
+"GPU performance but generate more heat."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:364 rog-control-center/ui/pages/system.slint:365
+msgctxt "nv_temp_target"
+msgid "GPU Temperature Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:366
+msgctxt "nv_temp_target_help"
+msgid ""
+"Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain "
+"temperature below this limit."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:417
+msgctxt "PageSystem"
+msgid "Energy Performance Preference linked to Throttle Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:421
+msgctxt "PageSystem"
+msgid "Change EPP based on Throttle Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:429
+msgctxt "PageSystem"
+msgid "EPP for Balanced Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:439
+msgctxt "PageSystem"
+msgid "EPP for Performance Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:449
+msgctxt "PageSystem"
+msgid "EPP for Quiet Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:467
+msgctxt "PageSystem"
+msgid "Throttle Policy for power state"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:473
+msgctxt "PageSystem"
+msgid "Throttle Policy on Battery"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:483 rog-control-center/ui/pages/system.slint:504
+msgctxt "PageSystem"
+msgid "Enabled"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:494
+msgctxt "PageSystem"
+msgid "Throttle Policy on AC"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:28
+msgctxt "PageAura"
+msgid "Brightness"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:39
+msgctxt "PageAura"
+msgid "Aura mode"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:59
+msgctxt "PageAura"
+msgid "Colour 1"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:85
+msgctxt "PageAura"
+msgid "Colour 2"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:119
+msgctxt "PageAura"
+msgid "Zone"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:142
+msgctxt "PageAura"
+msgid "Direction"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:164
+msgctxt "PageAura"
+msgid "Speed"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:185
+msgctxt "PageAura"
+msgid "Power Settings"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:270
+msgctxt "PageAura"
+msgid "Power Zones"
+msgstr ""
+
 #: rog-control-center/ui/pages/anime.slint:6
 msgctxt "Anime Brightness"
 msgid "Off"
@@ -212,224 +413,79 @@ msgctxt "PageAnime"
 msgid "Off when on battery"
 msgstr ""
 
-#: rog-control-center/ui/pages/aura.slint:28
-msgctxt "PageAura"
-msgid "Brightness"
+#: rog-control-center/ui/pages/fans.slint:26
+msgctxt "FanTab"
+msgid "This fan is not avilable on this machine"
 msgstr ""
 
-#: rog-control-center/ui/pages/aura.slint:39
-msgctxt "PageAura"
-msgid "Aura mode"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:59
-msgctxt "PageAura"
-msgid "Colour 1"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:85
-msgctxt "PageAura"
-msgid "Colour 2"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:119
-msgctxt "PageAura"
-msgid "Zone"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:142
-msgctxt "PageAura"
-msgid "Direction"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:164
-msgctxt "PageAura"
-msgid "Speed"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:185
-msgctxt "PageAura"
-msgid "Power Settings"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:270
-msgctxt "PageAura"
-msgid "Power Zones"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:19
-msgctxt "SystemPageData"
-msgid "Balanced"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:19 rog-control-center/ui/pages/system.slint:23
-msgctxt "SystemPageData"
-msgid "Performance"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:19
-msgctxt "SystemPageData"
-msgid "Quiet"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:22
-msgctxt "SystemPageData"
-msgid "Default"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:24
-msgctxt "SystemPageData"
-msgid "BalancePerformance"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:25
-msgctxt "SystemPageData"
-msgid "BalancePower"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:26
-msgctxt "SystemPageData"
-msgid "Power"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:130
-msgctxt "PageSystem"
-msgid "Power settings"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:135
-msgctxt "PageSystem"
-msgid "Charge limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:147
-msgctxt "PageSystem"
-msgid "Throttle Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:157
-msgctxt "PageSystem"
-msgid "Advanced"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:175
-msgctxt "PageSystem"
-msgid "Armoury settings"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:183
-msgctxt "PageSystem"
-msgid "Panel Overdrive"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:191
-msgctxt "PageSystem"
-msgid "MiniLED Mode"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:199
-msgctxt "PageSystem"
-msgid "POST boot sound"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:210
-msgctxt "PageSystem"
-msgid "The asus-armoury driver is not loaded"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:215
-msgctxt "PageSystem"
-msgid "For advanced features you will require a kernel with this driver added."
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:226
-msgctxt "ppt_warning"
-msgid "The following settings may not be safe, please take care."
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:231
-msgctxt "ppt_pl1_spl"
-msgid "PL1, sustained power limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:242
-msgctxt "ppt_pl2_sppt"
-msgid "PL2, turbo power limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:253
-msgctxt "ppt_pl3_fppt"
-msgid "PL3, Fast Power Limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:263
-msgctxt "ppt_fppt"
-msgid "FPPT, Fast Power Limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:274
-msgctxt "ppt_apu_sppt"
-msgid "SPPT, APU slow power limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:285
-msgctxt "ppt_platform_sppt"
-msgid "Slow package power tracking limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:296
-msgctxt "nv_dynamic_boost"
-msgid "dGPU boost overclock"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:307
-msgctxt "nv_temp_target"
-msgid "dGPU temperature max"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:354
-msgctxt "PageSystem"
-msgid "Energy Performance Preference linked to Throttle Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:358
-msgctxt "PageSystem"
-msgid "Change EPP based on Throttle Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:366
-msgctxt "PageSystem"
-msgid "EPP for Balanced Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:376
-msgctxt "PageSystem"
-msgid "EPP for Performance Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:386
-msgctxt "PageSystem"
-msgid "EPP for Quiet Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:404
-msgctxt "PageSystem"
-msgid "Throttle Policy for power state"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:410
-msgctxt "PageSystem"
-msgid "Throttle Policy on Battery"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:420 rog-control-center/ui/pages/system.slint:441
-msgctxt "PageSystem"
+#: rog-control-center/ui/pages/fans.slint:34
+msgctxt "FanTab"
 msgid "Enabled"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:431
-msgctxt "PageSystem"
-msgid "Throttle Policy on AC"
+#: rog-control-center/ui/pages/fans.slint:43
+msgctxt "FanTab"
+msgid "Apply"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:51
+msgctxt "FanTab"
+msgid "Cancel"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:59
+msgctxt "FanTab"
+msgid "Factory Default (all fans)"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:72
+msgctxt "PageFans"
+msgid "Balanced"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:75 rog-control-center/ui/pages/fans.slint:134 rog-control-center/ui/pages/fans.slint:193
+msgctxt "PageFans"
+msgid "CPU"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:93 rog-control-center/ui/pages/fans.slint:152 rog-control-center/ui/pages/fans.slint:211
+msgctxt "PageFans"
+msgid "Mid"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:111 rog-control-center/ui/pages/fans.slint:170 rog-control-center/ui/pages/fans.slint:229
+msgctxt "PageFans"
+msgid "GPU"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:131
+msgctxt "PageFans"
+msgid "Performance"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:190
+msgctxt "PageFans"
+msgid "Quiet"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:26
+msgctxt "PageAppSettings"
+msgid "Run in background after closing"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:34
+msgctxt "PageAppSettings"
+msgid "Start app in background (UI closed)"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:42
+msgctxt "PageAppSettings"
+msgid "Enable system tray icon"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:50
+msgctxt "PageAppSettings"
+msgid "Enable dGPU notifications"
 msgstr ""
 
 #: rog-control-center/ui/types/aura_types.slint:52
@@ -667,6 +723,11 @@ msgctxt "AuraPowerGroupOld"
 msgid "Sleep"
 msgstr ""
 
+#: rog-control-center/ui/widgets/common.slint:133
+msgctxt "confirm_reset"
+msgid "Are you sure you want to reset this?"
+msgstr ""
+
 #: rog-control-center/ui/main_window.slint:51
 msgctxt "MainWindow"
 msgid "ROG"

rog-control-center/ui/main_window.slint

@@ -21,8 +21,8 @@ export component MainWindow inherits Window {
     title: "ROG Control";
     default-font-family: "DejaVu Sans";
     in property <[bool]> sidebar_items_avilable: [true, true, true, true, true, true];
-    private property <bool> show-notif;
-    private property <bool> fade-cover;
+    private property <bool> show_notif;
+    private property <bool> fade_cover;
     private property <bool> toast: false;
     private property <string> toast_text: "I show when something is waiting";
     callback show_toast(string);
@@ -31,10 +31,10 @@ export component MainWindow inherits Window {
         toast_text = text;
     }
     callback exit-app();
-    callback show-notification(bool);
-    show-notification(yes) => {
-        show-notif = yes;
-        fade-cover = yes;
+    callback show_notification(bool);
+    show_notification(yes) => {
+        show_notif = yes;
+        fade_cover = yes;
     }
     callback external_colour_change();
     external_colour_change() => {
@@ -109,7 +109,7 @@ export component MainWindow inherits Window {
         }
     }
 
-    if fade-cover: Rectangle {
+    if fade_cover: Rectangle {
         x: 0px;
         y: 0px;
         width: root.width;
@@ -121,10 +121,10 @@ export component MainWindow inherits Window {
             width: 100%;
             clicked => {
                 // toolbar-dropdown.close();
-                if (show-notif) {
-                    show-notif = false;
+                if (show_notif) {
+                    show_notif = false;
                 }
-                fade-cover = false;
+                fade_cover = false;
             }
         }
     }
@@ -156,7 +156,7 @@ export component MainWindow inherits Window {
     }
 
     // // TODO: or use Dialogue
-    if show-notif: Rectangle {
+    if show_notif: Rectangle {
         x: root.width / 8;
         y: root.height / 8;
         height: (root.height / 8) * 6;
@@ -165,7 +165,7 @@ export component MainWindow inherits Window {
             height: 100%;
             width: 100%;
             clicked => {
-                show-notif = false;
+                show_notif = false;
                 exit-app();
             }
         }

rog-control-center/ui/pages/system.slint

@@ -15,9 +15,9 @@ export struct AttrPossible {
 export global SystemPageData {
     in-out property <float> charge_control_end_threshold: 30;
     callback cb_charge_control_end_threshold(/* charge limit */ int);
-    in-out property <int> throttle_thermal_policy: 0;
-    in-out property <[string]> throttle_policy_choices: [@tr("Balanced"), @tr("Performance"), @tr("Quiet")];
-    callback cb_throttle_thermal_policy(int);
+    in-out property <int> platform_profile: 0;
+    in-out property <[string]> platform_profile_choices: [@tr("Balanced"), @tr("Performance"), @tr("Quiet")];
+    callback cb_platform_profile(int);
     in-out property <[string]> energy_performance_choices: [
         @tr("Default"),
         @tr("Performance"),
@@ -25,23 +25,23 @@ export global SystemPageData {
         @tr("BalancePower"),
         @tr("Power")
     ];
-    in-out property <int> throttle_balanced_epp: 0;
-    callback cb_throttle_balanced_epp(int);
-    in-out property <int> throttle_performance_epp: 0;
-    callback cb_throttle_performance_epp(int);
-    in-out property <int> throttle_quiet_epp: 0;
-    callback cb_throttle_quiet_epp(int);
+    in-out property <int> profile_balanced_epp: 0;
+    callback cb_profile_balanced_epp(int);
+    in-out property <int> profile_performance_epp: 0;
+    callback cb_profile_performance_epp(int);
+    in-out property <int> profile_quiet_epp: 0;
+    callback cb_profile_quiet_epp(int);
     // if the EPP should change with throttle
-    in-out property <bool> throttle_policy_linked_epp: true;
-    callback cb_throttle_policy_linked_epp(bool);
-    in-out property <int> throttle_policy_on_ac: 0;
-    callback cb_throttle_policy_on_ac(int);
-    in-out property <bool> change_throttle_policy_on_ac: true;
-    callback cb_change_throttle_policy_on_ac(bool);
-    in-out property <int> throttle_policy_on_battery: 0;
-    callback cb_throttle_policy_on_battery(int);
-    in-out property <bool> change_throttle_policy_on_battery: true;
-    callback cb_change_throttle_policy_on_battery(bool);
+    in-out property <bool> platform_profile_linked_epp: true;
+    callback cb_platform_profile_linked_epp(bool);
+    in-out property <int> platform_profile_on_ac: 0;
+    callback cb_platform_profile_on_ac(int);
+    in-out property <bool> change_platform_profile_on_ac: true;
+    callback cb_change_platform_profile_on_ac(bool);
+    in-out property <int> platform_profile_on_battery: 0;
+    callback cb_platform_profile_on_battery(int);
+    in-out property <bool> change_platform_profile_on_battery: true;
+    callback cb_change_platform_profile_on_battery(bool);
     //
     in-out property <int> panel_overdrive;
     callback cb_panel_overdrive(int);
@@ -57,6 +57,7 @@ export global SystemPageData {
         val: 20,
     };
     callback cb_ppt_pl1_spl(int);
+    callback cb_default_ppt_pl1_spl();
 
     in-out property <AttrMinMax> ppt_pl2_sppt: {
         min: 0,
@@ -64,6 +65,7 @@ export global SystemPageData {
         val: 20,
     };
     callback cb_ppt_pl2_sppt(int);
+    callback cb_default_ppt_pl2_sppt();
 
     in-out property <AttrMinMax> ppt_pl3_fppt: {
         min: 0,
@@ -71,6 +73,7 @@ export global SystemPageData {
         val: 20,
     };
     callback cb_ppt_pl3_fppt(int);
+    callback cb_default_ppt_pl3_fppt();
 
     in-out property <AttrMinMax> ppt_fppt: {
         min: 0,
@@ -78,6 +81,7 @@ export global SystemPageData {
         val: 20,
     };
     callback cb_ppt_fppt(int);
+    callback cb_default_ppt_fppt();
 
     in-out property <AttrMinMax> ppt_apu_sppt: {
         min: 0,
@@ -85,6 +89,7 @@ export global SystemPageData {
         val: 20,
     };
     callback cb_ppt_apu_sppt(int);
+    callback cb_default_ppt_apu_sppt();
 
     in-out property <AttrMinMax> ppt_platform_sppt: {
         min: 0,
@@ -92,6 +97,7 @@ export global SystemPageData {
         val: 20,
     };
     callback cb_ppt_platform_sppt(int);
+    callback cb_default_ppt_platform_sppt();
 
     in-out property <AttrMinMax> nv_dynamic_boost: {
         min: 0,
@@ -99,6 +105,7 @@ export global SystemPageData {
         val: 5,
     };
     callback cb_nv_dynamic_boost(int);
+    callback cb_default_nv_dynamic_boost();
 
     in-out property <AttrMinMax> nv_temp_target: {
         min: 0,
@@ -106,6 +113,7 @@ export global SystemPageData {
         val: 75,
     };
     callback cb_nv_temp_target(int);
+    callback cb_default_nv_temp_target();
 }
 
 export component PageSystem inherits Rectangle {
@@ -117,6 +125,7 @@ export component PageSystem inherits Rectangle {
         VerticalLayout {
             padding: 10px;
             spacing: 10px;
+            alignment: LayoutAlignment.start;
             Rectangle {
                 background: Palette.alternate-background;
                 border-color: Palette.accent-background;
@@ -135,21 +144,23 @@ export component PageSystem inherits Rectangle {
                 text: @tr("Charge limit");
                 minimum: 20;
                 maximum: 100;
-                value <=> SystemPageData.charge_control_end_threshold;
+                has_reset: false;
+                value: SystemPageData.charge_control_end_threshold;
                 released => {
+                    SystemPageData.charge_control_end_threshold = self.value;
                     SystemPageData.cb_charge_control_end_threshold(Math.round(SystemPageData.charge_control_end_threshold))
                 }
             }
 
-            if SystemPageData.throttle_thermal_policy != -1: HorizontalLayout {
+            if SystemPageData.platform_profile != -1: HorizontalLayout {
                 spacing: 10px;
                 SystemDropdown {
-                    text: @tr("Throttle Policy");
-                    current_index <=> SystemPageData.throttle_thermal_policy;
-                    current_value: SystemPageData.throttle_policy_choices[SystemPageData.throttle_thermal_policy];
-                    model <=> SystemPageData.throttle_policy_choices;
+                    text: @tr("Platform Profile");
+                    current_index <=> SystemPageData.platform_profile;
+                    current_value: SystemPageData.platform_profile_choices[SystemPageData.platform_profile];
+                    model <=> SystemPageData.platform_profile_choices;
                     selected => {
-                        SystemPageData.cb_throttle_thermal_policy(SystemPageData.throttle_thermal_policy)
+                        SystemPageData.cb_platform_profile(SystemPageData.platform_profile)
                     }
                 }
 
@@ -205,33 +216,43 @@ export component PageSystem inherits Rectangle {
             }
 
             if !SystemPageData.asus_armoury_loaded: Rectangle {
-              VerticalBox {
-                Text {
-                  text: @tr("The asus-armoury driver is not loaded");
-                  font-size: 16px;
-                  horizontal-alignment: TextHorizontalAlignment.center;
+                border-width: 3px;
+                border-color: red;
+                max-height: 30px;
+                VerticalBox {
+                    Text {
+                        text: @tr("no_asus_armoury_driver_2" => "The asus-armoury driver is not loaded");
+                        font-size: 16px;
+                        horizontal-alignment: TextHorizontalAlignment.center;
+                    }
+
+                    Text {
+                        text: @tr("no_asus_armoury_driver_2" => "For advanced features you will require a kernel with this driver added.");
+                        font-size: 16px;
+                        horizontal-alignment: TextHorizontalAlignment.center;
+                    }
                 }
-                Text {
-                  text: @tr("For advanced features you will require a kernel with this driver added.");
-                  font-size: 16px;
-                  horizontal-alignment: TextHorizontalAlignment.center;
-                }
-              }
             }
 
             if SystemPageData.ppt_pl1_spl.val != -1: Rectangle {
-              height: 32px;
-              Text {
-                font-size: 16px;
-                text: @tr("ppt_warning" => "The following settings may not be safe, please take care.");
-              }
+                height: 32px;
+                Text {
+                    font-size: 16px;
+                    text: @tr("ppt_warning" => "The following settings may not be safe, please review the help.");
+                }
             }
 
             if SystemPageData.ppt_pl1_spl.val != -1: SystemSlider {
-                text: @tr("ppt_pl1_spl" => "PL1, sustained power limit");
+                text: @tr("ppt_pl1_spl" => "CPU Sustained Power Limit");
+                title: @tr("ppt_pl1_spl" => "CPU Sustained Power Limit");
+                help_text: @tr("ppt_pl1_spl_help" => "Long-term CPU power limit that affects sustained workload performance. Higher values may increase heat and power consumption.");
                 minimum: SystemPageData.ppt_pl1_spl.min;
                 maximum: SystemPageData.ppt_pl1_spl.max;
                 value: SystemPageData.ppt_pl1_spl.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_pl1_spl();
+                }
                 released => {
                     SystemPageData.ppt_pl1_spl.val = self.value;
                     SystemPageData.cb_ppt_pl1_spl(Math.round(self.value))
@@ -239,10 +260,16 @@ export component PageSystem inherits Rectangle {
             }
 
             if SystemPageData.ppt_pl2_sppt.val != -1: SystemSlider {
-                text: @tr("ppt_pl2_sppt" => "PL2, turbo power limit");
+                text: @tr("ppt_pl2_sppt" => "CPU Turbo Power Limit");
+                title: @tr("ppt_pl2_sppt" => "CPU Turbo Power Limit");
+                help_text: @tr("ppt_pl2_sppt_help" => "Short-term CPU power limit for boost periods. Controls maximum power during brief high-performance bursts.");
                 minimum: SystemPageData.ppt_pl2_sppt.min;
                 maximum: SystemPageData.ppt_pl2_sppt.max;
                 value: SystemPageData.ppt_pl2_sppt.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_pl2_sppt();
+                }
                 released => {
                     SystemPageData.ppt_pl2_sppt.val = self.value;
                     SystemPageData.cb_ppt_pl2_sppt(Math.round(self.value))
@@ -250,20 +277,32 @@ export component PageSystem inherits Rectangle {
             }
 
             if SystemPageData.ppt_pl3_fppt.val != -1: SystemSlider {
-                text: @tr("ppt_pl3_fppt" => "PL3, Fast Power Limit");
+                text: @tr("ppt_pl3_fppt" => "CPU Fast Burst Power Limit");
+                title: @tr("ppt_pl3_fppt" => "CPU Fast Burst Power Limit");
+                help_text: @tr("ppt_pl3_fppt_help" => "Ultra-short duration power limit for instantaneous CPU bursts. Affects responsiveness during sudden workload spikes.");
                 minimum: SystemPageData.ppt_pl3_fppt.min;
                 maximum: SystemPageData.ppt_pl3_fppt.max;
                 value: SystemPageData.ppt_pl3_fppt.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_pl3_fppt();
+                }
                 released => {
                     SystemPageData.ppt_pl3_fppt.val = self.value;
                     SystemPageData.cb_ppt_pl3_fppt(Math.round(self.value))
                 }
             }
             if SystemPageData.ppt_fppt.val != -1: SystemSlider {
-                text: @tr("ppt_fppt" => "FPPT, Fast Power Limit");
+                text: @tr("ppt_fppt" => "Fast Package Power Limit");
+                title: @tr("ppt_fppt" => "Fast Package Power Limit");
+                help_text: @tr("ppt_fppt_help" => "Ultra-short duration power limit for system package. Controls maximum power during millisecond-scale load spikes.");
                 minimum: SystemPageData.ppt_fppt.min;
                 maximum: SystemPageData.ppt_fppt.max;
                 value: SystemPageData.ppt_fppt.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_fppt();
+                }
                 released => {
                     SystemPageData.ppt_fppt.val = self.value;
                     SystemPageData.cb_ppt_fppt(Math.round(self.value))
@@ -271,10 +310,16 @@ export component PageSystem inherits Rectangle {
             }
 
             if SystemPageData.ppt_apu_sppt.val != -1: SystemSlider {
-                text: @tr("ppt_apu_sppt" => "SPPT, APU slow power limit");
+                text: @tr("ppt_apu_sppt" => "APU Sustained Power Limit");
+                title: @tr("ppt_apu_sppt" => "APU Sustained Power Limit");
+                help_text: @tr("ppt_apu_sppt_help" => "Long-term power limit for integrated graphics and CPU combined. Affects sustained performance of APU-based workloads.");
                 minimum: SystemPageData.ppt_apu_sppt.min;
                 maximum: SystemPageData.ppt_apu_sppt.max;
                 value: SystemPageData.ppt_apu_sppt.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_apu_sppt();
+                }
                 released => {
                     SystemPageData.ppt_apu_sppt.val = self.value;
                     SystemPageData.cb_ppt_apu_sppt(Math.round(self.value))
@@ -282,10 +327,16 @@ export component PageSystem inherits Rectangle {
             }
 
             if SystemPageData.ppt_platform_sppt.val != -1: SystemSlider {
-                text: @tr("ppt_platform_sppt" => "Slow package power tracking limit");
+                text: @tr("ppt_platform_sppt" => "Platform Sustained Power Limit");
+                title: @tr("ppt_platform_sppt" => "Platform Sustained Power Limit");
+                help_text: @tr("ppt_platform_sppt_help" => "Overall system power limit for sustained operations. Controls total platform power consumption over extended periods.");
                 minimum: SystemPageData.ppt_platform_sppt.min;
                 maximum: SystemPageData.ppt_platform_sppt.max;
                 value: SystemPageData.ppt_platform_sppt.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_platform_sppt();
+                }
                 released => {
                     SystemPageData.ppt_platform_sppt.val = self.value;
                     SystemPageData.cb_ppt_platform_sppt(Math.round(self.value))
@@ -293,10 +344,16 @@ export component PageSystem inherits Rectangle {
             }
 
             if SystemPageData.nv_dynamic_boost.val != -1: SystemSlider {
-                text: @tr("nv_dynamic_boost" => "dGPU boost overclock");
+                text: @tr("nv_dynamic_boost" => "GPU Power Boost");
+                title: @tr("nv_dynamic_boost" => "GPU Power Boost");
+                help_text: @tr("nv_dynamic_boost_help" => "Additional power allocation for GPU dynamic boost. Higher values increase GPU performance but generate more heat.");
                 minimum: SystemPageData.nv_dynamic_boost.min;
                 maximum: SystemPageData.nv_dynamic_boost.max;
                 value: SystemPageData.nv_dynamic_boost.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_nv_dynamic_boost();
+                }
                 released => {
                     SystemPageData.nv_dynamic_boost.val = self.value;
                     SystemPageData.cb_nv_dynamic_boost(Math.round(self.value))
@@ -304,10 +361,16 @@ export component PageSystem inherits Rectangle {
             }
 
             if SystemPageData.nv_temp_target.val != -1: SystemSlider {
-                text: @tr("nv_temp_target" => "dGPU temperature max");
+                text: @tr("nv_temp_target" => "GPU Temperature Limit");
+                title: @tr("nv_temp_target" => "GPU Temperature Limit");
+                help_text: @tr("nv_temp_target_help" => "Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain temperature below this limit.");
                 minimum: SystemPageData.nv_temp_target.min;
                 maximum: SystemPageData.nv_temp_target.max;
                 value: SystemPageData.nv_temp_target.val;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_nv_temp_target();
+                }
                 released => {
                     SystemPageData.nv_temp_target.val = self.value;
                     SystemPageData.cb_nv_temp_target(Math.round(self.value))
@@ -356,39 +419,39 @@ export component PageSystem inherits Rectangle {
 
                         SystemToggle {
                             text: @tr("Change EPP based on Throttle Policy");
-                            checked <=> SystemPageData.throttle_policy_linked_epp;
+                            checked <=> SystemPageData.platform_profile_linked_epp;
                             toggled => {
-                                SystemPageData.cb_throttle_policy_linked_epp(SystemPageData.throttle_policy_linked_epp)
+                                SystemPageData.cb_platform_profile_linked_epp(SystemPageData.platform_profile_linked_epp)
                             }
                         }
 
                         SystemDropdown {
                             text: @tr("EPP for Balanced Policy");
-                            current_index <=> SystemPageData.throttle_balanced_epp;
-                            current_value: SystemPageData.energy_performance_choices[SystemPageData.throttle_balanced_epp];
+                            current_index <=> SystemPageData.profile_balanced_epp;
+                            current_value: SystemPageData.energy_performance_choices[SystemPageData.profile_balanced_epp];
                             model <=> SystemPageData.energy_performance_choices;
                             selected => {
-                                SystemPageData.cb_throttle_balanced_epp(SystemPageData.throttle_balanced_epp)
+                                SystemPageData.cb_profile_balanced_epp(SystemPageData.profile_balanced_epp)
                             }
                         }
 
                         SystemDropdown {
                             text: @tr("EPP for Performance Policy");
-                            current_index <=> SystemPageData.throttle_performance_epp;
-                            current_value: SystemPageData.energy_performance_choices[SystemPageData.throttle_performance_epp];
+                            current_index <=> SystemPageData.profile_performance_epp;
+                            current_value: SystemPageData.energy_performance_choices[SystemPageData.profile_performance_epp];
                             model <=> SystemPageData.energy_performance_choices;
                             selected => {
-                                SystemPageData.cb_throttle_performance_epp(SystemPageData.throttle_performance_epp)
+                                SystemPageData.cb_profile_performance_epp(SystemPageData.profile_performance_epp)
                             }
                         }
 
                         SystemDropdown {
                             text: @tr("EPP for Quiet Policy");
-                            current_index <=> SystemPageData.throttle_quiet_epp;
-                            current_value: SystemPageData.energy_performance_choices[SystemPageData.throttle_quiet_epp];
+                            current_index <=> SystemPageData.profile_quiet_epp;
+                            current_value: SystemPageData.energy_performance_choices[SystemPageData.profile_quiet_epp];
                             model <=> SystemPageData.energy_performance_choices;
                             selected => {
-                                SystemPageData.cb_throttle_quiet_epp(SystemPageData.throttle_quiet_epp)
+                                SystemPageData.cb_profile_quiet_epp(SystemPageData.profile_quiet_epp)
                             }
                         }
                     }
@@ -408,19 +471,19 @@ export component PageSystem inherits Rectangle {
                             spacing: 10px;
                             SystemDropdown {
                                 text: @tr("Throttle Policy on Battery");
-                                current_index <=> SystemPageData.throttle_policy_on_battery;
-                                current_value: SystemPageData.throttle_policy_choices[SystemPageData.throttle_policy_on_battery];
-                                model <=> SystemPageData.throttle_policy_choices;
+                                current_index <=> SystemPageData.platform_profile_on_battery;
+                                current_value: SystemPageData.platform_profile_choices[SystemPageData.platform_profile_on_battery];
+                                model <=> SystemPageData.platform_profile_choices;
                                 selected => {
-                                    SystemPageData.cb_throttle_policy_on_battery(SystemPageData.throttle_policy_on_battery)
+                                    SystemPageData.cb_platform_profile_on_battery(SystemPageData.platform_profile_on_battery)
                                 }
                             }
 
                             SystemToggle {
                                 text: @tr("Enabled");
-                                checked <=> SystemPageData.change_throttle_policy_on_battery;
+                                checked <=> SystemPageData.change_platform_profile_on_battery;
                                 toggled => {
-                                    SystemPageData.cb_change_throttle_policy_on_battery(SystemPageData.change_throttle_policy_on_battery);
+                                    SystemPageData.cb_change_platform_profile_on_battery(SystemPageData.change_platform_profile_on_battery);
                                 }
                             }
                         }
@@ -429,19 +492,19 @@ export component PageSystem inherits Rectangle {
                             spacing: 10px;
                             SystemDropdown {
                                 text: @tr("Throttle Policy on AC");
-                                current_index <=> SystemPageData.throttle_policy_on_ac;
-                                current_value: SystemPageData.throttle_policy_choices[SystemPageData.throttle_policy_on_ac];
-                                model <=> SystemPageData.throttle_policy_choices;
+                                current_index <=> SystemPageData.platform_profile_on_ac;
+                                current_value: SystemPageData.platform_profile_choices[SystemPageData.platform_profile_on_ac];
+                                model <=> SystemPageData.platform_profile_choices;
                                 selected => {
-                                    SystemPageData.cb_throttle_policy_on_ac(SystemPageData.throttle_policy_on_ac)
+                                    SystemPageData.cb_platform_profile_on_ac(SystemPageData.platform_profile_on_ac)
                                 }
                             }
 
                             SystemToggle {
                                 text: @tr("Enabled");
-                                checked <=> SystemPageData.change_throttle_policy_on_ac;
+                                checked <=> SystemPageData.change_platform_profile_on_ac;
                                 toggled => {
-                                    SystemPageData.cb_change_throttle_policy_on_ac(SystemPageData.change_throttle_policy_on_ac);
+                                    SystemPageData.cb_change_platform_profile_on_ac(SystemPageData.change_platform_profile_on_ac);
                                 }
                             }
                         }

rog-control-center/ui/widgets/common.slint

@@ -10,40 +10,46 @@ export component RogItem inherits Rectangle {
 }
 
 export component SystemSlider inherits RogItem {
+    in property <string> title;
     in property <string> text;
     in-out property <float> value;
     in-out property <float> minimum;
     in-out property <float> maximum;
     callback released(int);
 
+    in-out property <string> help_text;
+    in-out property <bool> has_reset: false;
+    callback cb_do_reset();
+
     HorizontalLayout {
         HorizontalLayout {
-            width: 50%;
+            width: 40%;
             alignment: LayoutAlignment.stretch;
             padding-left: 10px;
             TouchArea {
-              clicked => {
-                slider.value += 1;
-                if slider.value > slider.maximum {
-                  slider.value = slider.minimum;
+                clicked => {
+                    slider.value += 1;
+                    if slider.value > slider.maximum {
+                        slider.value = slider.minimum;
+                    }
                 }
-              }
-              HorizontalLayout {
-                spacing: 6px;
-                Text {
-                    font-size: 16px;
-                    vertical-alignment: TextVerticalAlignment.center;
-                    color: Palette.control-foreground;
-                    text <=> root.text;
+                HorizontalLayout {
+                    spacing: 6px;
+                    Text {
+                        font-size: 16px;
+                        vertical-alignment: TextVerticalAlignment.center;
+                        color: Palette.control-foreground;
+                        text <=> root.text;
+                    }
+
+                    Text {
+                        font-size: 16px;
+                        horizontal-alignment: TextHorizontalAlignment.right;
+                        vertical-alignment: TextVerticalAlignment.center;
+                        color: Palette.control-foreground;
+                        text: "\{Math.round(root.value)}";
+                    }
                 }
-                Text {
-                    font-size: 16px;
-                    horizontal-alignment: TextHorizontalAlignment.right;
-                    vertical-alignment: TextVerticalAlignment.center;
-                    color: Palette.control-foreground;
-                    text: "\{Math.round(root.value)}";
-                }
-              }
             }
         }
 
@@ -59,6 +65,96 @@ export component SystemSlider inherits RogItem {
                 }
             }
         }
+
+        help_popup := PopupWindow {
+            x: help.x - self.width + help.width - 10px;
+            y: help.y - self.height + help.height - 10px;
+            Rectangle {
+                drop-shadow-blur: 10px;
+                drop-shadow-color: black;
+                border-radius: 10px;
+                border-color: Palette.accent-background;
+                background: Palette.background;
+                Dialog {
+                    title <=> root.title;
+                    VerticalBox {
+                        Text {
+                            max-width: 420px;
+                            font-size: 18px;
+                            wrap: TextWrap.word-wrap;
+                            horizontal-alignment: TextHorizontalAlignment.center;
+                            text <=> root.title;
+                        }
+
+                        Rectangle {
+                            height: 1px;
+                            border-color: black;
+                            border-width: 1px;
+                        }
+
+                        Text {
+                            max-width: 420px;
+                            font-size: 16px;
+                            wrap: TextWrap.word-wrap;
+                            text <=> root.help_text;
+                        }
+                    }
+
+                    StandardButton {
+                        kind: ok;
+                    }
+                }
+            }
+        }
+
+        help := HorizontalBox {
+            if (help_text != ""): StandardButton {
+                kind: StandardButtonKind.help;
+                clicked => {
+                    help_popup.show();
+                }
+            }
+        }
+
+        reset_popup := PopupWindow {
+            x: reset.x - self.width + reset.width;
+            y: reset.y - self.height + reset.height;
+            Rectangle {
+                drop-shadow-blur: 10px;
+                drop-shadow-color: black;
+                border-radius: 10px;
+                border-color: Palette.accent-background;
+                background: Palette.background;
+                Dialog {
+                    Text {
+                        max-width: 420px;
+                        font-size: 16px;
+                        wrap: TextWrap.word-wrap;
+                        text: @tr("confirm_reset" => "Are you sure you want to reset this?");
+                    }
+
+                    StandardButton {
+                        kind: ok;
+                        clicked => {
+                            root.cb_do_reset();
+                        }
+                    }
+
+                    StandardButton {
+                        kind: cancel;
+                    }
+                }
+            }
+        }
+
+        reset := HorizontalBox {
+            if (has_reset): StandardButton {
+                kind: StandardButtonKind.reset;
+                clicked => {
+                    reset_popup.show();
+                }
+            }
+        }
     }
 }
 
@@ -114,7 +210,7 @@ export component SystemToggleInt inherits RogItem {
             alignment: LayoutAlignment.end;
             padding-right: 20px;
             Switch {
-              checked: root.checked_int != 0;
+                checked: root.checked_int != 0;
                 toggled => {
                     root.checked_int = self.checked ? 1 : 0;
                     root.toggled(root.checked_int);

rog-dbus/src/asus_armoury.rs

@@ -48,4 +48,6 @@ pub trait AsusArmoury {
     /// take. Returns `-1` if not used or set.
     #[zbus(property)]
     fn scalar_increment(&self) -> zbus::Result<i32>;
+
+    async fn restore_default(&self) -> zbus::Result<()>;
 }

rog-dbus/src/zbus_fan_curves.rs

@@ -20,7 +20,7 @@
 //!
 //! …consequently `zbus-xmlgen` did not generate code for the above interfaces.
 
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::FanCurvePU;
 use zbus::proxy;
@@ -32,30 +32,30 @@ use zbus::proxy;
 )]
 pub trait FanCurves {
     /// Get the fan-curve data for the currently active PlatformProfile
-    fn fan_curve_data(&self, profile: ThrottlePolicy) -> zbus::Result<Vec<CurveData>>;
+    fn fan_curve_data(&self, profile: PlatformProfile) -> zbus::Result<Vec<CurveData>>;
 
     /// Reset the stored (self) and device curve to the defaults of the
     /// platform.
     ///
     /// Each platform_profile has a different default and the defualt can be
     /// read only for the currently active profile.
-    fn reset_profile_curves(&self, profile: ThrottlePolicy) -> zbus::Result<()>;
+    fn reset_profile_curves(&self, profile: PlatformProfile) -> zbus::Result<()>;
 
     /// SetActiveCurveToDefaults method
-    fn set_curves_to_defaults(&self, profile: ThrottlePolicy) -> zbus::Result<()>;
+    fn set_curves_to_defaults(&self, profile: PlatformProfile) -> zbus::Result<()>;
 
     /// Set the fan curve for the specified profile, or the profile the user is
     /// currently in if profile == None. Will also activate the fan curve.
-    fn set_fan_curve(&self, profile: ThrottlePolicy, curve: CurveData) -> zbus::Result<()>;
+    fn set_fan_curve(&self, profile: PlatformProfile, curve: CurveData) -> zbus::Result<()>;
 
     /// Set a profile fan curve enabled status. Will also activate a fan curve.
-    fn set_fan_curves_enabled(&self, profile: ThrottlePolicy, enabled: bool) -> zbus::Result<()>;
+    fn set_fan_curves_enabled(&self, profile: PlatformProfile, enabled: bool) -> zbus::Result<()>;
 
     /// Set a single fan curve for a profile to enabled status. Will also
     /// activate a fan curve.
     async fn set_profile_fan_curve_enabled(
         &self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         fan: FanCurvePU,
         enabled: bool
     ) -> zbus::Result<()>;

rog-dbus/src/zbus_platform.rs

@@ -21,7 +21,7 @@
 //! …consequently `zbus-xmlgen` did not generate code for the above interfaces.
 
 use rog_platform::cpu::CPUEPP;
-use rog_platform::platform::{Properties, ThrottlePolicy};
+use rog_platform::platform::{PlatformProfile, Properties};
 use zbus::proxy;
 
 #[proxy(
@@ -34,7 +34,7 @@ pub trait Platform {
     fn version(&self) -> zbus::Result<String>;
 
     /// NextThrottleThermalPolicy method
-    fn next_throttle_thermal_policy(&self) -> zbus::Result<()>;
+    fn next_platform_profile(&self) -> zbus::Result<()>;
 
     /// SupportedProperties method
     fn supported_properties(&self) -> zbus::Result<Vec<Properties>>;
@@ -50,55 +50,58 @@ pub trait Platform {
 
     /// ThrottleBalancedEpp property
     #[zbus(property)]
-    fn throttle_balanced_epp(&self) -> zbus::Result<CPUEPP>;
+    fn profile_balanced_epp(&self) -> zbus::Result<CPUEPP>;
     #[zbus(property)]
-    fn set_throttle_balanced_epp(&self, epp: CPUEPP) -> zbus::Result<()>;
+    fn set_profile_balanced_epp(&self, epp: CPUEPP) -> zbus::Result<()>;
 
     /// ThrottlePerformanceEpp property
     #[zbus(property)]
-    fn throttle_performance_epp(&self) -> zbus::Result<CPUEPP>;
+    fn profile_performance_epp(&self) -> zbus::Result<CPUEPP>;
     #[zbus(property)]
-    fn set_throttle_performance_epp(&self, epp: CPUEPP) -> zbus::Result<()>;
+    fn set_profile_performance_epp(&self, epp: CPUEPP) -> zbus::Result<()>;
 
     /// ThrottlePolicyLinkedEpp property
     #[zbus(property)]
-    fn throttle_policy_linked_epp(&self) -> zbus::Result<bool>;
+    fn platform_profile_linked_epp(&self) -> zbus::Result<bool>;
     #[zbus(property)]
-    fn set_throttle_policy_linked_epp(&self, value: bool) -> zbus::Result<()>;
+    fn set_platform_profile_linked_epp(&self, value: bool) -> zbus::Result<()>;
 
     /// ThrottlePolicyOnAc property
     #[zbus(property)]
-    fn throttle_policy_on_ac(&self) -> zbus::Result<ThrottlePolicy>;
+    fn platform_profile_on_ac(&self) -> zbus::Result<PlatformProfile>;
     #[zbus(property)]
-    fn set_throttle_policy_on_ac(&self, throttle_policy: ThrottlePolicy) -> zbus::Result<()>;
+    fn set_platform_profile_on_ac(&self, platform_profile: PlatformProfile) -> zbus::Result<()>;
 
     /// ChangeThrottlePolicyOnAc property
     #[zbus(property)]
-    fn change_throttle_policy_on_ac(&self) -> zbus::Result<bool>;
+    fn change_platform_profile_on_ac(&self) -> zbus::Result<bool>;
     #[zbus(property)]
-    fn set_change_throttle_policy_on_ac(&self, change: bool) -> zbus::Result<()>;
+    fn set_change_platform_profile_on_ac(&self, change: bool) -> zbus::Result<()>;
 
     /// ThrottlePolicyOnBattery property
     #[zbus(property)]
-    fn throttle_policy_on_battery(&self) -> zbus::Result<ThrottlePolicy>;
+    fn platform_profile_on_battery(&self) -> zbus::Result<PlatformProfile>;
     #[zbus(property)]
-    fn set_throttle_policy_on_battery(&self, throttle_policy: ThrottlePolicy) -> zbus::Result<()>;
+    fn set_platform_profile_on_battery(
+        &self,
+        platform_profile: PlatformProfile
+    ) -> zbus::Result<()>;
 
     /// ChangeThrottlePolicyOnAc property
     #[zbus(property)]
-    fn change_throttle_policy_on_battery(&self) -> zbus::Result<bool>;
+    fn change_platform_profile_on_battery(&self) -> zbus::Result<bool>;
     #[zbus(property)]
-    fn set_change_throttle_policy_on_battery(&self, change: bool) -> zbus::Result<()>;
+    fn set_change_platform_profile_on_battery(&self, change: bool) -> zbus::Result<()>;
 
     /// ThrottleQuietEpp property
     #[zbus(property)]
-    fn throttle_quiet_epp(&self) -> zbus::Result<CPUEPP>;
+    fn profile_quiet_epp(&self) -> zbus::Result<CPUEPP>;
     #[zbus(property)]
-    fn set_throttle_quiet_epp(&self, epp: CPUEPP) -> zbus::Result<()>;
+    fn set_profile_quiet_epp(&self, epp: CPUEPP) -> zbus::Result<()>;
 
     /// ThrottlePolicy property
     #[zbus(property)]
-    fn throttle_thermal_policy(&self) -> zbus::Result<ThrottlePolicy>;
+    fn platform_profile(&self) -> zbus::Result<PlatformProfile>;
     #[zbus(property)]
-    fn set_throttle_thermal_policy(&self, throttle_policy: ThrottlePolicy) -> zbus::Result<()>;
+    fn set_platform_profile(&self, platform_profile: PlatformProfile) -> zbus::Result<()>;
 }

rog-platform/src/asus_armoury.rs

@@ -76,11 +76,11 @@ impl Attribute {
     }
 
     /// Write the `current_value` directly to the attribute path
-    pub fn set_current_value(&self, new_value: AttrValue) -> Result<(), PlatformError> {
+    pub fn set_current_value(&self, new_value: &AttrValue) -> Result<(), PlatformError> {
         let path = self.base_path.join("current_value");
 
         let value_str = match new_value {
-            AttrValue::Integer(val) => val.to_string(),
+            AttrValue::Integer(val) => &val.to_string(),
             AttrValue::String(val) => val,
             _ => return Err(PlatformError::InvalidValue)
         };
@@ -94,6 +94,10 @@ impl Attribute {
         &self.default_value
     }
 
+    pub fn restore_default(&self) -> Result<(), PlatformError> {
+        self.set_current_value(&self.default_value)
+    }
+
     pub fn possible_values(&self) -> &AttrValue {
         &self.possible_values
     }
@@ -178,6 +182,7 @@ impl Attribute {
     }
 }
 
+#[derive(Clone)]
 pub struct FirmwareAttributes {
     attrs: Vec<Attribute>
 }
@@ -304,7 +309,6 @@ impl FirmwareAttribute {
                 | FirmwareAttribute::PptPlatformSppt
                 | FirmwareAttribute::NvDynamicBoost
                 | FirmwareAttribute::NvTempTarget
-                | FirmwareAttribute::DgpuBaseTgp
                 | FirmwareAttribute::DgpuTgp
         )
     }
@@ -452,6 +456,6 @@ mod tests {
         if let AttrValue::Integer(val) = &mut val {
             *val = 0;
         }
-        attr.set_current_value(val).unwrap();
+        attr.set_current_value(&val).unwrap();
     }
 }

rog-platform/src/cpu.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use zbus::zvariant::{OwnedValue, Type, Value};
 
 use crate::error::{PlatformError, Result};
-use crate::platform::ThrottlePolicy;
+use crate::platform::PlatformProfile;
 use crate::{read_attr_string, to_device};
 
 const ATTR_AVAILABLE_GOVERNORS: &str = "cpufreq/scaling_available_governors";
@@ -201,12 +201,12 @@ pub enum CPUEPP {
     Power = 4
 }
 
-impl From<ThrottlePolicy> for CPUEPP {
-    fn from(value: ThrottlePolicy) -> Self {
+impl From<PlatformProfile> for CPUEPP {
+    fn from(value: PlatformProfile) -> Self {
         match value {
-            ThrottlePolicy::Balanced => CPUEPP::BalancePerformance,
-            ThrottlePolicy::Performance => CPUEPP::Performance,
-            ThrottlePolicy::Quiet => CPUEPP::Power
+            PlatformProfile::Balanced => CPUEPP::BalancePerformance,
+            PlatformProfile::Performance => CPUEPP::Performance,
+            PlatformProfile::Quiet => CPUEPP::Power
         }
     }
 }

rog-platform/src/platform.rs

@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use zbus::zvariant::{OwnedValue, Type, Value};
 
 use crate::error::{PlatformError, Result};
-use crate::{attr_string, attr_u8, to_device};
+use crate::{attr_string, to_device};
 
 /// The "platform" device provides access to things like:
 /// - `dgpu_disable`
@@ -24,13 +24,6 @@ pub struct RogPlatform {
 }
 
 impl RogPlatform {
-    attr_u8!(
-        /// This is technically the same as `platform_profile` since both are
-        /// tied in-kernel
-        "throttle_thermal_policy",
-        path
-    );
-
     attr_string!(
         /// The acpi platform_profile support
         "platform_profile",
@@ -193,15 +186,15 @@ impl Display for GpuMode {
     Copy,
 )]
 #[zvariant(signature = "u")]
-/// `throttle_thermal_policy` in asus_wmi
-pub enum ThrottlePolicy {
+/// `platform_profile` in asus_wmi
+pub enum PlatformProfile {
     #[default]
     Balanced = 0,
     Performance = 1,
     Quiet = 2
 }
 
-impl ThrottlePolicy {
+impl PlatformProfile {
     pub const fn next(self) -> Self {
         match self {
             Self::Balanced => Self::Performance,
@@ -219,7 +212,7 @@ impl ThrottlePolicy {
     }
 }
 
-impl From<u8> for ThrottlePolicy {
+impl From<u8> for PlatformProfile {
     fn from(num: u8) -> Self {
         match num {
             0 => Self::Balanced,
@@ -233,52 +226,74 @@ impl From<u8> for ThrottlePolicy {
     }
 }
 
-impl From<i32> for ThrottlePolicy {
+impl From<i32> for PlatformProfile {
     fn from(num: i32) -> Self {
         (num as u8).into()
     }
 }
 
-impl From<ThrottlePolicy> for u8 {
-    fn from(p: ThrottlePolicy) -> Self {
+impl From<PlatformProfile> for u8 {
+    fn from(p: PlatformProfile) -> Self {
         match p {
-            ThrottlePolicy::Balanced => 0,
-            ThrottlePolicy::Performance => 1,
-            ThrottlePolicy::Quiet => 2
+            PlatformProfile::Balanced => 0,
+            PlatformProfile::Performance => 1,
+            PlatformProfile::Quiet => 2
         }
     }
 }
 
-impl From<ThrottlePolicy> for i32 {
-    fn from(p: ThrottlePolicy) -> Self {
+impl From<PlatformProfile> for i32 {
+    fn from(p: PlatformProfile) -> Self {
         <u8>::from(p) as i32
     }
 }
 
-impl From<ThrottlePolicy> for &str {
-    fn from(profile: ThrottlePolicy) -> &'static str {
+impl From<PlatformProfile> for &str {
+    fn from(profile: PlatformProfile) -> &'static str {
         match profile {
-            ThrottlePolicy::Balanced => "balanced",
-            ThrottlePolicy::Performance => "performance",
-            ThrottlePolicy::Quiet => "quiet"
+            PlatformProfile::Balanced => "balanced",
+            PlatformProfile::Performance => "performance",
+            PlatformProfile::Quiet => "quiet"
         }
     }
 }
 
-impl std::str::FromStr for ThrottlePolicy {
+impl From<String> for PlatformProfile {
+    fn from(profile: String) -> Self {
+        Self::from(&profile)
+    }
+}
+
+impl From<&String> for PlatformProfile {
+    fn from(profile: &String) -> Self {
+        match profile.to_ascii_lowercase().trim() {
+            "balanced" => PlatformProfile::Balanced,
+            "performance" => PlatformProfile::Performance,
+            "quiet" => PlatformProfile::Quiet,
+            "low-power" => PlatformProfile::Quiet,
+            _ => {
+                warn!("{profile} is unknown, using ThrottlePolicy::Balanced");
+                PlatformProfile::Balanced
+            }
+        }
+    }
+}
+
+impl std::str::FromStr for PlatformProfile {
     type Err = PlatformError;
 
     fn from_str(profile: &str) -> Result<Self> {
         match profile.to_ascii_lowercase().trim() {
-            "balanced" => Ok(ThrottlePolicy::Balanced),
-            "performance" => Ok(ThrottlePolicy::Performance),
-            "quiet" => Ok(ThrottlePolicy::Quiet),
+            "balanced" => Ok(PlatformProfile::Balanced),
+            "performance" => Ok(PlatformProfile::Performance),
+            "quiet" => Ok(PlatformProfile::Quiet),
+            "low-power" => Ok(PlatformProfile::Quiet),
             _ => Err(PlatformError::NotSupported)
         }
     }
 }
 
-impl Display for ThrottlePolicy {
+impl Display for PlatformProfile {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{:?}", self)
     }

rog-profiles/src/lib.rs

@@ -4,7 +4,7 @@ pub mod fan_curve_set;
 use error::ProfileError;
 use fan_curve_set::CurveData;
 use log::debug;
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 use serde::{Deserialize, Serialize};
 pub use udev::Device;
 #[cfg(feature = "dbus")]
@@ -125,7 +125,7 @@ impl FanCurveProfiles {
 
     pub fn read_from_dev_profile(
         &mut self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         device: &Device
     ) -> Result<(), ProfileError> {
         let fans = Self::supported_fans()?;
@@ -143,9 +143,9 @@ impl FanCurveProfiles {
         }
 
         match profile {
-            ThrottlePolicy::Balanced => self.balanced = curves,
-            ThrottlePolicy::Performance => self.performance = curves,
-            ThrottlePolicy::Quiet => self.quiet = curves
+            PlatformProfile::Balanced => self.balanced = curves,
+            PlatformProfile::Performance => self.performance = curves,
+            PlatformProfile::Quiet => self.quiet = curves
         }
         Ok(())
     }
@@ -157,7 +157,7 @@ impl FanCurveProfiles {
     /// read only for the currently active profile.
     pub fn set_active_curve_to_defaults(
         &mut self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         device: &mut Device
     ) -> Result<(), ProfileError> {
         let fans = Self::supported_fans()?;
@@ -175,13 +175,13 @@ impl FanCurveProfiles {
     /// in the enabled list it will become active.
     pub fn write_profile_curve_to_platform(
         &mut self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         device: &mut Device
     ) -> Result<(), ProfileError> {
         let fans = match profile {
-            ThrottlePolicy::Balanced => &mut self.balanced,
-            ThrottlePolicy::Performance => &mut self.performance,
-            ThrottlePolicy::Quiet => &mut self.quiet
+            PlatformProfile::Balanced => &mut self.balanced,
+            PlatformProfile::Performance => &mut self.performance,
+            PlatformProfile::Quiet => &mut self.quiet
         };
         for fan in fans.iter().filter(|f| !f.enabled) {
             debug!("write_profile_curve_to_platform: writing profile:{profile}, {fan:?}");
@@ -196,19 +196,19 @@ impl FanCurveProfiles {
         Ok(())
     }
 
-    pub fn set_profile_curves_enabled(&mut self, profile: ThrottlePolicy, enabled: bool) {
+    pub fn set_profile_curves_enabled(&mut self, profile: PlatformProfile, enabled: bool) {
         match profile {
-            ThrottlePolicy::Balanced => {
+            PlatformProfile::Balanced => {
                 for curve in self.balanced.iter_mut() {
                     curve.enabled = enabled;
                 }
             }
-            ThrottlePolicy::Performance => {
+            PlatformProfile::Performance => {
                 for curve in self.performance.iter_mut() {
                     curve.enabled = enabled;
                 }
             }
-            ThrottlePolicy::Quiet => {
+            PlatformProfile::Quiet => {
                 for curve in self.quiet.iter_mut() {
                     curve.enabled = enabled;
                 }
@@ -218,12 +218,12 @@ impl FanCurveProfiles {
 
     pub fn set_profile_fan_curve_enabled(
         &mut self,
-        profile: ThrottlePolicy,
+        profile: PlatformProfile,
         fan: FanCurvePU,
         enabled: bool
     ) {
         match profile {
-            ThrottlePolicy::Balanced => {
+            PlatformProfile::Balanced => {
                 for curve in self.balanced.iter_mut() {
                     if curve.fan == fan {
                         curve.enabled = enabled;
@@ -231,7 +231,7 @@ impl FanCurveProfiles {
                     }
                 }
             }
-            ThrottlePolicy::Performance => {
+            PlatformProfile::Performance => {
                 for curve in self.performance.iter_mut() {
                     if curve.fan == fan {
                         curve.enabled = enabled;
@@ -239,7 +239,7 @@ impl FanCurveProfiles {
                     }
                 }
             }
-            ThrottlePolicy::Quiet => {
+            PlatformProfile::Quiet => {
                 for curve in self.quiet.iter_mut() {
                     if curve.fan == fan {
                         curve.enabled = enabled;
@@ -250,31 +250,31 @@ impl FanCurveProfiles {
         }
     }
 
-    pub fn get_fan_curves_for(&self, name: ThrottlePolicy) -> &[CurveData] {
+    pub fn get_fan_curves_for(&self, name: PlatformProfile) -> &[CurveData] {
         match name {
-            ThrottlePolicy::Balanced => &self.balanced,
-            ThrottlePolicy::Performance => &self.performance,
-            ThrottlePolicy::Quiet => &self.quiet
+            PlatformProfile::Balanced => &self.balanced,
+            PlatformProfile::Performance => &self.performance,
+            PlatformProfile::Quiet => &self.quiet
         }
     }
 
-    pub fn get_fan_curve_for(&self, name: &ThrottlePolicy, pu: FanCurvePU) -> Option<&CurveData> {
+    pub fn get_fan_curve_for(&self, name: &PlatformProfile, pu: FanCurvePU) -> Option<&CurveData> {
         match name {
-            ThrottlePolicy::Balanced => {
+            PlatformProfile::Balanced => {
                 for this_curve in self.balanced.iter() {
                     if this_curve.fan == pu {
                         return Some(this_curve);
                     }
                 }
             }
-            ThrottlePolicy::Performance => {
+            PlatformProfile::Performance => {
                 for this_curve in self.performance.iter() {
                     if this_curve.fan == pu {
                         return Some(this_curve);
                     }
                 }
             }
-            ThrottlePolicy::Quiet => {
+            PlatformProfile::Quiet => {
                 for this_curve in self.quiet.iter() {
                     if this_curve.fan == pu {
                         return Some(this_curve);
@@ -288,10 +288,10 @@ impl FanCurveProfiles {
     pub fn save_fan_curve(
         &mut self,
         curve: CurveData,
-        profile: ThrottlePolicy
+        profile: PlatformProfile
     ) -> Result<(), ProfileError> {
         match profile {
-            ThrottlePolicy::Balanced => {
+            PlatformProfile::Balanced => {
                 for this_curve in self.balanced.iter_mut() {
                     if this_curve.fan == curve.fan {
                         *this_curve = curve;
@@ -299,7 +299,7 @@ impl FanCurveProfiles {
                     }
                 }
             }
-            ThrottlePolicy::Performance => {
+            PlatformProfile::Performance => {
                 for this_curve in self.performance.iter_mut() {
                     if this_curve.fan == curve.fan {
                         *this_curve = curve;
@@ -307,7 +307,7 @@ impl FanCurveProfiles {
                     }
                 }
             }
-            ThrottlePolicy::Quiet => {
+            PlatformProfile::Quiet => {
                 for this_curve in self.quiet.iter_mut() {
                     if this_curve.fan == curve.fan {
                         *this_curve = curve;