Prep new release

Fix GUI taking 100% of CPU core

Closes #480

See merge request asus-linux/asusctl!189

.cargo-husky/hooks/pre-commit

@@ -12,7 +12,7 @@ echo '+cargo clippy --all -- -D warnings'
 cargo clippy --all -- -D warnings
 
 echo '+cargo test --all'
-cargo test --all
+cargo test --all -- --test-threads=1
 
 echo '+cargo cranky'
-cargo cranky
+cargo cranky

.gitlab-ci.yml

@@ -52,7 +52,7 @@ test:
   <<: *rust_cache
   script:
     - mkdir -p .git/hooks > /dev/null
-    - cargo test --all
+    - cargo test --all -- --test-threads=1
 
 release:
   only:

CHANGELOG.md

@@ -7,6 +7,67 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v6.0.9]
+
+### Added
+
+- Add G513RS to laptop DB.
+- Add G512LI to laptop DB.
+
+### Changed
+
+- Rename and recreate the default Anime config if cache setup fails
+
+### Fixed
+
+- Nuke the issue of GUI taking 100% of a CPU core
+
+## [v6.0.8]
+
+### Added
+- Add G512L laptop DB entry
+
+### Changed
+- Add more tests to verify things
+
+### Fix
+- asusctl incorrectly assumes fan-curves unsupported. Now fixed.
+- try to fix ROGCC using CPU time.
+
+## [v6.0.7]
+
+### Changed
+
+- Add a config option to set if throttle policy is changed on ac/bat change (UI only)
+- Allow X11 GUI. This is *not* supported. Please see readme.
+- Fixes to some GUI widget layouts and sizing
+- Do a backup HID raw write fro brightness if the read-back value does not match. This is a temporary solve for some G14 and G16 until the kernel patch is ready.
+- Reimplement the older 0x1866 MCU keyboard control power bits plus UI control for it. If you had a keyboard affected by Lightbar issues and it is older than a couple of years this should help. If not, please file a bug.
+
+## [v6.0.6]
+
+### Added
+- Add GX650R laptop to aura DB
+
+### Changed
+- Further tweaks to aura init
+- More logging
+- Fix TUF laptop led power
+- Sanitize the dbus path for aura devices (remove `.` chars)
+- Even more error handling (gracefully)
+- Better checking for dbus interfaces
+- Remove dbus `supported_interfaces`
+- dbus ObjectManager is now at root `/`
+
+## [v6.0.5]
+
+### Changed
+
+- Better more robust error handling in ROGCC
+- Try to better handle pre-2021 laptops with lightbar
+- Add more logging to try and trace the charge_control_end_threshold issue
+- Make `kbd_brightness` optional to work around issues on some laptops that seem to lack it. Likely this will all need a refactor *again* if work proceeds in kernel for better RGB support.
+
 ## [v6.0.4]
 
 ### Changed

Cargo.toml

@@ -1,4 +1,16 @@
+[workspace.package]
+version = "6.0.9"
+rust-version = "1.77"
+license = "MPL-2.0"
+readme = "README.md"
+authors = ["Luke <luke@ljones.dev>"]
+repository = "https://gitlab.com/asus-linux/asusctl"
+homepage = "https://gitlab.com/asus-linux/asusctl"
+description = "Laptop feature control for ASUS ROG laptops and others"
+edition = "2021"
+
 [workspace]
+resolver = "2"
 members = [
     "asusctl",
     "asusd",
@@ -22,18 +34,6 @@ default-members = [
     "cpuctl",
     "rog-control-center",
 ]
-resolver = "2"
-
-[workspace.package]
-version = "6.0.4"
-rust-version = "1.77"
-license = "MPL-2.0"
-readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
-repository = "https://gitlab.com/asus-linux/asusctl"
-homepage = "https://gitlab.com/asus-linux/asusctl"
-description = "Laptop feature control for ASUS ROG laptops and others"
-edition = "2021"
 
 [workspace.dependencies]
 tokio = { version = "^1.36.0", default-features = false, features = [
@@ -47,8 +47,8 @@ dirs = "^4.0"
 smol = "^1.3"
 mio = "0.8.11"
 
-zbus = "4.1"
-logind-zbus = { version = "4.0.2" } #, default-features = false, features = ["non_blocking"] }
+zbus = "4.2"
+logind-zbus = { version = "4.0.3" } #, default-features = false, features = ["non_blocking"] }
 
 serde = "^1.0"
 serde_derive = "^1.0"

Makefile

@@ -23,10 +23,10 @@ STRIP_BINARIES ?= 0
 
 DEBUG ?= 0
 ifeq ($(DEBUG),0)
-	ARGS += --release
+	ARGS += --release --features "rog-control-center/x11"
 	TARGET = release
 else
-	ARGS += --profile dev
+	ARGS += --profile dev --features "rog-control-center/x11"
 	TARGET = debug
 endif
 

README.md

@@ -15,6 +15,10 @@ Now includes a GUI, `rog-control-center`.
 
 Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t)
 
+## X11 support
+
+X11 is not supported at all, as in I will not help you with X11 issues if there are any due to limited time and it being unmaintained itself. You can however build `rog-control-center` with it enabled `cargo build --features "rog-control-center/x11"`.
+
 ## Goals
 
 The main goal of this work is to provide a safe and easy to use abstraction over various laptop features via DBUS, and to provide some helpful defaults and other behaviour such as toggling throttle/profile on AC/battery change.
@@ -72,6 +76,8 @@ The list is a bit outdated as many features have been enabled in the Linux kerne
 
 A gui is now in the repo - ROG Control Center. At this time it is still a WIP, but it has almost all features in place already.
 
+**NOTE**: Xorg is not supported.
+
 # BUILDING
 
 Rust and cargo are required, they can be installed from [rustup.rs](https://rustup.rs/) or from the distro repos if newer than 1.75.

asusctl/src/main.rs

@@ -5,7 +5,6 @@ use std::process::Command;
 use std::thread::sleep;
 
 use anime_cli::{AnimeActions, AnimeCommand};
-use asusd::ctrl_fancurves::FAN_CURVE_ZBUS_NAME;
 use aura_cli::{LedPowerCommand1, LedPowerCommand2};
 use dmi_id::DMIID;
 use fan_curve_cli::FanCurveCommand;
@@ -14,6 +13,7 @@ use rog_anime::usb::get_anime_type;
 use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2};
 use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower};
 use rog_aura::{self, AuraDeviceType, AuraEffect, PowerZones};
+use rog_dbus::list_iface_blocking;
 use rog_dbus::zbus_anime::AnimeProxyBlocking;
 use rog_dbus::zbus_aura::AuraProxyBlocking;
 use rog_dbus::zbus_fan_curves::FanCurvesProxyBlocking;
@@ -65,7 +65,7 @@ fn main() {
         }
 
         let supported_properties = platform_proxy.supported_properties().unwrap();
-        let supported_interfaces = platform_proxy.supported_interfaces().unwrap();
+        let supported_interfaces = list_iface_blocking().unwrap();
 
         if parsed.version {
             println!("asusctl v{}", env!("CARGO_PKG_VERSION"));
@@ -89,7 +89,10 @@ fn print_error_help(
     print_info();
     println!();
     println!("Supported interfaces:\n\n{:#?}\n", supported_interfaces);
-    println!("Supported properties:\n\n{:#?}\n", supported_properties);
+    println!(
+        "Supported properties on Platform:\n\n{:#?}\n",
+        supported_properties
+    );
 }
 
 fn print_info() {
@@ -120,12 +123,8 @@ fn check_service(name: &str) -> bool {
 
 fn find_aura_iface() -> Result<Vec<AuraProxyBlocking<'static>>, Box<dyn std::error::Error>> {
     let conn = zbus::blocking::Connection::system().unwrap();
-    let f = zbus::blocking::fdo::ObjectManagerProxy::new(
-        &conn,
-        "org.asuslinux.Daemon",
-        "/org/asuslinux",
-    )
-    .unwrap();
+    let f =
+        zbus::blocking::fdo::ObjectManagerProxy::new(&conn, "org.asuslinux.Daemon", "/").unwrap();
     let interfaces = f.get_managed_objects().unwrap();
     let mut aura_paths = Vec::new();
     for v in interfaces.iter() {
@@ -172,7 +171,7 @@ fn do_parsed(
             handle_throttle_profile(&conn, supported_properties, cmd)?
         }
         Some(CliCommand::FanCurve(cmd)) => {
-            handle_fan_curve(&conn, supported_interfaces, cmd)?;
+            handle_fan_curve(&conn, cmd)?;
         }
         Some(CliCommand::Graphics(_)) => do_gfx(),
         Some(CliCommand::Anime(cmd)) => handle_anime(&conn, cmd)?,
@@ -203,6 +202,31 @@ fn do_parsed(
                     };
                     let commands: Vec<String> = cmdlist.lines().map(|s| s.to_owned()).collect();
                     for command in commands.iter().filter(|command| {
+                        if command.trim().starts_with("fan-curve")
+                            && !supported_interfaces
+                                .contains(&"org.asuslinux.FanCurves".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("anime")
+                            && !supported_interfaces.contains(&"org.asuslinux.Anime".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("slash")
+                            && !supported_interfaces.contains(&"org.asuslinux.Slash".to_string())
+                        {
+                            return false;
+                        }
+
+                        if command.trim().starts_with("bios")
+                            && !supported_interfaces.contains(&"org.asuslinux.Platform".to_string())
+                        {
+                            return false;
+                        }
+
                         if !dev_type.is_old_laptop()
                             && !dev_type.is_tuf_laptop()
                             && command.trim().starts_with("led-pow-1")
@@ -645,25 +669,28 @@ fn handle_led_power_1_do_1866(
     aura: &AuraProxyBlocking,
     power: &LedPowerCommand1,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let zone = if power.keyboard && power.lightbar {
-        PowerZones::KeyboardAndLightbar
-    } else if power.lightbar {
-        PowerZones::Lightbar
-    } else {
-        PowerZones::Keyboard
-    };
-    let states = LaptopAuraPower {
-        states: vec![AuraPowerState {
-            zone,
+    let mut states = Vec::new();
+    if power.keyboard {
+        states.push(AuraPowerState {
+            zone: PowerZones::Keyboard,
             boot: power.boot.unwrap_or_default(),
             awake: power.awake.unwrap_or_default(),
             sleep: power.sleep.unwrap_or_default(),
             shutdown: false,
-        }],
-    };
+        });
+    }
+    if power.lightbar {
+        states.push(AuraPowerState {
+            zone: PowerZones::Lightbar,
+            boot: power.boot.unwrap_or_default(),
+            awake: power.awake.unwrap_or_default(),
+            sleep: power.sleep.unwrap_or_default(),
+            shutdown: false,
+        });
+    }
 
+    let states = LaptopAuraPower { states };
     aura.set_led_power(states)?;
-
     Ok(())
 }
 
@@ -779,13 +806,13 @@ fn handle_throttle_profile(
 
 fn handle_fan_curve(
     conn: &Connection,
-    supported: &[String],
     cmd: &FanCurveCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    if !supported.contains(&FAN_CURVE_ZBUS_NAME.to_string()) {
-        println!("Fan-curves not supported by either this kernel or by the laptop.");
+    let Ok(fan_proxy) = FanCurvesProxyBlocking::new(conn).map_err(|e| {
+        println!("Fan-curves not supported by either this kernel or by the laptop: {e:?}");
+    }) else {
         return Err(ProfileError::NotSupported.into());
-    }
+    };
 
     if !cmd.get_enabled && !cmd.default && cmd.mod_profile.is_none() {
         if !cmd.help {
@@ -810,7 +837,6 @@ fn handle_fan_curve(
     }
 
     let plat_proxy = PlatformProxyBlocking::new(conn)?;
-    let fan_proxy = FanCurvesProxyBlocking::new(conn)?;
     if cmd.get_enabled {
         let profile = plat_proxy.throttle_thermal_policy()?;
         let curves = fan_proxy.fan_curve_data(profile)?;

asusd-user/Cargo.toml

@@ -12,6 +12,10 @@ edition.workspace = true
 name = "asusd-user"
 path = "src/daemon.rs"
 
+[features]
+default = []
+local_data = []
+
 [dependencies]
 dirs.workspace = true
 smol.workspace = true

asusd-user/src/daemon.rs

@@ -11,8 +11,7 @@ use rog_aura::aura_detection::LedSupportData;
 use rog_aura::keyboard::KeyLayout;
 use rog_dbus::zbus_anime::AnimeProxyBlocking;
 use rog_dbus::zbus_aura::AuraProxyBlocking;
-use rog_dbus::zbus_platform::PlatformProxyBlocking;
-use rog_dbus::DBUS_NAME;
+use rog_dbus::{list_iface_blocking, DBUS_NAME};
 use smol::Executor;
 use zbus::Connection;
 
@@ -36,18 +35,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("rog-platform v{}", rog_platform::VERSION);
 
     let conn = zbus::blocking::Connection::system().unwrap();
-    let platform_proxy = PlatformProxyBlocking::new(&conn).unwrap();
 
-    let supported = platform_proxy
-        .supported_interfaces()
-        .unwrap_or_default()
-        .contains(&"Anime".to_string());
+    let supported = list_iface_blocking()?;
     let config = ConfigBase::new().load();
     let executor = Executor::new();
 
     let early_return = Arc::new(AtomicBool::new(false));
     // Set up the anime data and run loop/thread
-    if supported {
+    if supported.contains(&"org.asuslinux.Anime".to_string()) {
         if let Some(cfg) = config.active_anime {
             let anime_type = get_anime_type()?;
             let anime_config = ConfigAnime::new().set_name(cfg).load();

asusd/src/config.rs

@@ -1,4 +1,4 @@
-use config_traits::{StdConfig, StdConfigLoad3};
+use config_traits::{StdConfig, StdConfigLoad1};
 use rog_platform::cpu::CPUEPP;
 use rog_platform::platform::ThrottlePolicy;
 use serde_derive::{Deserialize, Serialize};
@@ -22,8 +22,12 @@ pub struct Config {
     pub throttle_policy_linked_epp: bool,
     /// Which throttle/profile to use on battery power
     pub throttle_policy_on_battery: ThrottlePolicy,
+    /// 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
@@ -68,7 +72,9 @@ impl Default for Config {
             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,
@@ -106,7 +112,7 @@ impl StdConfig for Config {
     }
 }
 
-impl StdConfigLoad3<Config472, Config506, Config507> for Config {}
+impl StdConfigLoad1<Config507> for Config {}
 
 #[derive(Deserialize, Serialize)]
 pub struct Config507 {
@@ -142,7 +148,9 @@ impl From<Config507> for Config {
             mini_led_mode: c.mini_led_mode,
             throttle_policy_linked_epp: true,
             throttle_policy_on_battery: c.platform_policy_on_battery,
+            change_throttle_policy_on_battery: true,
             throttle_policy_on_ac: c.platform_policy_on_ac,
+            change_throttle_policy_on_ac: true,
             throttle_quiet_epp: CPUEPP::Power,
             throttle_balanced_epp: CPUEPP::BalancePower,
             throttle_performance_epp: CPUEPP::Performance,
@@ -157,79 +165,3 @@ impl From<Config507> for Config {
         }
     }
 }
-
-#[derive(Deserialize, Serialize)]
-pub struct Config506 {
-    /// Save charge limit for restoring on boot
-    pub charge_control_end_threshold: u8,
-    pub panel_od: bool,
-    pub mini_led_mode: bool,
-    pub disable_nvidia_powerd_on_battery: bool,
-    pub ac_command: String,
-    pub bat_command: String,
-    /// Restored on boot as well as when power is plugged
-    #[serde(skip)]
-    pub platform_policy_to_restore: ThrottlePolicy,
-    pub platform_policy_on_battery: ThrottlePolicy,
-    pub platform_policy_on_ac: ThrottlePolicy,
-    //
-    pub ppt_pl1_spl: Option<u8>,
-    pub ppt_pl2_sppt: Option<u8>,
-    pub ppt_fppt: Option<u8>,
-    pub ppt_apu_sppt: Option<u8>,
-    pub ppt_platform_sppt: Option<u8>,
-    pub nv_dynamic_boost: Option<u8>,
-    pub nv_temp_target: Option<u8>,
-}
-
-impl From<Config506> for Config {
-    fn from(c: Config506) -> Self {
-        Self {
-            charge_control_end_threshold: c.charge_control_end_threshold,
-            panel_od: c.panel_od,
-            boot_sound: false,
-            disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
-            ac_command: c.ac_command,
-            bat_command: c.bat_command,
-            mini_led_mode: c.mini_led_mode,
-            throttle_policy_linked_epp: true,
-            throttle_policy_on_battery: c.platform_policy_on_battery,
-            throttle_policy_on_ac: c.platform_policy_on_ac,
-            throttle_quiet_epp: CPUEPP::Power,
-            throttle_balanced_epp: CPUEPP::BalancePower,
-            throttle_performance_epp: CPUEPP::Performance,
-            ppt_pl1_spl: c.ppt_pl1_spl,
-            ppt_pl2_sppt: c.ppt_pl2_sppt,
-            ppt_fppt: c.ppt_fppt,
-            ppt_apu_sppt: c.ppt_apu_sppt,
-            ppt_platform_sppt: c.ppt_platform_sppt,
-            nv_dynamic_boost: c.nv_dynamic_boost,
-            nv_temp_target: c.nv_temp_target,
-            last_power_plugged: 0,
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct Config472 {
-    /// Save charge limit for restoring on boot
-    pub bat_charge_limit: u8,
-    pub panel_od: bool,
-    pub mini_led_mode: bool,
-    pub disable_nvidia_powerd_on_battery: bool,
-    pub ac_command: String,
-    pub bat_command: String,
-}
-
-impl From<Config472> for Config {
-    fn from(c: Config472) -> Self {
-        Self {
-            charge_control_end_threshold: c.bat_charge_limit,
-            panel_od: c.panel_od,
-            disable_nvidia_powerd_on_battery: true,
-            ac_command: c.ac_command,
-            bat_command: c.bat_command,
-            ..Default::default()
-        }
-    }
-}

asusd/src/ctrl_anime/mod.rs

@@ -90,7 +90,7 @@ impl CtrlAnime {
         //     }
         // }
 
-        let config = AnimeConfig::new().load();
+        let mut config = AnimeConfig::new().load();
         let mut anime_type = get_anime_type()?;
         if let AnimeType::Unknown = anime_type {
             if let Some(model) = config.model_override {
@@ -101,7 +101,12 @@ impl CtrlAnime {
 
         info!("Device has an AniMe Matrix display: {anime_type:?}");
         let mut cache = AnimeConfigCached::default();
-        cache.init_from_config(&config, anime_type)?;
+        if let Err(e) = cache.init_from_config(&config, anime_type) {
+            error!("Trying to cache the Anime Config failed, will reset to default config: {e:?}");
+            config.rename_file_old();
+            config = AnimeConfig::new();
+            config.write();
+        }
 
         let ctrl = CtrlAnime {
             node,

asusd/src/ctrl_aura/config.rs

@@ -134,12 +134,16 @@ impl AuraConfig {
 
 #[cfg(test)]
 mod tests {
-    use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour};
+    use rog_aura::keyboard::AuraPowerState;
+    use rog_aura::{
+        AuraEffect, AuraModeNum, AuraZone, Colour, Direction, LedBrightness, PowerZones, Speed,
+    };
 
     use super::AuraConfig;
 
     #[test]
     fn set_multizone_4key_config() {
+        std::env::set_var("BOARD_NAME", "");
         let mut config = AuraConfig::new("19b6");
 
         let effect = AuraEffect {
@@ -230,6 +234,7 @@ mod tests {
 
     #[test]
     fn set_multizone_multimode_config() {
+        std::env::set_var("BOARD_NAME", "");
         let mut config = AuraConfig::new("19b6");
 
         let effect = AuraEffect {
@@ -274,4 +279,66 @@ mod tests {
         let sta = res.get(&AuraModeNum::Pulse).unwrap();
         assert_eq!(sta.len(), 1);
     }
+
+    #[test]
+    fn verify_0x1866_g531i() {
+        std::env::set_var("BOARD_NAME", "G513I");
+        let mut config = AuraConfig::new("1866");
+
+        assert_eq!(config.brightness, LedBrightness::Med);
+        assert_eq!(config.builtins.len(), 5);
+        assert_eq!(
+            config.builtins.first_entry().unwrap().get(),
+            &AuraEffect {
+                mode: AuraModeNum::Static,
+                zone: AuraZone::None,
+                colour1: Colour { r: 166, g: 0, b: 0 },
+                colour2: Colour { r: 0, g: 0, b: 0 },
+                speed: Speed::Med,
+                direction: Direction::Right
+            }
+        );
+        assert_eq!(config.enabled.states.len(), 1);
+        assert_eq!(
+            config.enabled.states[0],
+            AuraPowerState {
+                zone: PowerZones::KeyboardAndLightbar,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true
+            }
+        );
+    }
+
+    #[test]
+    fn verify_0x19b6_g634j() {
+        std::env::set_var("BOARD_NAME", "G634J");
+        let mut config = AuraConfig::new("19b6");
+
+        assert_eq!(config.brightness, LedBrightness::Med);
+        assert_eq!(config.builtins.len(), 12);
+        assert_eq!(
+            config.builtins.first_entry().unwrap().get(),
+            &AuraEffect {
+                mode: AuraModeNum::Static,
+                zone: AuraZone::None,
+                colour1: Colour { r: 166, g: 0, b: 0 },
+                colour2: Colour { r: 0, g: 0, b: 0 },
+                speed: Speed::Med,
+                direction: Direction::Right
+            }
+        );
+        assert_eq!(config.enabled.states.len(), 4);
+        assert_eq!(
+            config.enabled.states[0],
+            AuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: true,
+                awake: true,
+                sleep: true,
+                shutdown: true
+            }
+        );
+    }
 }

asusd/src/ctrl_aura/controller.rs

@@ -11,19 +11,23 @@ use rog_aura::{
     AuraDeviceType, AuraEffect, Direction, LedBrightness, Speed, GRADIENT, LED_MSG_LEN,
 };
 use rog_platform::hid_raw::HidRaw;
-use rog_platform::keyboard_led::KeyboardLed;
+use rog_platform::keyboard_led::KeyboardBacklight;
+use udev::Device;
 use zbus::zvariant::OwnedObjectPath;
+use zbus::Connection;
 
 use super::config::AuraConfig;
-use crate::ctrl_aura::manager::{dbus_path_for_dev, dbus_path_for_tuf};
+use crate::ctrl_aura::manager::{dbus_path_for_dev, dbus_path_for_tuf, start_tasks};
+use crate::ctrl_aura::trait_impls::CtrlAuraZbus;
 use crate::error::RogError;
+use crate::CtrlTask;
 
 #[derive(Debug)]
 pub enum LEDNode {
     /// Brightness and/or TUF RGB controls
-    KbdLed(KeyboardLed),
+    KbdLed(KeyboardBacklight),
     /// Raw HID handle
-    Rog(KeyboardLed, HidRaw),
+    Rog(Option<KeyboardBacklight>, HidRaw),
 }
 
 impl LEDNode {
@@ -31,7 +35,22 @@ impl LEDNode {
     pub fn set_brightness(&self, value: u8) -> Result<(), RogError> {
         match self {
             LEDNode::KbdLed(k) => k.set_brightness(value)?,
-            LEDNode::Rog(k, _) => k.set_brightness(value)?,
+            LEDNode::Rog(k, r) => {
+                if let Some(k) = k {
+                    k.set_brightness(value)?;
+                    let x = k.get_brightness()?;
+                    if x != value {
+                        debug!(
+                            "Kernel brightness control didn't read back correct value, setting \
+                             with raw hid"
+                        );
+                        r.write_bytes(&[0x5a, 0xba, 0xc5, 0xc4, value])?;
+                    }
+                } else {
+                    debug!("No brightness control found, trying raw write");
+                    r.write_bytes(&[0x5a, 0xba, 0xc5, 0xc4, value])?;
+                }
+            }
         }
         Ok(())
     }
@@ -39,16 +58,47 @@ impl LEDNode {
     pub fn get_brightness(&self) -> Result<u8, RogError> {
         Ok(match self {
             LEDNode::KbdLed(k) => k.get_brightness()?,
-            LEDNode::Rog(k, _) => k.get_brightness()?,
+            LEDNode::Rog(k, _) => {
+                if let Some(k) = k {
+                    k.get_brightness()?
+                } else {
+                    debug!("No brightness control found");
+                    return Err(RogError::MissingFunction(
+                        "No keyboard brightness control found".to_string(),
+                    ));
+                }
+            }
         })
     }
 
     pub fn monitor_brightness(&self) -> Result<Inotify, RogError> {
         Ok(match self {
             LEDNode::KbdLed(k) => k.monitor_brightness()?,
-            LEDNode::Rog(k, _) => k.monitor_brightness()?,
+            LEDNode::Rog(k, _) => {
+                if let Some(k) = k {
+                    k.monitor_brightness()?
+                } else {
+                    debug!("No brightness control found");
+                    return Err(RogError::MissingFunction(
+                        "No keyboard brightness control found".to_string(),
+                    ));
+                }
+            }
         })
     }
+
+    pub fn has_brightness_control(&self) -> bool {
+        match self {
+            LEDNode::KbdLed(k) => k.has_brightness(),
+            LEDNode::Rog(k, _) => {
+                if let Some(k) = k {
+                    k.has_brightness()
+                } else {
+                    false
+                }
+            }
+        }
+    }
 }
 
 /// Individual controller for one Aura device
@@ -62,10 +112,85 @@ pub struct CtrlKbdLed {
 }
 
 impl CtrlKbdLed {
+    pub fn add_to_dbus_and_start(
+        self,
+        interfaces: &mut HashSet<OwnedObjectPath>,
+        conn: Connection,
+    ) -> Result<(), RogError> {
+        let dbus_path = self.dbus_path.clone();
+        let dbus_path_cpy = self.dbus_path.clone();
+        info!(
+            "AuraManager starting device at: {:?}, {:?}",
+            dbus_path, self.led_type
+        );
+        let conn_copy = conn.clone();
+        let sig_ctx1 = CtrlAuraZbus::signal_context(&conn_copy)?;
+        let sig_ctx2 = CtrlAuraZbus::signal_context(&conn_copy)?;
+        let zbus = CtrlAuraZbus::new(self, sig_ctx1);
+        tokio::spawn(
+            async move { start_tasks(zbus, conn_copy.clone(), sig_ctx2, dbus_path).await },
+        );
+        interfaces.insert(dbus_path_cpy);
+        Ok(())
+    }
+
+    /// Build and init a `CtrlKbdLed` from a udev device. Maybe.
+    /// This will initialise the config also.
+    pub fn maybe_device(
+        device: Device,
+        interfaces: &mut HashSet<OwnedObjectPath>,
+    ) -> Result<Option<Self>, RogError> {
+        // usb_device gives us a product and vendor ID
+        if let Some(usb_device) = device.parent_with_subsystem_devtype("usb", "usb_device")? {
+            let dbus_path = dbus_path_for_dev(&usb_device).unwrap_or_default();
+            if interfaces.contains(&dbus_path) {
+                debug!("Already a ctrl at {dbus_path:?}, ignoring this end-point");
+                return Ok(None);
+            }
+
+            // The asus_wmi driver latches MCU that controls the USB endpoints
+            if let Some(parent) = device.parent() {
+                if let Some(driver) = parent.driver() {
+                    // There is a tree of devices added so filter by driver
+                    if driver != "asus" {
+                        return Ok(None);
+                    }
+                } else {
+                    return Ok(None);
+                }
+            }
+            // Device is something like 002, while its parent is the MCU
+            // Think of it like the device is an endpoint of the USB device attached
+            let mut prod_id = String::new();
+            if let Some(usb_id) = usb_device.attribute_value("idProduct") {
+                prod_id = usb_id.to_string_lossy().to_string();
+                let aura_device = AuraDeviceType::from(prod_id.as_str());
+                if aura_device == AuraDeviceType::Unknown {
+                    log::debug!("Unknown or invalid device: {usb_id:?}, skipping");
+                    return Ok(None);
+                }
+            }
+
+            let dev_node = if let Some(dev_node) = usb_device.devnode() {
+                dev_node
+            } else {
+                debug!("Device has no devnode, skipping");
+                return Ok(None);
+            };
+            info!("AuraControl found device at: {:?}", dev_node);
+            let dev = HidRaw::from_device(device)?;
+            let mut controller = Self::from_hidraw(dev, dbus_path.clone())?;
+            controller.config = Self::init_config(&prod_id);
+            interfaces.insert(dbus_path);
+            return Ok(Some(controller));
+        }
+        Ok(None)
+    }
+
     pub fn find_all() -> Result<Vec<Self>, RogError> {
         info!("Searching for all Aura devices");
         let mut devices = Vec::new();
-        let mut found = HashSet::new(); // track and ensure we use only one hidraw per prod_id
+        let mut interfaces = HashSet::new(); // track and ensure we use only one hidraw per prod_id
 
         let mut enumerator = udev::Enumerator::new().map_err(|err| {
             warn!("{}", err);
@@ -78,51 +203,14 @@ impl CtrlKbdLed {
         })?;
 
         for end_point in enumerator.scan_devices()? {
-            // usb_device gives us a product and vendor ID
-            if let Some(usb_device) =
-                end_point.parent_with_subsystem_devtype("usb", "usb_device")?
-            {
-                // The asus_wmi driver latches MCU that controls the USB endpoints
-                if let Some(parent) = end_point.parent() {
-                    if let Some(driver) = parent.driver() {
-                        // There is a tree of devices added so filter by driver
-                        if driver != "asus" {
-                            continue;
-                        }
-                    } else {
-                        continue;
-                    }
-                }
-                // Device is something like 002, while its parent is the MCU
-                // Think of it like the device is an endpoint of the USB device attached
-                let mut prod_id = String::new();
-                if let Some(usb_id) = usb_device.attribute_value("idProduct") {
-                    prod_id = usb_id.to_string_lossy().to_string();
-                    let aura_dev = AuraDeviceType::from(prod_id.as_str());
-                    if aura_dev == AuraDeviceType::Unknown || found.contains(&aura_dev) {
-                        log::debug!("Unknown or invalid device: {usb_id:?}, skipping");
-                        continue;
-                    }
-                    found.insert(aura_dev);
-                }
-
-                let dev_node = if let Some(dev_node) = usb_device.devnode() {
-                    dev_node
-                } else {
-                    debug!("Device has no devnode, skipping");
-                    continue;
-                };
-                info!("AuraControl found device at: {:?}", dev_node);
-                let dbus_path = dbus_path_for_dev(&usb_device).unwrap_or_default();
-                let dev = HidRaw::from_device(end_point)?;
-                let mut dev = Self::from_hidraw(dev, dbus_path)?;
-                dev.config = Self::init_config(&prod_id);
-                devices.push(dev);
+            // maybe?
+            if let Some(device) = Self::maybe_device(end_point, &mut interfaces)? {
+                devices.push(device);
             }
         }
 
         // Check for a TUF laptop LED. Assume there is only ever one.
-        if let Ok(kbd_backlight) = KeyboardLed::new() {
+        if let Ok(kbd_backlight) = KeyboardBacklight::new() {
             if kbd_backlight.has_kbd_rgb_mode() {
                 // Extra sure double-check that this isn't a laptop with crap
                 // ACPI with borked return on the TUF rgb methods
@@ -157,7 +245,14 @@ impl CtrlKbdLed {
     /// should be overwritten. The reason for the default config is because
     /// of async issues between this and udev/hidraw
     pub fn from_hidraw(device: HidRaw, dbus_path: OwnedObjectPath) -> Result<Self, RogError> {
-        let rgb_led = KeyboardLed::new()?;
+        let rgb_led = KeyboardBacklight::new()
+            .map_err(|e| {
+                log::error!(
+                    "{} is missing a keyboard backlight brightness control: {e:?}",
+                    device.prod_id()
+                );
+            })
+            .ok();
         let prod_id = AuraDeviceType::from(device.prod_id());
         if prod_id == AuraDeviceType::Unknown {
             log::error!("{} is AuraDevice::Unknown", device.prod_id());
@@ -220,13 +315,10 @@ impl CtrlKbdLed {
     /// Set combination state for boot animation/sleep animation/all leds/keys
     /// leds/side leds LED active
     pub(super) fn set_power_states(&mut self) -> Result<(), RogError> {
-        if let LEDNode::KbdLed(_platform) = &mut self.led_node {
+        if let LEDNode::KbdLed(platform) = &mut self.led_node {
             // TODO: tuf bool array
-            // if let Some(pwr) =
-            // AuraPowerConfig::to_tuf_bool_array(&self.config.enabled) {
-            //     let buf = [1, pwr[1] as u8, pwr[2] as u8, pwr[3] as u8,
-            // pwr[4] as u8];     platform.set_kbd_rgb_state(&buf)?;
-            // }
+            let buf = self.config.enabled.to_bytes(self.led_type);
+            platform.set_kbd_rgb_state(&buf)?;
         } else if let LEDNode::Rog(_, hid_raw) = &self.led_node {
             let bytes = self.config.enabled.to_bytes(self.led_type);
             let message = [0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3]];
@@ -376,7 +468,7 @@ mod tests {
     use rog_aura::aura_detection::LedSupportData;
     use rog_aura::{AuraDeviceType, AuraModeNum, AuraZone, PowerZones};
     use rog_platform::hid_raw::HidRaw;
-    use rog_platform::keyboard_led::KeyboardLed;
+    use rog_platform::keyboard_led::KeyboardBacklight;
     use zbus::zvariant::OwnedObjectPath;
 
     use super::CtrlKbdLed;
@@ -399,7 +491,10 @@ mod tests {
         };
         let mut controller = CtrlKbdLed {
             led_type: AuraDeviceType::LaptopPost2021,
-            led_node: LEDNode::Rog(KeyboardLed::default(), HidRaw::new("19b6").unwrap()),
+            led_node: LEDNode::Rog(
+                Some(KeyboardBacklight::default()),
+                HidRaw::new("19b6").unwrap(),
+            ),
             supported_data: supported_basic_modes,
             per_key_mode_active: false,
             config,
@@ -440,7 +535,10 @@ mod tests {
         };
         let mut controller = CtrlKbdLed {
             led_type: AuraDeviceType::LaptopPost2021,
-            led_node: LEDNode::Rog(KeyboardLed::default(), HidRaw::new("19b6").unwrap()),
+            led_node: LEDNode::Rog(
+                Some(KeyboardBacklight::default()),
+                HidRaw::new("19b6").unwrap(),
+            ),
             supported_data: supported_basic_modes,
             per_key_mode_active: false,
             config,

asusd/src/ctrl_aura/manager.rs

@@ -6,10 +6,8 @@
 
 use std::collections::HashSet;
 
-use log::{debug, error, info, warn};
+use log::{error, info, warn};
 use mio::{Events, Interest, Poll, Token};
-use rog_aura::AuraDeviceType;
-use rog_platform::hid_raw::HidRaw;
 use tokio::task::spawn_blocking;
 use udev::{Device, MonitorBuilder};
 use zbus::object_server::SignalContext;
@@ -59,93 +57,42 @@ impl AuraManager {
                     continue;
                 }
                 for event in monitor.iter() {
-                    let parent = if let Some(parent) =
+                    let action = event.action().unwrap_or_default();
+
+                    if let Some(parent) =
                         event.parent_with_subsystem_devtype("usb", "usb_device")?
                     {
-                        parent
-                    } else {
-                        continue;
-                    };
-
-                    let action = if let Some(action) = event.action() {
-                        action
-                    } else {
-                        continue;
-                    };
-
-                    let id_product = if let Some(id_product) = parent.attribute_value("idProduct") {
-                        id_product.to_string_lossy()
-                    } else {
-                        continue;
-                    };
-
-                    let path = if let Some(path) = dbus_path_for_dev(&parent) {
-                        path
-                    } else {
-                        continue;
-                    };
-
-                    let aura_device = AuraDeviceType::from(&*id_product);
-                    if aura_device == AuraDeviceType::Unknown {
-                        warn!("idProduct:{id_product:?} is unknown, not using");
-                        continue;
-                    }
-
-                    if action == "remove" {
-                        if interfaces.remove(&path) {
-                            info!("AuraManager removing: {path:?}");
-                            let conn_copy = conn_copy.clone();
-                            tokio::spawn(async move {
-                                let res = conn_copy
-                                    .object_server()
-                                    .remove::<CtrlAuraZbus, _>(&path)
-                                    .await
-                                    .map_err(|e| {
-                                        error!("Failed to remove {path:?}, {e:?}");
-                                        e
-                                    })?;
-                                info!("AuraManager removed: {path:?}, {res}");
-                                Ok::<(), RogError>(())
-                            });
-                        }
-                    } else if action == "add" {
-                        if interfaces.contains(&path) {
-                            debug!("Already a ctrl at {path:?}");
-                            continue;
-                        }
-
-                        // Need to check the driver is asus to prevent using hid_generic
-                        if let Some(p2) = event.parent() {
-                            if let Some(driver) = p2.driver() {
-                                // There is a tree of devices added so filter by driver
-                                if driver != "asus" {
-                                    debug!("{id_product:?} driver was not asus, skipping");
-                                    continue;
-                                }
-                            } else {
-                                continue;
-                            }
-                        }
-
-                        if let Some(dev_node) = event.devnode() {
-                            if let Ok(raw) = HidRaw::from_device(event.device())
-                                .map_err(|e| error!("device path error: {e:?}"))
-                            {
-                                if let Ok(mut ctrl) = CtrlKbdLed::from_hidraw(raw, path.clone()) {
-                                    ctrl.config = CtrlKbdLed::init_config(&id_product);
-                                    interfaces.insert(path.clone());
-                                    info!("AuraManager starting device at: {dev_node:?}, {path:?}");
-                                    let sig_ctx = CtrlAuraZbus::signal_context(&conn_copy)?;
-                                    let zbus = CtrlAuraZbus::new(ctrl, sig_ctx);
-                                    let sig_ctx = CtrlAuraZbus::signal_context(&conn_copy)?;
+                        if action == "remove" {
+                            if let Some(path) = dbus_path_for_dev(&parent) {
+                                if interfaces.remove(&path) {
+                                    info!("AuraManager removing: {path:?}");
                                     let conn_copy = conn_copy.clone();
                                     tokio::spawn(async move {
-                                        start_tasks(zbus, conn_copy.clone(), sig_ctx, path).await
+                                        let res = conn_copy
+                                            .object_server()
+                                            .remove::<CtrlAuraZbus, _>(&path)
+                                            .await
+                                            .map_err(|e| {
+                                                error!("Failed to remove {path:?}, {e:?}");
+                                                e
+                                            })?;
+                                        info!("AuraManager removed: {path:?}, {res}");
+                                        Ok::<(), RogError>(())
                                     });
                                 }
                             }
-                        }
-                    };
+                        } else if action == "add" {
+                            if let Ok(Some(ctrl)) =
+                                CtrlKbdLed::maybe_device(event.device(), &mut interfaces)
+                            {
+                                ctrl.add_to_dbus_and_start(&mut interfaces, conn_copy.clone())
+                                    .map_err(|e| {
+                                        error!("Couldn't start aura device on dbus: {e:?}")
+                                    })
+                                    .ok();
+                            }
+                        };
+                    }
                 }
             }
             // Required for return type on spawn
@@ -169,7 +116,7 @@ pub(crate) fn dbus_path_for_tuf() -> OwnedObjectPath {
     ObjectPath::from_str_unchecked(&format!("{AURA_ZBUS_PATH}/tuf")).into()
 }
 
-async fn start_tasks(
+pub async fn start_tasks(
     mut zbus: CtrlAuraZbus,
     connection: Connection,
     _signal_ctx: SignalContext<'static>,
@@ -180,7 +127,12 @@ async fn start_tasks(
     zbus.reload()
         .await
         .unwrap_or_else(|err| warn!("Controller error: {}", err));
-    connection.object_server().at(path, zbus).await.unwrap();
+    connection
+        .object_server()
+        .at(path.clone(), zbus)
+        .await
+        .map_err(|e| error!("Couldn't add server at path: {path}, {e:?}"))
+        .ok();
     // TODO: skip this until we keep handles to tasks so they can be killed
     // task.create_tasks(signal_ctx).await
     Ok(())

asusd/src/ctrl_aura/mod.rs

@@ -1,3 +1,4 @@
+use log::warn;
 use udev::Device;
 use zbus::zvariant::{ObjectPath, OwnedObjectPath};
 
@@ -12,7 +13,7 @@ pub mod trait_impls;
 pub(super) fn filename_partial(parent: &Device) -> Option<OwnedObjectPath> {
     if let Some(id_product) = parent.attribute_value("idProduct") {
         let id_product = id_product.to_string_lossy();
-        let path = if let Some(devnum) = parent.attribute_value("devnum") {
+        let mut path = if let Some(devnum) = parent.attribute_value("devnum") {
             let devnum = devnum.to_string_lossy();
             if let Some(devpath) = parent.attribute_value("devpath") {
                 let devpath = devpath.to_string_lossy();
@@ -23,6 +24,10 @@ pub(super) fn filename_partial(parent: &Device) -> Option<OwnedObjectPath> {
         } else {
             format!("{id_product}")
         };
+        if path.contains('.') {
+            warn!("dbus path for {id_product} contains `.`, removing");
+            path.replace('.', "").clone_into(&mut path);
+        }
         return Some(ObjectPath::from_str_unchecked(&path).into());
     }
     None

asusd/src/ctrl_aura/trait_impls.rs

@@ -26,7 +26,7 @@ impl CtrlAuraZbus {
     }
 
     fn update_config(lock: &mut CtrlKbdLed) -> Result<(), RogError> {
-        let bright = lock.led_node.get_brightness()?;
+        let bright = lock.led_node.get_brightness().unwrap_or_default();
         lock.config.read();
         lock.config.brightness = bright.into();
         lock.config.write();
@@ -109,8 +109,10 @@ impl CtrlAuraZbus {
         if ctrl.config.brightness == LedBrightness::Off {
             ctrl.config.brightness = LedBrightness::Med;
         }
-        ctrl.led_node
-            .set_brightness(ctrl.config.brightness.into())?;
+        if ctrl.led_node.has_brightness_control() {
+            ctrl.led_node
+                .set_brightness(ctrl.config.brightness.into())?;
+        }
         ctrl.config.write();
 
         self.led_mode_data_invalidate(&self.1).await.ok();
@@ -148,8 +150,10 @@ impl CtrlAuraZbus {
         if ctrl.config.brightness == LedBrightness::Off {
             ctrl.config.brightness = LedBrightness::Med;
         }
-        ctrl.led_node
-            .set_brightness(ctrl.config.brightness.into())?;
+        if ctrl.led_node.has_brightness_control() {
+            ctrl.led_node
+                .set_brightness(ctrl.config.brightness.into())?;
+        }
         ctrl.config.set_builtin(effect);
         ctrl.config.write();
 
@@ -213,12 +217,14 @@ impl CtrlTask for CtrlAuraZbus {
                 // If waking up
                 if !start {
                     info!("CtrlKbdLedTask reloading brightness and modes");
-                    lock.led_node
-                        .set_brightness(lock.config.brightness.into())
-                        .map_err(|e| {
-                            error!("CtrlKbdLedTask: {e}");
-                            e
-                        })?;
+                    if lock.led_node.has_brightness_control() {
+                        lock.led_node
+                            .set_brightness(lock.config.brightness.into())
+                            .map_err(|e| {
+                                error!("CtrlKbdLedTask: {e}");
+                                e
+                            })?;
+                    }
                     lock.write_current_config_mode().map_err(|e| {
                         error!("CtrlKbdLedTask: {e}");
                         e
@@ -264,20 +270,24 @@ impl CtrlTask for CtrlAuraZbus {
 
         let ctrl2 = self.0.clone();
         let ctrl = self.0.lock().await;
-        let watch = ctrl.led_node.monitor_brightness()?;
-        tokio::spawn(async move {
-            let mut buffer = [0; 32];
-            watch
-                .into_event_stream(&mut buffer)
-                .unwrap()
-                .for_each(|_| async {
-                    if let Some(lock) = ctrl2.try_lock() {
-                        load_save(true, lock).unwrap(); // unwrap as we want to
-                                                        // bomb out of the task
-                    }
-                })
-                .await;
-        });
+        if ctrl.led_node.has_brightness_control() {
+            let watch = ctrl.led_node.monitor_brightness()?;
+            tokio::spawn(async move {
+                let mut buffer = [0; 32];
+                watch
+                    .into_event_stream(&mut buffer)
+                    .unwrap()
+                    .for_each(|_| async {
+                        if let Some(lock) = ctrl2.try_lock() {
+                            load_save(true, lock).unwrap(); // unwrap as we want
+                                                            // to
+                                                            // bomb out of the
+                                                            // task
+                        }
+                    })
+                    .await;
+            });
+        }
 
         Ok(())
     }

asusd/src/ctrl_platform.rs

@@ -9,17 +9,12 @@ use rog_platform::platform::{GpuMode, Properties, RogPlatform, ThrottlePolicy};
 use rog_platform::power::AsusPower;
 use zbus::export::futures_util::lock::Mutex;
 use zbus::fdo::Error as FdoErr;
-use zbus::{interface, Connection, ObjectServer, SignalContext};
+use zbus::{interface, Connection, SignalContext};
 
 use crate::config::Config;
-use crate::ctrl_anime::trait_impls::{CtrlAnimeZbus, ANIME_ZBUS_NAME, ANIME_ZBUS_PATH};
-use crate::ctrl_aura::trait_impls::{CtrlAuraZbus, AURA_ZBUS_NAME, AURA_ZBUS_PATH};
-use crate::ctrl_fancurves::{CtrlFanCurveZbus, FAN_CURVE_ZBUS_NAME, FAN_CURVE_ZBUS_PATH};
-use crate::ctrl_slash::trait_impls::{CtrlSlashZbus, SLASH_ZBUS_NAME, SLASH_ZBUS_PATH};
 use crate::error::RogError;
 use crate::{task_watch_item, task_watch_item_notify, CtrlTask, ReloadAndNotify};
 
-const PLATFORM_ZBUS_NAME: &str = "Platform";
 const PLATFORM_ZBUS_PATH: &str = "/org/asuslinux";
 
 macro_rules! platform_get_value {
@@ -258,6 +253,21 @@ impl CtrlPlatform {
     }
 
     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 {
+            debug!(
+                "Power status changed but set_throttle_policy_on_ac set false. Not setting the \
+                 thing"
+            );
+            return;
+        }
+        if !power_plugged && !self.config.lock().await.change_throttle_policy_on_battery {
+            debug!(
+                "Power status changed but set_throttle_policy_on_battery set false. Not setting \
+                 the thing"
+            );
+            return;
+        }
+
         let throttle = if power_plugged {
             self.config.lock().await.throttle_policy_on_ac
         } else {
@@ -328,49 +338,6 @@ impl CtrlPlatform {
         supported
     }
 
-    async fn supported_interfaces(
-        &self,
-        #[zbus(object_server)] server: &ObjectServer,
-    ) -> Vec<String> {
-        let mut interfaces = Vec::default();
-        if server
-            .interface::<_, CtrlAnimeZbus>(ANIME_ZBUS_PATH)
-            .await
-            .is_ok()
-        {
-            interfaces.push(ANIME_ZBUS_NAME.to_owned());
-        }
-        if server
-            .interface::<_, CtrlAuraZbus>(AURA_ZBUS_PATH)
-            .await
-            .is_ok()
-        {
-            interfaces.push(AURA_ZBUS_NAME.to_owned());
-        }
-        if server
-            .interface::<_, CtrlFanCurveZbus>(FAN_CURVE_ZBUS_PATH)
-            .await
-            .is_ok()
-        {
-            interfaces.push(FAN_CURVE_ZBUS_NAME.to_owned());
-        }
-        if server
-            .interface::<_, CtrlPlatform>(PLATFORM_ZBUS_PATH)
-            .await
-            .is_ok()
-        {
-            interfaces.push(PLATFORM_ZBUS_NAME.to_owned());
-        }
-        if server
-            .interface::<_, CtrlSlashZbus>(SLASH_ZBUS_PATH)
-            .await
-            .is_ok()
-        {
-            interfaces.push(SLASH_ZBUS_NAME.to_owned());
-        }
-        interfaces
-    }
-
     #[zbus(property)]
     fn charge_control_end_threshold(&self) -> Result<u8, FdoErr> {
         let limit = self.power.get_charge_control_end_threshold()?;
@@ -496,6 +463,18 @@ impl CtrlPlatform {
         Ok(())
     }
 
+    #[zbus(property)]
+    async fn change_throttle_policy_on_battery(&self) -> Result<bool, FdoErr> {
+        Ok(self.config.lock().await.change_throttle_policy_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;
+        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)
@@ -509,6 +488,18 @@ impl CtrlPlatform {
         Ok(())
     }
 
+    #[zbus(property)]
+    async fn change_throttle_policy_on_ac(&self) -> Result<bool, FdoErr> {
+        Ok(self.config.lock().await.change_throttle_policy_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;
+        self.config.lock().await.write();
+        Ok(())
+    }
+
     /// The energy_performance_preference for the quiet throttle/platform
     /// profile
     #[zbus(property)]
@@ -731,8 +722,9 @@ impl ReloadAndNotify for CtrlPlatform {
             info!("asusd.ron updated externally, reloading and updating internal copy");
 
             if self.power.has_charge_control_end_threshold() {
-                self.power
-                    .set_charge_control_end_threshold(data.charge_control_end_threshold)?;
+                let limit = data.charge_control_end_threshold;
+                warn!("setting charge_control_end_threshold to {limit}");
+                self.power.set_charge_control_end_threshold(limit)?;
                 self.charge_control_end_threshold_changed(signal_context)
                     .await?;
             }
@@ -791,6 +783,15 @@ impl ReloadAndNotify for CtrlPlatform {
 
 impl crate::Reloadable for CtrlPlatform {
     async fn reload(&mut self) -> Result<(), RogError> {
+        info!("Begin Platform settings restore");
+        if self.power.has_charge_control_end_threshold() {
+            let limit = self.config.lock().await.charge_control_end_threshold;
+            info!("reloading charge_control_end_threshold to {limit}");
+            self.power.set_charge_control_end_threshold(limit)?;
+        } else {
+            warn!("No charge_control_end_threshold found")
+        }
+
         macro_rules! reload {
             ($property:tt, $prop_name:literal) => {
                 concat_idents::concat_idents!(has = has_, $property {
@@ -826,12 +827,6 @@ impl crate::Reloadable for CtrlPlatform {
         ppt_reload!(nv_dynamic_boost, "nv_dynamic_boost");
         ppt_reload!(nv_temp_target, "nv_temp_target");
 
-        if self.power.has_charge_control_end_threshold() {
-            self.power.set_charge_control_end_threshold(
-                self.config.lock().await.charge_control_end_threshold,
-            )?;
-        }
-
         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() {
@@ -847,11 +842,11 @@ impl crate::Reloadable for CtrlPlatform {
 }
 
 impl CtrlPlatform {
-    task_watch_item!(panel_od platform);
+    task_watch_item!(panel_od "panel_od" platform);
 
-    task_watch_item!(mini_led_mode platform);
+    task_watch_item!(mini_led_mode "mini_led_mode" platform);
 
-    task_watch_item!(charge_control_end_threshold power);
+    task_watch_item!(charge_control_end_threshold "charge_control_end_threshold" power);
 
     task_watch_item_notify!(boot_sound platform);
 
@@ -901,12 +896,16 @@ impl CtrlTask for CtrlPlatform {
                             })
                             .ok();
                     }
-                    if sleeping && platform1.power.has_charge_control_end_threshold() {
-                        platform1.config.lock().await.charge_control_end_threshold = platform1
-                            .power
-                            .get_charge_control_end_threshold()
-                            .unwrap_or(100);
-                    } else if !sleeping && platform1.power.has_charge_control_end_threshold() {
+                    // This block is commented out due to some kind of issue reported. Maybe the
+                    // desktops used were storing a value whcih was then read here.
+                    // Don't store it on suspend, assume that the current config setting is desired
+                    // if sleeping && platform1.power.has_charge_control_end_threshold() {
+                    //     platform1.config.lock().await.charge_control_end_threshold = platform1
+                    //         .power
+                    //         .get_charge_control_end_threshold()
+                    //         .unwrap_or(100);
+                    // } else
+                    if !sleeping && platform1.power.has_charge_control_end_threshold() {
                         platform1
                             .power
                             .set_charge_control_end_threshold(

asusd/src/daemon.rs

@@ -13,7 +13,7 @@ use asusd::ctrl_platform::CtrlPlatform;
 use asusd::ctrl_slash::trait_impls::CtrlSlashZbus;
 use asusd::ctrl_slash::CtrlSlash;
 use asusd::{print_board_info, start_tasks, CtrlTask, DBUS_NAME};
-use config_traits::{StdConfig, StdConfigLoad3};
+use config_traits::{StdConfig, StdConfigLoad1};
 use log::{error, info};
 use zbus::fdo::ObjectManager;
 
@@ -62,7 +62,7 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
     let mut connection = Connection::system().await?;
     connection
         .object_server()
-        .at("/org/asuslinux", ObjectManager)
+        .at("/", ObjectManager)
         .await
         .unwrap();
 

asusd/src/lib.rs

@@ -56,7 +56,7 @@ pub static DBUS_IFACE: &str = "org.asuslinux.Daemon";
 /// // TODO: this is kind of useless if it can't trigger some action
 #[macro_export]
 macro_rules! task_watch_item {
-    ($name:ident $self_inner:ident) => {
+    ($name:ident $name_str:literal $self_inner:ident) => {
         concat_idents::concat_idents!(fn_name = watch_, $name {
         async fn fn_name(
             &self,
@@ -72,12 +72,15 @@ macro_rules! task_watch_item {
                             let mut buffer = [0; 32];
                             watch.into_event_stream(&mut buffer).unwrap().for_each(|_| async {
                                 if let Ok(value) = ctrl.$name() { // get new value from zbus method
-                                    concat_idents::concat_idents!(notif_fn = $name, _changed {
-                                        ctrl.notif_fn(&signal_ctxt).await.ok();
-                                    });
-                                    let mut lock = ctrl.config.lock().await;
-                                    lock.$name = value;
-                                    lock.write();
+                                    if ctrl.config.lock().await.$name != value {
+                                        log::debug!("{} was changed to {} externally", $name_str, value);
+                                        concat_idents::concat_idents!(notif_fn = $name, _changed {
+                                            ctrl.notif_fn(&signal_ctxt).await.ok();
+                                        });
+                                        let mut lock = ctrl.config.lock().await;
+                                        lock.$name = value;
+                                        lock.write();
+                                    }
                                 }
                             }).await;
                         });

config-traits/src/lib.rs

@@ -146,11 +146,7 @@ where
 
     /// Renames the existing file to `<file>-old`
     fn rename_file_old(&self) {
-        warn!(
-            "Renaming {} to {}-old and recreating config",
-            self.file_name(),
-            self.file_name()
-        );
+        warn!("Renaming {} to {}-old", self.file_name(), self.file_name());
         let mut cfg_old = self.file_path().to_string_lossy().to_string();
         cfg_old.push_str("-old");
         std::fs::rename(self.file_path(), cfg_old).unwrap_or_else(|err| {

data/asusd.rules

@@ -7,6 +7,7 @@ ENV{DMI_FAMILY}=="*ROG*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Zephyrus*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Strix*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Vivo*ook*", GOTO="asusd_start"
+ENV{DMI_FAMILY}=="*Zenbook*", GOTO="asusd_start"
 # No match so
 GOTO="asusd_end"
 

distro-packaging/asusctl.spec

@@ -20,13 +20,14 @@
 %global debug_package %{nil}
 %endif
 
-%global rpm_dkms_opt 1
+%define specrelease %{?dist}
+%define pkg_release 3%{specrelease}
 
 # Use hardening ldflags.
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
 Name:           asusctl
-Version:        4.7.0
-Release:        2
+Version:        6.0.7
+Release: %{pkg_release}
 Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
 License:        MPLv2
 
@@ -34,8 +35,8 @@ Group:          System Environment/Kernel
 
 URL:            https://gitlab.com/asus-linux/asusctl
 Source:         %{name}-%{version}.tar.gz
-Source1:        vendor-%{name}-%{version}.tar.gz
-Source2:        cargo_config
+Source1:        vendor_%{name}_%{version}.tar.xz
+Source2:        cargo-config
 
 BuildRequires:  cargo
 BuildRequires:  rust-packaging
@@ -44,12 +45,20 @@ BuildRequires:  clang-devel
 BuildRequires:  cmake
 BuildRequires:  rust
 BuildRequires:  rust-std-static
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libinput)
+BuildRequires:  pkgconfig(libseat)
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gdk-3.0)
 BuildRequires:  desktop-file-utils
-Requires: libappindicator-gtk3
+
+# expat-devel pcre2-devel
 
 %description
 asus-nb-ctrl is a utility for Linux to control many aspects of various
@@ -67,9 +76,10 @@ A one-stop-shop GUI tool for asusd/asusctl. It aims to provide most controls,
 a notification service, and ability to run in the background.
 
 %prep
+# %setup -D -T -a 1 -c -n %{name}-%{version}/vendor
+# %setup -D -T -a 0 -c
 %autosetup
-%setup -D -T -a 1 -c -n %{name}-%{version}/vendor
-cd ..
+%setup -D -T -a 1
 
 mv Cargo.lock{,.bak}
 %cargo_prep
@@ -86,7 +96,7 @@ export RUSTFLAGS="%{rustflags}"
 export RUSTFLAGS="%{rustflags}"
 mkdir -p "%{buildroot}/%{_bindir}" "%{buildroot}%{_docdir}"
 %make_install
- 
+
 install -D -m 0644 README.md %{buildroot}/%{_docdir}/%{name}/README.md
 install -D -m 0644 rog-anime/README.md %{buildroot}/%{_docdir}/%{name}/README-anime.md
 install -D -m 0644 rog-anime/data/diagonal-template.png %{buildroot}/%{_docdir}/%{name}/diagonal-template.png

rog-anime/src/diagonal.rs

@@ -3,6 +3,8 @@
 use std::path::Path;
 use std::time::Duration;
 
+use log::error;
+
 use crate::data::AnimeDataBuffer;
 use crate::error::{AnimeError, Result};
 use crate::AnimeType;
@@ -49,7 +51,10 @@ impl AnimeDiagonal {
         bright: f32,
         anime_type: AnimeType,
     ) -> Result<Self> {
-        let data = std::fs::read(path)?;
+        let data = std::fs::read(path).map_err(|e| {
+            error!("Could not open {path:?}: {e:?}");
+            e
+        })?;
         let data = std::io::Cursor::new(data);
         let decoder = png_pong::Decoder::new(data)?.into_steps();
         let png_pong::Step { raster, delay: _ } = decoder.last().ok_or(AnimeError::NoFrames)??;

rog-anime/src/gif.rs

@@ -4,6 +4,7 @@ use std::path::Path;
 use std::time::Duration;
 
 use glam::Vec2;
+use log::error;
 use serde_derive::{Deserialize, Serialize};
 
 use crate::error::{AnimeError, Result};
@@ -107,7 +108,10 @@ impl AnimeGif {
         // Configure the decoder such that it will expand the image to RGBA.
         decoder.set_color_output(gif::ColorOutput::RGBA);
         // Read the file header
-        let file = File::open(file_name)?;
+        let file = File::open(file_name).map_err(|e| {
+            error!("Could not open {file_name:?}: {e:?}");
+            e
+        })?;
         let mut decoder = decoder.read_info(file)?;
 
         let mut frames = Vec::default();
@@ -186,12 +190,14 @@ impl AnimeGif {
         anime_type: AnimeType,
     ) -> Result<Self> {
         let mut frames = Vec::new();
-
         let mut decoder = gif::DecodeOptions::new();
         // Configure the decoder such that it will expand the image to RGBA.
         decoder.set_color_output(gif::ColorOutput::RGBA);
         // Read the file header
-        let file = File::open(file_name)?;
+        let file = File::open(file_name).map_err(|e| {
+            error!("Could not open {file_name:?}: {e:?}");
+            e
+        })?;
         let mut decoder = decoder.read_info(file)?;
 
         let height = decoder.height();

rog-anime/src/image.rs

@@ -3,6 +3,7 @@ use std::path::Path;
 
 pub use glam::Vec2;
 use glam::{Mat3, Vec3};
+use log::error;
 
 use crate::data::AnimeDataBuffer;
 use crate::error::{AnimeError, Result};
@@ -421,7 +422,10 @@ impl AnimeImage {
         bright: f32,
         anime_type: AnimeType,
     ) -> Result<Self> {
-        let data = std::fs::read(path)?;
+        let data = std::fs::read(path).map_err(|e| {
+            error!("Could not open {path:?}: {e:?}");
+            e
+        })?;
         let data = std::io::Cursor::new(data);
         let decoder = png_pong::Decoder::new(data)?.into_steps();
         let png_pong::Step { raster, delay: _ } = decoder.last().ok_or(AnimeError::NoFrames)??;

rog-aura/data/aura_support.ron

@@ -72,13 +72,22 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "G512",
+        device_name: "G512L",
         product_id: "",
         layout_name: "g512",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
         advanced_type: None,
-        power_zones: [Keyboard],
+        power_zones: [Keyboard, Lightbar],
+    ),
+    (
+        device_name: "G512LI",
+        product_id: "",
+        layout_name: "g512",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
+        basic_zones: [],
+        advanced_type: None,
+        power_zones: [Keyboard, Lightbar],
     ),
     (
         device_name: "G513I",
@@ -117,7 +126,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "G513R",
+        device_name: "G513RC",
         product_id: "",
         layout_name: "g513i",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
@@ -125,6 +134,15 @@
         advanced_type: Zoned([ZonedKbLeft, ZonedKbLeftMid, ZonedKbRightMid, ZonedKbRight, LightbarRight, LightbarRightCorner, LightbarRightBottom, LightbarLeftBottom, LightbarLeftCorner, LightbarLeft]),
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G513RS",
+        product_id: "",
+        layout_name: "g513i-per-key",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar],
+    ),
     (
         device_name: "G513RW",
         product_id: "",
@@ -132,7 +150,7 @@
         basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
         basic_zones: [],
         advanced_type: PerKey,
-        power_zones: [Keyboard],
+        power_zones: [Keyboard, Lightbar],
     ),
     (
         device_name: "G531",
@@ -328,9 +346,9 @@
         product_id: "",
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
-        basic_zones: [Key1, Key2, Key3, Key4],
+        basic_zones: [Key1, Key2, Key3, Key4, BarLeft, BarRight],
         advanced_type: None,
-        power_zones: [Keyboard],
+        power_zones: [Keyboard, Lightbar],
     ),
     (
         device_name: "G731",
@@ -471,7 +489,7 @@
         device_name: "GA402XV",
         product_id: "",
         layout_name: "ga401q",
-        basic_modes: [Static, Breathe, Pulse],
+        basic_modes: [Static, Breathe, Strobe, Comet],
         basic_zones: [],
         advanced_type: None,
         power_zones: [Keyboard],
@@ -746,6 +764,15 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
+    (
+        device_name: "GX650R",
+        product_id: "",
+        layout_name: "gx531-per-key",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard],
+    ),
     (
         device_name: "GX701",
         product_id: "",
@@ -818,4 +845,4 @@
         advanced_type: None,
         power_zones: [Keyboard],
     ),
-])
+])

rog-aura/src/aura_detection.rs

@@ -1,3 +1,5 @@
+use std::env;
+
 use dmi_id::DMIID;
 use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
@@ -60,7 +62,10 @@ impl LedSupportData {
     /// matches against laptops first, then will proceed with matching the
     /// `device_name` if there are no DMI matches.
     pub fn get_data(product_id: &str) -> Self {
-        let dmi = DMIID::new().unwrap_or_default();
+        let mut dmi = DMIID::new().unwrap_or_default();
+        if let Ok(board_name) = env::var("BOARD_NAME") {
+            dmi.board_name = board_name;
+        }
         // let prod_family = dmi.product_family().expect("Could not get
         // product_family");
 
@@ -70,7 +75,9 @@ impl LedSupportData {
             }
         }
         info!("Using generic LED control for keyboard brightness only");
-        LedSupportData::default()
+        let mut data = LedSupportData::default();
+        data.power_zones.push(PowerZones::Keyboard);
+        data
     }
 }
 
@@ -98,6 +105,11 @@ impl LedSupportFile {
                     }
                 }
                 return Some(config.clone());
+            } else {
+                warn!(
+                    "the aura_support.ron file has no entry for this model: {device_name}, \
+                     {product_id}"
+                )
             }
         }
         None

rog-aura/src/builtin_modes.rs

@@ -434,7 +434,7 @@ impl From<AuraZone> for i32 {
 /// ```
 #[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct AuraEffect {
     /// The effect type
     pub mode: AuraModeNum,

rog-aura/src/keyboard/layouts.rs

@@ -488,7 +488,7 @@ mod tests {
             let rows = &data.key_rows;
             for row in rows {
                 for k in &row.row {
-                    if data.key_shapes.get(&k.1).is_some() {
+                    if data.key_shapes.contains_key(&k.1) {
                         unused.remove(&k.1);
                     } else {
                         panic!("Key {:?} was missing matching shape {}", k.0, k.1);

rog-aura/src/keyboard/power.rs

@@ -53,7 +53,8 @@ impl AuraPowerState {
     }
 
     fn tuf_to_bytes(&self) -> Vec<u8> {
-        todo!("0s and 1s for bool array")
+        // &cmd, &boot, &awake, &sleep, &keyboard
+        vec![1, self.boot as u8, self.awake as u8, self.sleep as u8, 1]
     }
 
     /// # Bits for older 0x1866 keyboard model
@@ -133,7 +134,7 @@ impl AuraPowerState {
                     | (self.sleep as u32) << (23 + 3)
                     | (self.shutdown as u32) << (23 + 4)
             }
-            PowerZones::KeyboardAndLightbar | PowerZones::None => 0,
+            PowerZones::None | PowerZones::KeyboardAndLightbar => 0,
         }
     }
 }
@@ -194,6 +195,10 @@ impl LaptopAuraPower {
                 Self { states }
             }
             AuraDeviceType::LaptopPre2021 => {
+                // The older devices are tri-state if have lightbar:
+                // 1. Keyboard
+                // 2. Lightbar
+                // 3. KeyboardAndLightbar
                 if support_data.power_zones.contains(&PowerZones::Lightbar) {
                     Self {
                         states: vec![AuraPowerState::default_for(PowerZones::KeyboardAndLightbar)],
@@ -214,12 +219,25 @@ impl LaptopAuraPower {
     pub fn to_bytes(&self, aura_type: AuraDeviceType) -> Vec<u8> {
         match aura_type {
             AuraDeviceType::LaptopPost2021 => self.new_to_bytes(),
-            AuraDeviceType::LaptopPre2021 => self
-                .states
-                .first()
-                .cloned()
-                .unwrap_or_default()
-                .old_to_bytes(),
+            AuraDeviceType::LaptopPre2021 => {
+                if self.states.len() == 1 {
+                    self.states
+                        .first()
+                        .cloned()
+                        .unwrap_or_default()
+                        .old_to_bytes()
+                } else {
+                    let mut bytes: Vec<Vec<u8>> =
+                        self.states.iter().map(|s| s.old_to_bytes()).collect();
+                    let mut b = bytes.pop().unwrap();
+                    for i in bytes {
+                        for (i, n) in i.iter().enumerate() {
+                            b[i] |= n;
+                        }
+                    }
+                    b
+                }
+            }
             AuraDeviceType::LaptopTuf => self
                 .states
                 .first()
@@ -230,7 +248,7 @@ impl LaptopAuraPower {
                 warn!("Trying to create bytes for an unknown device");
                 self.new_to_bytes()
             }
-            AuraDeviceType::ScsiExtDisk => todo!(),
+            AuraDeviceType::ScsiExtDisk => todo!("scsi disk not implemented yet"),
         }
     }
 }
@@ -279,76 +297,75 @@ mod test {
     use crate::keyboard::{AuraPowerState, LaptopAuraPower};
     use crate::{AuraDeviceType, PowerZones};
 
+    fn to_binary_string_post2021(power: &LaptopAuraPower) -> String {
+        let bytes = power.to_bytes(AuraDeviceType::LaptopPost2021);
+        format!(
+            "{:08b}, {:08b}, {:08b}, {:08b}",
+            bytes[0], bytes[1], bytes[2], bytes[3]
+        )
+    }
+
     #[test]
     fn check_0x1866_control_bytes() {
-        let state = AuraPowerState {
-            zone: PowerZones::Keyboard,
-            awake: true,
-            boot: false,
-            sleep: false,
-            shutdown: false,
+        let power = LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Keyboard,
+                boot: false,
+                awake: true,
+                sleep: false,
+                shutdown: false,
+            }],
         };
-        let bytes = state.old_to_bytes();
+        let bytes = power.to_bytes(AuraDeviceType::LaptopPre2021);
         println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
         assert_eq!(bytes, [0x08, 0x00, 0x02, 0x00]);
 
-        let state = AuraPowerState {
-            zone: PowerZones::Lightbar,
-            awake: true,
-            boot: false,
-            sleep: false,
-            shutdown: false,
+        let power = LaptopAuraPower {
+            states: vec![AuraPowerState {
+                zone: PowerZones::Lightbar,
+                boot: false,
+                awake: true,
+                sleep: false,
+                shutdown: false,
+            }],
         };
-        let bytes = state.old_to_bytes();
+        let bytes = power.to_bytes(AuraDeviceType::LaptopPre2021);
         println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
         assert_eq!(bytes, [0x04, 0x05, 0x02, 0x00]);
 
-        let bytes = AuraPowerState {
-            zone: PowerZones::None,
-            awake: false,
-            boot: false,
-            sleep: true,
-            shutdown: false,
+        // let bytes = [
+        //     OldAuraPower::Keyboard,
+        //     OldAuraPower::Lightbar,
+        //     OldAuraPower::Awake,
+        //     OldAuraPower::Sleep,
+        //     OldAuraPower::Boot,
+        // ];
+        let power = LaptopAuraPower {
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Keyboard,
+                    boot: true,
+                    awake: true,
+                    sleep: true,
+                    shutdown: false,
+                },
+                AuraPowerState {
+                    zone: PowerZones::Lightbar,
+                    boot: true,
+                    awake: true,
+                    sleep: true,
+                    shutdown: false,
+                },
+            ],
         };
-        let bytes = bytes.old_to_bytes();
-        println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
-        assert_eq!(bytes, [0x30, 0x08, 0x04, 0x00]);
-
-        let bytes = AuraPowerState {
-            zone: PowerZones::None,
-            awake: false,
-            boot: true,
-            sleep: false,
-            shutdown: false,
-        };
-        let bytes = bytes.old_to_bytes();
-        println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
-        assert_eq!(bytes, [0xc3, 0x12, 0x09, 0x00]);
-
-        let power = AuraPowerState {
-            zone: PowerZones::KeyboardAndLightbar,
-            awake: true,
-            boot: true,
-            sleep: true,
-            shutdown: false,
-        };
-
-        let bytes = power.old_to_bytes();
+        let bytes = power.to_bytes(AuraDeviceType::LaptopPre2021);
         println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
         assert_eq!(bytes, [0xff, 0x1f, 0x000f, 0x00]);
     }
 
     #[test]
     fn check_0x19b6_control_bytes_binary_rep() {
-        fn to_binary_string(power: &LaptopAuraPower) -> String {
-            let bytes = power.to_bytes(AuraDeviceType::LaptopPost2021);
-            format!(
-                "{:08b}, {:08b}, {:08b}, {:08b}",
-                bytes[0], bytes[1], bytes[2], bytes[3]
-            )
-        }
-
-        let boot_logo_ = to_binary_string(&LaptopAuraPower {
+        let boot_logo_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Logo,
                 boot: true,
@@ -357,7 +374,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let boot_keyb_ = to_binary_string(&LaptopAuraPower {
+        let boot_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Keyboard,
                 boot: true,
@@ -366,7 +383,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let sleep_logo = to_binary_string(&LaptopAuraPower {
+        let sleep_logo = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Logo,
                 boot: false,
@@ -375,7 +392,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let sleep_keyb = to_binary_string(&LaptopAuraPower {
+        let sleep_keyb = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Keyboard,
                 boot: false,
@@ -384,7 +401,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let awake_logo = to_binary_string(&LaptopAuraPower {
+        let awake_logo = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Logo,
                 boot: false,
@@ -393,7 +410,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let awake_keyb = to_binary_string(&LaptopAuraPower {
+        let awake_keyb = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Keyboard,
                 boot: false,
@@ -402,7 +419,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let shut_logo_ = to_binary_string(&LaptopAuraPower {
+        let shut_logo_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Logo,
                 boot: false,
@@ -411,7 +428,7 @@ mod test {
                 shutdown: true,
             }],
         });
-        let shut_keyb_ = to_binary_string(&LaptopAuraPower {
+        let shut_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Keyboard,
                 boot: false,
@@ -420,7 +437,7 @@ mod test {
                 shutdown: true,
             }],
         });
-        let boot_bar__ = to_binary_string(&LaptopAuraPower {
+        let boot_bar__ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lightbar,
                 boot: true,
@@ -429,7 +446,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let awake_bar_ = to_binary_string(&LaptopAuraPower {
+        let awake_bar_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lightbar,
                 boot: false,
@@ -438,7 +455,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let sleep_bar_ = to_binary_string(&LaptopAuraPower {
+        let sleep_bar_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lightbar,
                 boot: false,
@@ -447,7 +464,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let shut_bar__ = to_binary_string(&LaptopAuraPower {
+        let shut_bar__ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lightbar,
                 boot: false,
@@ -456,7 +473,7 @@ mod test {
                 shutdown: true,
             }],
         });
-        let boot_lid__ = to_binary_string(&LaptopAuraPower {
+        let boot_lid__ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lid,
                 boot: true,
@@ -465,7 +482,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let awake_lid_ = to_binary_string(&LaptopAuraPower {
+        let awake_lid_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lid,
                 boot: false,
@@ -474,7 +491,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let sleep_lid_ = to_binary_string(&LaptopAuraPower {
+        let sleep_lid_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lid,
                 boot: false,
@@ -483,7 +500,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let shut_lid__ = to_binary_string(&LaptopAuraPower {
+        let shut_lid__ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::Lid,
                 boot: false,
@@ -492,7 +509,7 @@ mod test {
                 shutdown: true,
             }],
         });
-        let boot_rear_ = to_binary_string(&LaptopAuraPower {
+        let boot_rear_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::RearGlow,
                 boot: true,
@@ -501,7 +518,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let awake_rear = to_binary_string(&LaptopAuraPower {
+        let awake_rear = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::RearGlow,
                 boot: false,
@@ -510,7 +527,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let sleep_rear = to_binary_string(&LaptopAuraPower {
+        let sleep_rear = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::RearGlow,
                 boot: false,
@@ -519,7 +536,7 @@ mod test {
                 shutdown: false,
             }],
         });
-        let shut_rear_ = to_binary_string(&LaptopAuraPower {
+        let shut_rear_ = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![AuraPowerState {
                 zone: PowerZones::RearGlow,
                 boot: false,
@@ -554,7 +571,7 @@ mod test {
         assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 00001000");
 
         // All on
-        let byte1 = to_binary_string(&LaptopAuraPower {
+        let byte1 = to_binary_string_post2021(&LaptopAuraPower {
             states: vec![
                 AuraPowerState {
                     zone: PowerZones::Keyboard,

rog-aura/src/lib.rs

@@ -126,7 +126,7 @@ pub enum PowerZones {
     Lid = 3,
     /// The led strip on the rear of some laptops
     RearGlow = 4,
-    /// On pre-2021 laptops there is either 1 or 2 zones used
+    /// Exists for the older 0x1866 models
     KeyboardAndLightbar = 5,
     None = 255,
 }

rog-control-center/Cargo.toml

@@ -9,10 +9,15 @@ homepage.workspace = true
 edition.workspace = true
 
 [features]
-#default = ["mocking"]
-#mocking = []
+default = []
+mocking = []
+x11 = ["slint/backend-winit-x11"]
+# Requires RUSTFLAGS="--cfg tokio_unstable"
+tokio-debug = ["console-subscriber"]
 
 [dependencies]
+console-subscriber = { version = "0.2.0", optional = true }
+
 nix = { version = "^0.28.0", features = ["fs"] }
 tempfile = "3.3.0"
 betrayer = { version = "0.2.0" }
@@ -24,7 +29,7 @@ rog_dbus = { path = "../rog-dbus" }
 rog_aura = { path = "../rog-aura" }
 rog_profiles = { path = "../rog-profiles" }
 rog_platform = { path = "../rog-platform" }
-supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", rev = "4eb6e97c22b68ae8d1e80500709b0c0580776ad3", default-features = false }
+supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", default-features = false }
 dmi_id = { path = "../dmi-id" }
 
 gumdrop.workspace = true

rog-control-center/README.md

@@ -1,5 +1,9 @@
 # ROGALOG
 
+## X11 support
+
+X11 is not supported at all, as in I will not help you with X11 issues if there are any due to limited time and it being unmaintained itself. You can however build `rog-control-center` with it enabled `cargo build --features x11`.
+
 ### Translations
 
 You can help with translations by following https://slint.dev/releases/1.1.0/docs/slint/src/concepts/translations#translate-the-strings
@@ -8,4 +12,4 @@ Begin by copying `rog-control-center/translations/en/rog-control-center.po` to `
 
 Run `msgfmt rog-control-center/translations/<YOUR LOCALE>/rog-control-center.po -o rog-control-center/translations/<YOUR LOCALE>/LC_MESSAGES/rog-control-center.mo` to make the binary formatted translation where `<YOUR LOCALE>` is changed to your translation locale.
 
-To test you local translations run `RUST_TRANSLATIONS=1 rog-control-center`.
+To test you local translations run `RUST_TRANSLATIONS=1 rog-control-center`.

rog-control-center/src/main.rs

@@ -25,6 +25,9 @@ use tokio::runtime::Runtime;
 
 #[tokio::main]
 async fn main() -> Result<()> {
+    #[cfg(feature = "tokio-debug")]
+    console_subscriber::init();
+
     let self_version = env!("CARGO_PKG_VERSION");
     let conn = zbus::blocking::Connection::system()?;
     let proxy = rog_dbus::zbus_platform::PlatformProxyBlocking::new(&conn)?;

rog-control-center/src/notify.rs

@@ -20,7 +20,6 @@ use supergfxctl::pci_device::{GfxMode, GfxPower};
 use supergfxctl::zbus_proxy::DaemonProxy as SuperProxy;
 use tokio::runtime::Runtime;
 use tokio::task::JoinHandle;
-use tokio::time::sleep;
 use zbus::export::futures_util::StreamExt;
 
 use crate::config::Config;
@@ -46,6 +45,44 @@ impl Default for EnabledNotifications {
     }
 }
 
+fn start_dpu_status_mon(config: Arc<Mutex<Config>>) {
+    use supergfxctl::pci_device::Device;
+    let dev = Device::find().unwrap_or_default();
+    let mut found_dgpu = false; // just for logging
+    for dev in dev {
+        if dev.is_dgpu() {
+            let enabled_notifications_copy = config.clone();
+            // Plain old thread is perfectly fine since most of this is potentially blocking
+            std::thread::spawn(move || {
+                let mut last_status = GfxPower::Unknown;
+                loop {
+                    std::thread::sleep(Duration::from_millis(1000));
+                    if let Ok(status) = dev.get_runtime_status() {
+                        if status != GfxPower::Unknown && status != last_status {
+                            if let Ok(config) = enabled_notifications_copy.lock() {
+                                if !config.notifications.receive_notify_gfx_status
+                                    || !config.notifications.enabled
+                                {
+                                    continue;
+                                }
+                            }
+                            // Required check because status cycles through
+                            // active/unknown/suspended
+                            do_gpu_status_notif("dGPU status changed:", &status).ok();
+                        }
+                        last_status = status;
+                    }
+                }
+            });
+            found_dgpu = true;
+            break;
+        }
+    }
+    if !found_dgpu {
+        warn!("Did not find a dGPU on this system, dGPU status won't be avilable");
+    }
+}
+
 pub fn start_notifications(
     config: Arc<Mutex<Config>>,
     rt: &Runtime,
@@ -104,20 +141,14 @@ pub fn start_notifications(
     // GPU MUX Mode notif
     let enabled_notifications_copy = config.clone();
     tokio::spawn(async move {
-        let conn = zbus::Connection::system()
-            .await
-            .map_err(|e| {
-                error!("zbus signal: receive_notify_gpu_mux_mode: {e}");
-                e
-            })
-            .unwrap();
-        let proxy = PlatformProxy::new(&conn)
-            .await
-            .map_err(|e| {
-                error!("zbus signal: receive_notify_gpu_mux_mode: {e}");
-                e
-            })
-            .unwrap();
+        let conn = zbus::Connection::system().await.map_err(|e| {
+            error!("zbus signal: receive_notify_gpu_mux_mode: {e}");
+            e
+        })?;
+        let proxy = PlatformProxy::new(&conn).await.map_err(|e| {
+            error!("zbus signal: receive_notify_gpu_mux_mode: {e}");
+            e
+        })?;
 
         let mut actual_mux_mode = GpuMode::Error;
         if let Ok(mode) = proxy.gpu_mux_mode().await {
@@ -139,87 +170,75 @@ pub fn start_notifications(
                 do_mux_notification("Reboot required. BIOS GPU MUX mode set to", &mode).ok();
             }
         }
+        Ok::<(), zbus::Error>(())
     });
 
-    use supergfxctl::pci_device::Device;
-    let dev = Device::find().unwrap_or_default();
-    let mut found_dgpu = false; // just for logging
-    for dev in dev {
-        if dev.is_dgpu() {
-            let enabled_notifications_copy = config.clone();
-            // Plain old thread is perfectly fine since most of this is potentially blocking
-            tokio::spawn(async move {
-                let mut last_status = GfxPower::Unknown;
-                loop {
-                    if let Ok(status) = dev.get_runtime_status() {
-                        if status != GfxPower::Unknown && status != last_status {
-                            if let Ok(config) = enabled_notifications_copy.lock() {
-                                if !config.notifications.receive_notify_gfx_status
-                                    || !config.notifications.enabled
-                                {
-                                    continue;
-                                }
-                            }
-                            // Required check because status cycles through
-                            // active/unknown/suspended
-                            do_gpu_status_notif("dGPU status changed:", &status).ok();
-                        }
-                        last_status = status;
-                    }
-                    sleep(Duration::from_millis(500)).await;
-                }
-            });
-            found_dgpu = true;
-            break;
-        }
-    }
-    if !found_dgpu {
-        warn!("Did not find a dGPU on this system, dGPU status won't be avilable");
-    }
-
+    let enabled_notifications_copy = config.clone();
     // GPU Mode change/action notif
     tokio::spawn(async move {
-        let conn = zbus::Connection::system()
-            .await
-            .map_err(|e| {
-                error!("zbus signal: receive_notify_action: {e}");
-                e
-            })
-            .unwrap();
-        let proxy = SuperProxy::builder(&conn)
-            .build()
-            .await
-            .map_err(|e| {
-                error!("zbus signal: receive_notify_action: {e}");
-                e
-            })
-            .unwrap();
+        if let Err(e) = {
+            let conn = zbus::Connection::system().await?;
+            let proxy = SuperProxy::builder(&conn).build().await?;
+            let _ = proxy.mode().await?;
 
-        if proxy.mode().await.is_err() {
-            info!("supergfxd not running or not responding");
-            return;
-        }
-
-        if let Ok(mut p) = proxy.receive_notify_action().await {
-            info!("Started zbus signal thread: receive_notify_action");
-            while let Some(e) = p.next().await {
-                if let Ok(out) = e.args() {
-                    let action = out.action();
-                    let mode = convert_gfx_mode(proxy.mode().await.unwrap_or_default());
-                    match action {
-                        supergfxctl::actions::UserActionRequired::Reboot => {
-                            do_mux_notification("Graphics mode change requires reboot", &mode)
+            let proxy_copy = proxy.clone();
+            if let Ok(mut p) = proxy.receive_notify_action().await {
+                tokio::spawn(async move {
+                    info!("Started zbus signal thread: receive_notify_action");
+                    while let Some(e) = p.next().await {
+                        if let Ok(out) = e.args() {
+                            let action = out.action();
+                            let mode = convert_gfx_mode(proxy.mode().await.unwrap_or_default());
+                            match action {
+                                supergfxctl::actions::UserActionRequired::Reboot => {
+                                    do_mux_notification(
+                                        "Graphics mode change requires reboot",
+                                        &mode,
+                                    )
+                                }
+                                _ => do_gfx_action_notif(<&str>::from(action), *action, mode),
+                            }
+                            .map_err(|e| {
+                                error!("zbus signal: do_gfx_action_notif: {e}");
+                                e
+                            })
+                            .ok();
                         }
-                        _ => do_gfx_action_notif(<&str>::from(action), *action, mode),
                     }
-                    .map_err(|e| {
-                        error!("zbus signal: do_gfx_action_notif: {e}");
-                        e
-                    })
-                    .ok();
-                }
-            }
-        };
+                });
+            };
+
+            if let Ok(mut p) = proxy_copy.receive_notify_gfx_status().await {
+                tokio::spawn(async move {
+                    info!("Started zbus signal thread: receive_notify_gfx_status");
+                    let mut last_status = GfxPower::Unknown;
+                    while let Some(e) = p.next().await {
+                        if let Ok(out) = e.args() {
+                            let status = out.status;
+                            if status != GfxPower::Unknown && status != last_status {
+                                if let Ok(config) = enabled_notifications_copy.lock() {
+                                    if !config.notifications.receive_notify_gfx_status
+                                        || !config.notifications.enabled
+                                    {
+                                        continue;
+                                    }
+                                }
+                                // Required check because status cycles through
+                                // active/unknown/suspended
+                                do_gpu_status_notif("dGPU status changed:", &status).ok();
+                            }
+                            last_status = status;
+                        }
+                    }
+                });
+            };
+            Ok::<(), zbus::Error>(())
+        } {
+            error!("zbus signal: receive_notify_gfx_status: {e}");
+            info!("Attempting to start plain dgpu status monitor");
+            start_dpu_status_mon(config.clone());
+        }
+        Ok::<(), zbus::Error>(())
     });
 
     Ok(vec![blocking])

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

@@ -1,5 +1,6 @@
 use crate::slint_generatedMainWindow::{
-    AuraPowerState as SlintAuraPowerState, LaptopAuraPower as SlintLaptopAuraPower,
+    AuraDevType as SlintDeviceType, AuraPowerState as SlintAuraPowerState,
+    LaptopAuraPower as SlintLaptopAuraPower,
 };
 
 impl From<rog_aura::AuraEffect> for crate::slint_generatedMainWindow::AuraEffect {
@@ -51,7 +52,7 @@ impl From<crate::slint_generatedMainWindow::AuraEffect> for rog_aura::AuraEffect
 }
 
 use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower};
-use rog_aura::PowerZones;
+use rog_aura::{AuraDeviceType, PowerZones};
 use slint::{Model, ModelRc, RgbaColor};
 
 use crate::slint_generatedMainWindow::PowerZones as SlintPowerZones;
@@ -141,3 +142,27 @@ impl From<LaptopAuraPower> for SlintLaptopAuraPower {
         }
     }
 }
+
+impl From<SlintDeviceType> for AuraDeviceType {
+    fn from(value: SlintDeviceType) -> Self {
+        match value {
+            SlintDeviceType::New => Self::LaptopPost2021,
+            SlintDeviceType::Old => Self::LaptopPre2021,
+            SlintDeviceType::Tuf => Self::LaptopTuf,
+            SlintDeviceType::ScsiExtDisk => Self::ScsiExtDisk,
+            SlintDeviceType::Unknown => Self::Unknown,
+        }
+    }
+}
+
+impl From<AuraDeviceType> for SlintDeviceType {
+    fn from(value: AuraDeviceType) -> Self {
+        match value {
+            AuraDeviceType::LaptopPost2021 => SlintDeviceType::New,
+            AuraDeviceType::LaptopPre2021 => SlintDeviceType::Old,
+            AuraDeviceType::LaptopTuf => SlintDeviceType::Tuf,
+            AuraDeviceType::ScsiExtDisk => SlintDeviceType::ScsiExtDisk,
+            AuraDeviceType::Unknown => SlintDeviceType::Unknown,
+        }
+    }
+}

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

@@ -6,12 +6,12 @@ pub mod setup_system;
 use std::sync::{Arc, Mutex};
 
 use config_traits::StdConfig;
-use rog_dbus::zbus_platform::PlatformProxyBlocking;
+use rog_dbus::list_iface_blocking;
 use slint::{ComponentHandle, PhysicalSize, SharedString, Weak};
 
 use crate::config::Config;
 use crate::ui::setup_anime::setup_anime_page;
-use crate::ui::setup_aura::{has_aura_iface_blocking, setup_aura_page};
+use crate::ui::setup_aura::setup_aura_page;
 use crate::ui::setup_fans::setup_fan_curve_page;
 use crate::ui::setup_system::{setup_system_page, setup_system_page_callbacks};
 use crate::{AppSettingsPageData, MainWindow};
@@ -108,19 +108,14 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
         }
     };
 
-    let conn = zbus::blocking::Connection::system().unwrap();
-    let platform = PlatformProxyBlocking::new(&conn).unwrap();
-
-    let interfaces = platform.supported_interfaces().unwrap();
-    log::debug!("Available interfaces: {interfaces:?}");
-    // "Anime", "Aura", "FanCurves", "Platform"
+    let available = list_iface_blocking().unwrap_or_default();
     ui.set_sidebar_items_avilable(
         [
             // Needs to match the order of slint sidebar items
-            interfaces.contains(&"Platform".into()),
-            has_aura_iface_blocking().unwrap_or(false),
-            interfaces.contains(&"Anime".into()),
-            interfaces.contains(&"FanCurves".into()),
+            available.contains(&"org.asuslinux.Platform".to_string()),
+            available.contains(&"org.asuslinux.Aura".to_string()),
+            available.contains(&"org.asuslinux.Anime".to_string()),
+            available.contains(&"org.asuslinux.FanCurves".to_string()),
             true,
             true,
         ]
@@ -132,11 +127,19 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
     });
 
     setup_app_settings_page(&ui, config.clone());
-    setup_system_page(&ui, config.clone());
-    setup_system_page_callbacks(&ui, config.clone());
-    setup_aura_page(&ui, config.clone());
-    setup_anime_page(&ui, config.clone());
-    setup_fan_curve_page(&ui, config);
+    if available.contains(&"org.asuslinux.Platform".to_string()) {
+        setup_system_page(&ui, config.clone());
+        setup_system_page_callbacks(&ui, config.clone());
+    }
+    if available.contains(&"org.asuslinux.Aura".to_string()) {
+        setup_aura_page(&ui, config.clone());
+    }
+    if available.contains(&"org.asuslinux.Anime".to_string()) {
+        setup_anime_page(&ui, config.clone());
+    }
+    if available.contains(&"org.asuslinux.FanCurves".to_string()) {
+        setup_fan_curve_page(&ui, config);
+    }
     ui
 }
 

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

@@ -1,5 +1,6 @@
 use std::sync::{Arc, Mutex};
 
+use log::{error, info, warn};
 use rog_anime::Animations;
 use rog_dbus::zbus_anime::AnimeProxy;
 use slint::ComponentHandle;
@@ -11,8 +12,13 @@ use crate::{set_ui_callbacks, set_ui_props_async, AnimePageData, MainWindow};
 pub fn setup_anime_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
     let handle = ui.as_weak();
     tokio::spawn(async move {
-        let conn = zbus::Connection::system().await.unwrap();
-        let anime = AnimeProxy::new(&conn).await.unwrap();
+        let Ok(conn) = zbus::Connection::system().await.map_err(|e| warn!("{e:}")) else {
+            return;
+        };
+        let Ok(anime) = AnimeProxy::new(&conn).await.map_err(|e| warn!("{e:}")) else {
+            info!("This device may not have an AniMe. If not then the error can be ignored");
+            return;
+        };
 
         set_ui_props_async!(handle, anime, AnimePageData, brightness);
         set_ui_props_async!(handle, anime, AnimePageData, builtins_enabled);
@@ -123,6 +129,7 @@ pub fn setup_anime_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
                     "Setting Anime off_when_unplugged failed"
                 );
             })
-            .unwrap();
+            .map_err(|e| error!("setup_anime_page: upgrade_in_event_loop: {e:?}"))
+            .ok();
     });
 }

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

@@ -1,7 +1,8 @@
 use std::sync::{Arc, Mutex};
 
-use log::info;
+use log::{debug, error, info};
 use rog_aura::keyboard::LaptopAuraPower;
+use rog_aura::{AuraDeviceType, PowerZones};
 use rog_dbus::zbus_aura::AuraProxy;
 use slint::{ComponentHandle, Model, RgbaColor, SharedString};
 
@@ -33,31 +34,11 @@ fn decode_hex(s: &str) -> RgbaColor<u8> {
     }
 }
 
-pub fn has_aura_iface_blocking() -> Result<bool, Box<dyn std::error::Error>> {
-    let conn = zbus::blocking::Connection::system()?;
-    let f = zbus::blocking::fdo::ObjectManagerProxy::new(
-        &conn,
-        "org.asuslinux.Daemon",
-        "/org/asuslinux",
-    )?;
-    let interfaces = f.get_managed_objects()?;
-    let mut aura_paths = Vec::new();
-    for v in interfaces.iter() {
-        for k in v.1.keys() {
-            if k.as_str() == "org.asuslinux.Aura" {
-                aura_paths.push(v.0.clone());
-            }
-        }
-    }
-    Ok(!aura_paths.is_empty())
-}
-
 /// Returns the first available Aura interface
 // TODO: return all
 async fn find_aura_iface() -> Result<AuraProxy<'static>, Box<dyn std::error::Error>> {
     let conn = zbus::Connection::system().await?;
-    let f =
-        zbus::fdo::ObjectManagerProxy::new(&conn, "org.asuslinux.Daemon", "/org/asuslinux").await?;
+    let f = zbus::fdo::ObjectManagerProxy::new(&conn, "org.asuslinux.Daemon", "/").await?;
     let interfaces = f.get_managed_objects().await?;
     let mut aura_paths = Vec::new();
     for v in interfaces.iter() {
@@ -93,26 +74,51 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
 
     let handle = ui.as_weak();
     tokio::spawn(async move {
-        let aura = if let Ok(aura) = find_aura_iface().await {
-            aura
-        } else {
+        let Ok(aura) = find_aura_iface().await else {
             info!("This device appears to have no aura interfaces");
-            return;
+            return Ok::<(), zbus::Error>(());
         };
 
         set_ui_props_async!(handle, aura, AuraPageData, brightness);
         set_ui_props_async!(handle, aura, AuraPageData, led_mode);
         set_ui_props_async!(handle, aura, AuraPageData, led_mode_data);
         set_ui_props_async!(handle, aura, AuraPageData, led_power);
+        set_ui_props_async!(handle, aura, AuraPageData, device_type);
 
-        if let Ok(power) = aura.supported_power_zones().await {
-            log::debug!("Available LED power modes {power:?}");
-            let power: Vec<SlintPowerZones> = power.iter().map(|p| (*p).into()).collect();
+        if let Ok(mut pow3r) = aura.supported_power_zones().await {
+            let dev_type = aura
+                .device_type()
+                .await
+                .unwrap_or(AuraDeviceType::LaptopPost2021);
+            log::debug!("Available LED power modes {pow3r:?}");
             handle
                 .upgrade_in_event_loop(move |handle| {
-                    handle
+                    let names: Vec<SharedString> = handle
                         .global::<AuraPageData>()
-                        .set_supported_power_zones(power.as_slice().into());
+                        .get_power_zone_names()
+                        .iter()
+                        .collect();
+
+                    if dev_type.is_old_laptop() {
+                        // Need to add the specific KeyboardAndLightbar
+                        if pow3r.contains(&PowerZones::Keyboard)
+                            && pow3r.contains(&PowerZones::Lightbar)
+                        {
+                            pow3r.push(PowerZones::KeyboardAndLightbar);
+                        }
+                        let names: Vec<SharedString> =
+                            pow3r.iter().map(|n| names[(*n) as usize].clone()).collect();
+                        handle
+                            .global::<AuraPageData>()
+                            .set_power_zone_names_old(names.as_slice().into());
+                    } else {
+                        let power: Vec<SlintPowerZones> =
+                            pow3r.iter().map(|p| (*p).into()).collect();
+
+                        handle
+                            .global::<AuraPageData>()
+                            .set_supported_power_zones(power.as_slice().into());
+                    }
                 })
                 .ok();
         }
@@ -138,6 +144,7 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
                         .global::<AuraPageData>()
                         .set_available_mode_names(res.as_slice().into());
                 })
+                .map_err(|e| error!("{e:}"))
                 .ok();
         }
 
@@ -196,7 +203,8 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
                         });
                     });
             })
-            .unwrap();
+            .map_err(|e| error!("{e:}"))
+            .ok();
 
         // Need to update the UI if the mode changes
         let handle_copy = handle.clone();
@@ -213,9 +221,12 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
                                 .invoke_update_led_mode_data(out.into());
                             handle.invoke_external_colour_change();
                         })
+                        .map_err(|e| error!("{e:}"))
                         .ok();
                 }
             }
         });
+        debug!("Aura setup tasks complete");
+        Ok(())
     });
 }

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

@@ -1,5 +1,6 @@
 use std::sync::{Arc, Mutex};
 
+use log::{error, info};
 use rog_dbus::zbus_fan_curves::FanCurvesProxy;
 use rog_platform::platform::ThrottlePolicy;
 use rog_profiles::fan_curve_set::CurveData;
@@ -81,7 +82,8 @@ pub fn update_fan_data(
                 }
             }
         })
-        .unwrap();
+        .map_err(|e| error!("update_fan_data: upgrade_in_event_loop: {e:?}"))
+        .ok();
 }
 
 pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
@@ -89,17 +91,44 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
 
     tokio::spawn(async move {
         // Create the connections/proxies here to prevent future delays in process
-        let conn = zbus::Connection::system().await.unwrap();
-        let fans = FanCurvesProxy::new(&conn).await.unwrap();
+        let conn = if let Ok(conn) = zbus::Connection::system().await.map_err(|e| error!("{e:}")) {
+            conn
+        } else {
+            return;
+        };
+        let fans = if let Ok(fans) = FanCurvesProxy::new(&conn).await.map_err(|e| error!("{e:}")) {
+            fans
+        } else {
+            info!(
+                "This device may not have an Fan Curve control. If not then the error can be \
+                 ignored"
+            );
+            return;
+        };
 
         let handle_copy = handle.clone();
         // Do initial setup
-        let balanced = fans.fan_curve_data(ThrottlePolicy::Balanced).await.unwrap();
-        let perf = fans
+        let Ok(balanced) = fans
+            .fan_curve_data(ThrottlePolicy::Balanced)
+            .await
+            .map_err(|e| error!("{e:}"))
+        else {
+            return;
+        };
+        let Ok(perf) = fans
             .fan_curve_data(ThrottlePolicy::Performance)
             .await
-            .unwrap();
-        let quiet = fans.fan_curve_data(ThrottlePolicy::Quiet).await.unwrap();
+            .map_err(|e| error!("{e:}"))
+        else {
+            return;
+        };
+        let Ok(quiet) = fans
+            .fan_curve_data(ThrottlePolicy::Quiet)
+            .await
+            .map_err(|e| error!("{e:}"))
+        else {
+            return;
+        };
         update_fan_data(handle, balanced, perf, quiet);
 
         let handle_next1 = handle_copy.clone();
@@ -111,14 +140,30 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
                     let fans = fans1.clone();
                     let handle_next = handle_next1.clone();
                     tokio::spawn(async move {
-                        fans.set_curves_to_defaults(profile.into()).await.unwrap();
-
-                        let balanced = fans.fan_curve_data(ThrottlePolicy::Balanced).await.unwrap();
-                        let perf = fans
+                        if fans.set_curves_to_defaults(profile.into()).await.is_err() {
+                            return;
+                        }
+                        let Ok(balanced) = fans
+                            .fan_curve_data(ThrottlePolicy::Balanced)
+                            .await
+                            .map_err(|e| error!("{e:}"))
+                        else {
+                            return;
+                        };
+                        let Ok(perf) = fans
                             .fan_curve_data(ThrottlePolicy::Performance)
                             .await
-                            .unwrap();
-                        let quiet = fans.fan_curve_data(ThrottlePolicy::Quiet).await.unwrap();
+                            .map_err(|e| error!("{e:}"))
+                        else {
+                            return;
+                        };
+                        let Ok(quiet) = fans
+                            .fan_curve_data(ThrottlePolicy::Quiet)
+                            .await
+                            .map_err(|e| error!("{e:}"))
+                        else {
+                            return;
+                        };
                         update_fan_data(handle_next, balanced, perf, quiet);
                     });
                 });
@@ -127,11 +172,15 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
                     let data: Vec<Node> = data.iter().collect();
                     let data = fan_data_for(fan, enabled, data);
                     tokio::spawn(async move {
-                        fans.set_fan_curve(profile.into(), data).await.unwrap();
+                        fans.set_fan_curve(profile.into(), data)
+                            .await
+                            .map_err(|e| error!("{e:}"))
+                            .ok()
                     });
                 });
             })
-            .unwrap();
+            .map_err(|e| error!("setup_fan_curve_page: upgrade_in_event_loop: {e:?}"))
+            .ok();
     });
 }
 

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

@@ -60,7 +60,19 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
         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,
+            change_throttle_policy_on_battery
+        );
         set_ui_props_async!(handle, platform, SystemPageData, throttle_policy_on_ac);
+        set_ui_props_async!(
+            handle,
+            platform,
+            SystemPageData,
+            change_throttle_policy_on_ac
+        );
 
         set_ui_props_async!(handle, platform, SystemPageData, panel_od);
         set_ui_props_async!(handle, platform, SystemPageData, boot_sound);
@@ -94,6 +106,7 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
             throttle_thermal_policy: sys_props.contains(&Properties::ThrottlePolicy),
         };
 
+        // TODO: move the fail/sucess messages to slint
         handle
             .upgrade_in_event_loop(move |handle| {
                 handle.global::<SystemPageData>().set_available(props);
@@ -163,13 +176,24 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>)
                     "Throttle policy on AC set to {}",
                     "Setting Throttle policy on AC failed"
                 );
+                set_ui_callbacks!(handle,
+                    SystemPageData(as bool),
+                    platform.change_throttle_policy_on_ac(.into()),
+                    "Throttle policy on AC enabled: {}",
+                    "Setting Throttle policy on AC failed"
+                );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
                     platform.throttle_policy_on_battery(.into()),
                     "Throttle policy on abttery set to {}",
                     "Setting Throttle policy on battery failed"
                 );
-
+                set_ui_callbacks!(handle,
+                    SystemPageData(as bool),
+                    platform.change_throttle_policy_on_battery(.into()),
+                    "Throttle policy on battery enabled: {}",
+                    "Setting Throttle policy on AC failed"
+                );
                 set_ui_callbacks!(handle,
                     SystemPageData(as f32),
                     platform.ppt_pl1_spl(as u8),

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

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-05-08 22:59+0000\n"
+"POT-Creation-Date: 2024-05-17 23:21+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"
@@ -137,77 +137,122 @@ msgctxt "PageAnime"
 msgid "Off when on battery"
 msgstr ""
 
-#: rog-control-center/ui/pages/app_settings.slint:29
+#: 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:38
+#: 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:50
+#: 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:59
+#: rog-control-center/ui/pages/app_settings.slint:50
 msgctxt "PageAppSettings"
 msgid "Enable dGPU notifications"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:27
+#: 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/fans.slint:26
 msgctxt "FanTab"
 msgid "This fan is not avilable on this machine"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:35
+#: rog-control-center/ui/pages/fans.slint:34
 msgctxt "FanTab"
 msgid "Enabled"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:44
+#: rog-control-center/ui/pages/fans.slint:43
 msgctxt "FanTab"
 msgid "Apply"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:52
+#: rog-control-center/ui/pages/fans.slint:51
 msgctxt "FanTab"
 msgid "Cancel"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:60
+#: rog-control-center/ui/pages/fans.slint:59
 msgctxt "FanTab"
 msgid "Factory Default (all fans)"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:73
+#: rog-control-center/ui/pages/fans.slint:72
 msgctxt "PageFans"
 msgid "Balanced"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:76 rog-control-center/ui/pages/fans.slint:135 rog-control-center/ui/pages/fans.slint:194
+#: 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:94 rog-control-center/ui/pages/fans.slint:153 rog-control-center/ui/pages/fans.slint:212
+#: 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:112 rog-control-center/ui/pages/fans.slint:171 rog-control-center/ui/pages/fans.slint:230
+#: 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:132
+#: rog-control-center/ui/pages/fans.slint:131
 msgctxt "PageFans"
 msgid "Performance"
 msgstr ""
 
-#: rog-control-center/ui/pages/fans.slint:191
+#: rog-control-center/ui/pages/fans.slint:190
 msgctxt "PageFans"
 msgid "Quiet"
 msgstr ""
@@ -247,407 +292,392 @@ msgctxt "SystemPageData"
 msgid "Power"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:106
+#: rog-control-center/ui/pages/system.slint:110
 msgctxt "PageSystem"
 msgid "Base system settings"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:111
+#: rog-control-center/ui/pages/system.slint:115
 msgctxt "PageSystem"
 msgid "Charge limit"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:123
+#: rog-control-center/ui/pages/system.slint:127
 msgctxt "PageSystem"
 msgid "Throttle Policy"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:133
+#: rog-control-center/ui/pages/system.slint:137
 msgctxt "PageSystem"
 msgid "Advanced"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:145
+#: rog-control-center/ui/pages/system.slint:149
 msgctxt "PageSystem"
 msgid "Panel Overdrive"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:153
+#: rog-control-center/ui/pages/system.slint:157
 msgctxt "PageSystem"
 msgid "MiniLED Mode"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:161
+#: rog-control-center/ui/pages/system.slint:165
 msgctxt "PageSystem"
 msgid "POST boot sound"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:179
+#: rog-control-center/ui/pages/system.slint:183
 msgctxt "PageSystem"
 msgid "System performance settings"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:184
+#: rog-control-center/ui/pages/system.slint:188
 msgctxt "ppt_pl1_spl"
 msgid "ppt_pl1_spl"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:194
+#: rog-control-center/ui/pages/system.slint:198
 msgctxt "ppt_pl2_sppt"
 msgid "ppt_pl2_sppt"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:204
+#: rog-control-center/ui/pages/system.slint:208
 msgctxt "ppt_fppt"
 msgid "ppt_fppt"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:214
+#: rog-control-center/ui/pages/system.slint:218
 msgctxt "ppt_apu_sppt"
 msgid "ppt_apu_sppt"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:224
+#: rog-control-center/ui/pages/system.slint:228
 msgctxt "ppt_platform_sppt"
 msgid "ppt_platform_sppt"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:234
+#: rog-control-center/ui/pages/system.slint:238
 msgctxt "nv_dynamic_boost"
 msgid "nv_dynamic_boost"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:244
+#: rog-control-center/ui/pages/system.slint:248
 msgctxt "nv_temp_target"
 msgid "nv_temp_target"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:290
+#: rog-control-center/ui/pages/system.slint:294
 msgctxt "PageSystem"
 msgid "Energy Performance Preference linked to Throttle Policy"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:294
+#: rog-control-center/ui/pages/system.slint:298
 msgctxt "PageSystem"
 msgid "Change EPP based on Throttle Policy"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:302
+#: rog-control-center/ui/pages/system.slint:306
 msgctxt "PageSystem"
 msgid "EPP for Balanced Policy"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:312
+#: rog-control-center/ui/pages/system.slint:316
 msgctxt "PageSystem"
 msgid "EPP for Performance Policy"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:322
+#: rog-control-center/ui/pages/system.slint:326
 msgctxt "PageSystem"
 msgid "EPP for Quiet Policy"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:340
+#: rog-control-center/ui/pages/system.slint:344
 msgctxt "PageSystem"
 msgid "Throttle Policy for power state"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:344
+#: rog-control-center/ui/pages/system.slint:350
 msgctxt "PageSystem"
 msgid "Throttle Policy on Battery"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:354
+#: rog-control-center/ui/pages/system.slint:360 rog-control-center/ui/pages/system.slint:381
+msgctxt "PageSystem"
+msgid "Enabled"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:371
 msgctxt "PageSystem"
 msgid "Throttle Policy on AC"
 msgstr ""
 
-#: rog-control-center/ui/pages/aura.slint:27
-msgctxt "PageAura"
-msgid "Brightness"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:38
-msgctxt "PageAura"
-msgid "Aura mode"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:56
-msgctxt "PageAura"
-msgid "Colour 1"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:82
-msgctxt "PageAura"
-msgid "Colour 2"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:114
-msgctxt "PageAura"
-msgid "Zone"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:137
-msgctxt "PageAura"
-msgid "Direction"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:159
-msgctxt "PageAura"
-msgid "Speed"
-msgstr ""
-
-#: rog-control-center/ui/pages/aura.slint:180
-msgctxt "PageAura"
-msgid "Power Settings"
-msgstr ""
-
-#: rog-control-center/ui/widgets/aura_power.slint:32
+#: rog-control-center/ui/widgets/aura_power.slint:33
 msgctxt "AuraPowerGroup"
 msgid "Boot"
 msgstr ""
 
-#: rog-control-center/ui/widgets/aura_power.slint:42
+#: rog-control-center/ui/widgets/aura_power.slint:43
 msgctxt "AuraPowerGroup"
 msgid "Awake"
 msgstr ""
 
-#: rog-control-center/ui/widgets/aura_power.slint:52
+#: rog-control-center/ui/widgets/aura_power.slint:53
 msgctxt "AuraPowerGroup"
 msgid "Sleep"
 msgstr ""
 
-#: rog-control-center/ui/widgets/aura_power.slint:62
+#: rog-control-center/ui/widgets/aura_power.slint:63
 msgctxt "AuraPowerGroup"
 msgid "Shutdown"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:46
-msgctxt "Aura power zone"
-msgid "Logo"
+#: rog-control-center/ui/widgets/aura_power.slint:102
+msgctxt "AuraPowerGroupOld"
+msgid "Zone Selection"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:47
-msgctxt "Aura power zone"
-msgid "Keyboard"
+#: rog-control-center/ui/widgets/aura_power.slint:114
+msgctxt "AuraPowerGroupOld"
+msgid "Boot"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:48
-msgctxt "Aura power zone"
-msgid "Lightbar"
+#: rog-control-center/ui/widgets/aura_power.slint:124
+msgctxt "AuraPowerGroupOld"
+msgid "Awake"
+msgstr ""
+
+#: rog-control-center/ui/widgets/aura_power.slint:134
+msgctxt "AuraPowerGroupOld"
+msgid "Sleep"
 msgstr ""
 
 #: rog-control-center/ui/types/aura_types.slint:49
 msgctxt "Aura power zone"
+msgid "Logo"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:50 rog-control-center/ui/types/aura_types.slint:59
+msgctxt "Aura power zone"
+msgid "Keyboard"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:51 rog-control-center/ui/types/aura_types.slint:60
+msgctxt "Aura power zone"
+msgid "Lightbar"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:52
+msgctxt "Aura power zone"
 msgid "Lid"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:50
+#: rog-control-center/ui/types/aura_types.slint:53
 msgctxt "Aura power zone"
 msgid "Rear Glow"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:51
+#: rog-control-center/ui/types/aura_types.slint:54 rog-control-center/ui/types/aura_types.slint:61
 msgctxt "Aura power zone"
 msgid "Keyboard and Lightbar"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:54
+#: rog-control-center/ui/types/aura_types.slint:64
 msgctxt "Aura brightness"
 msgid "Off"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:55
+#: rog-control-center/ui/types/aura_types.slint:65
 msgctxt "Aura brightness"
 msgid "Low"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:56
+#: rog-control-center/ui/types/aura_types.slint:66
 msgctxt "Aura brightness"
 msgid "Med"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:57
+#: rog-control-center/ui/types/aura_types.slint:67
 msgctxt "Aura brightness"
 msgid "High"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:62 rog-control-center/ui/types/aura_types.slint:77
+#: rog-control-center/ui/types/aura_types.slint:72 rog-control-center/ui/types/aura_types.slint:87
 msgctxt "Basic aura mode"
 msgid "Static"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:63 rog-control-center/ui/types/aura_types.slint:78
+#: rog-control-center/ui/types/aura_types.slint:73 rog-control-center/ui/types/aura_types.slint:88
 msgctxt "Basic aura mode"
 msgid "Breathe"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:64 rog-control-center/ui/types/aura_types.slint:79
+#: rog-control-center/ui/types/aura_types.slint:74 rog-control-center/ui/types/aura_types.slint:89
 msgctxt "Basic aura mode"
 msgid "Strobe"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:65
+#: rog-control-center/ui/types/aura_types.slint:75
 msgctxt "Basic aura mode"
 msgid "Rainbow"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:66
+#: rog-control-center/ui/types/aura_types.slint:76
 msgctxt "Basic aura mode"
 msgid "Star"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:67
+#: rog-control-center/ui/types/aura_types.slint:77
 msgctxt "Basic aura mode"
 msgid "Rain"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:68
+#: rog-control-center/ui/types/aura_types.slint:78
 msgctxt "Basic aura mode"
 msgid "Highlight"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:69
+#: rog-control-center/ui/types/aura_types.slint:79
 msgctxt "Basic aura mode"
 msgid "Laser"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:70
+#: rog-control-center/ui/types/aura_types.slint:80
 msgctxt "Basic aura mode"
 msgid "Ripple"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:71
+#: rog-control-center/ui/types/aura_types.slint:81
 msgctxt "Basic aura mode"
 msgid "Nothing"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:72
+#: rog-control-center/ui/types/aura_types.slint:82
 msgctxt "Basic aura mode"
 msgid "Pulse"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:73
+#: rog-control-center/ui/types/aura_types.slint:83
 msgctxt "Basic aura mode"
 msgid "Comet"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:74
+#: rog-control-center/ui/types/aura_types.slint:84
 msgctxt "Basic aura mode"
 msgid "Flash"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:86
+#: rog-control-center/ui/types/aura_types.slint:96
 msgctxt "Aura zone"
 msgid "None"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:87
+#: rog-control-center/ui/types/aura_types.slint:97
 msgctxt "Aura zone"
 msgid "Key1"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:88
+#: rog-control-center/ui/types/aura_types.slint:98
 msgctxt "Aura zone"
 msgid "Key2"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:89
+#: rog-control-center/ui/types/aura_types.slint:99
 msgctxt "Aura zone"
 msgid "Key3"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:90
+#: rog-control-center/ui/types/aura_types.slint:100
 msgctxt "Aura zone"
 msgid "Key4"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:91
+#: rog-control-center/ui/types/aura_types.slint:101
 msgctxt "Aura zone"
 msgid "Logo"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:92
+#: rog-control-center/ui/types/aura_types.slint:102
 msgctxt "Aura zone"
 msgid "Lightbar Left"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:93
+#: rog-control-center/ui/types/aura_types.slint:103
 msgctxt "Aura zone"
 msgid "Lightbar Right"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:97
+#: rog-control-center/ui/types/aura_types.slint:107
 msgctxt "Aura direction"
 msgid "Right"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:98
+#: rog-control-center/ui/types/aura_types.slint:108
 msgctxt "Aura direction"
 msgid "Left"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:99
+#: rog-control-center/ui/types/aura_types.slint:109
 msgctxt "Aura direction"
 msgid "Up"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:100
+#: rog-control-center/ui/types/aura_types.slint:110
 msgctxt "Aura direction"
 msgid "Down"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:104
+#: rog-control-center/ui/types/aura_types.slint:114
 msgctxt "Aura speed"
 msgid "Low"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:105
+#: rog-control-center/ui/types/aura_types.slint:115
 msgctxt "Aura speed"
 msgid "Medium"
 msgstr ""
 
-#: rog-control-center/ui/types/aura_types.slint:106
+#: rog-control-center/ui/types/aura_types.slint:116
 msgctxt "Aura speed"
 msgid "High"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:50
+#: rog-control-center/ui/main_window.slint:51
 msgctxt "MainWindow"
 msgid "ROG"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:52
+#: rog-control-center/ui/main_window.slint:53
 msgctxt "Menu1"
 msgid "System Control"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:53
+#: rog-control-center/ui/main_window.slint:54
 msgctxt "Menu2"
 msgid "Keyboard Aura"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:54
+#: rog-control-center/ui/main_window.slint:55
 msgctxt "Menu3"
 msgid "AniMe Matrix"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:55
+#: rog-control-center/ui/main_window.slint:56
 msgctxt "Menu4"
 msgid "Fan Curves"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:56
+#: rog-control-center/ui/main_window.slint:57
 msgctxt "Menu5"
 msgid "App Settings"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:57
+#: rog-control-center/ui/main_window.slint:58
 msgctxt "Menu6"
 msgid "About"
 msgstr ""
 
-#: rog-control-center/ui/main_window.slint:69
+#: rog-control-center/ui/main_window.slint:70
 msgctxt "MainWindow"
 msgid "Quit"
 msgstr ""

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

@@ -0,0 +1,654 @@
+
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2024-05-11 09:10+0300\n"
+"PO-Revision-Date: 2024-05-11 10:20+0300\n"
+"Last-Translator: Winfried <winfriedhofmann@duck.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: rog-control-center/ui/pages/anime.slint:6
+msgctxt "Anime Brightness"
+msgid "Off"
+msgstr "Kapalı"
+
+#: rog-control-center/ui/pages/anime.slint:7
+msgctxt "Anime Brightness"
+msgid "Low"
+msgstr "Düşük"
+
+#: rog-control-center/ui/pages/anime.slint:8
+msgctxt "Anime Brightness"
+msgid "Med"
+msgstr "Orta"
+
+#: rog-control-center/ui/pages/anime.slint:9
+msgctxt "Anime Brightness"
+msgid "High"
+msgstr "Yüksek"
+
+#: rog-control-center/ui/pages/anime.slint:23
+msgctxt "AnimePageData"
+msgid "Glitch Construction"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:23
+msgctxt "AnimePageData"
+msgid "Static Emergence"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:25
+msgctxt "AnimePageData"
+msgid "Binary Banner Scroll"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:25
+msgctxt "AnimePageData"
+msgid "Rog Logo Glitch"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:27
+msgctxt "AnimePageData"
+msgid "Banner Swipe"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:27
+msgctxt "AnimePageData"
+msgid "Starfield"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:29
+msgctxt "AnimePageData"
+msgid "Glitch Out"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:29
+msgctxt "AnimePageData"
+msgid "See Ya"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:50
+msgctxt "Anime Brightness"
+msgid "Brightness"
+msgstr "Parlaklık"
+
+#: rog-control-center/ui/pages/anime.slint:66
+msgctxt "PageAnime"
+msgid "Enable display"
+msgstr "Görüntüyü etkinleştir"
+
+#: rog-control-center/ui/pages/anime.slint:74 rog-control-center/ui/pages/anime.slint:97
+msgctxt "PageAnime"
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#: rog-control-center/ui/pages/anime.slint:89
+msgctxt "PageAnime"
+msgid "Use built-in animations"
+msgstr "Yerleşik animasyonları kullanın"
+
+#: rog-control-center/ui/pages/anime.slint:146
+msgctxt "PageAnime"
+msgid "Set which builtin animations are played"
+msgstr "Hangi yerleşik animasyonların oynatılacağını ayarlayın"
+
+#: rog-control-center/ui/pages/anime.slint:150
+msgctxt "Anime built-in selection"
+msgid "Boot Animation"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:160
+msgctxt "Anime built-in selection"
+msgid "Running Animation"
+msgstr ""
+
+#: rog-control-center/ui/pages/anime.slint:170
+msgctxt "Anime built-in selection"
+msgid "Sleep Animation"
+msgstr "Uyku Animasyonu"
+
+#: rog-control-center/ui/pages/anime.slint:180
+msgctxt "Anime built-in selection"
+msgid "Shutdown Animation"
+msgstr "Kapatma Animasyonu"
+
+#: rog-control-center/ui/pages/anime.slint:220
+msgctxt "PageAnime"
+msgid "Advanced Display Settings"
+msgstr "Gelişmiş Görüntü Ayarları"
+
+#: rog-control-center/ui/pages/anime.slint:225
+msgctxt "PageAnime"
+msgid "Off when lid closed"
+msgstr "Kapak Kapatıldığında Kapat"
+
+#: rog-control-center/ui/pages/anime.slint:234
+msgctxt "PageAnime"
+msgid "Off when suspended"
+msgstr "Askıya alındığında kapat"
+
+#: rog-control-center/ui/pages/anime.slint:243
+msgctxt "PageAnime"
+msgid "Off when on battery"
+msgstr "Pille çalışırken kapat"
+
+#: rog-control-center/ui/pages/app_settings.slint:29
+msgctxt "PageAppSettings"
+msgid "Run in background after closing"
+msgstr "Kapatıldıktan sonra arka planda çalıştır"
+
+#: rog-control-center/ui/pages/app_settings.slint:38
+msgctxt "PageAppSettings"
+msgid "Start app in background (UI closed)"
+msgstr "Uygulamayı arka planda başlat (UI kapalı)"
+
+#: rog-control-center/ui/pages/app_settings.slint:50
+msgctxt "PageAppSettings"
+msgid "Enable system tray icon"
+msgstr "Sistem tepsisi simgesini etkinleştir"
+
+#: rog-control-center/ui/pages/app_settings.slint:59
+msgctxt "PageAppSettings"
+msgid "Enable dGPU notifications"
+msgstr "dGPU bildirimlerini etkinleştir"
+
+#: rog-control-center/ui/pages/fans.slint:27
+msgctxt "FanTab"
+msgid "This fan is not avilable on this machine"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:35
+msgctxt "FanTab"
+msgid "Enabled"
+msgstr "Etkinleştirildi"
+
+#: rog-control-center/ui/pages/fans.slint:44
+msgctxt "FanTab"
+msgid "Apply"
+msgstr "Uygula"
+
+#: rog-control-center/ui/pages/fans.slint:52
+msgctxt "FanTab"
+msgid "Cancel"
+msgstr "Vazgeç"
+
+#: rog-control-center/ui/pages/fans.slint:60
+msgctxt "FanTab"
+msgid "Factory Default (all fans)"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:73
+msgctxt "PageFans"
+msgid "Balanced"
+msgstr "Dengeli"
+
+#: rog-control-center/ui/pages/fans.slint:76 rog-control-center/ui/pages/fans.slint:135 rog-control-center/ui/pages/fans.slint:194
+msgctxt "PageFans"
+msgid "CPU"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:94 rog-control-center/ui/pages/fans.slint:153 rog-control-center/ui/pages/fans.slint:212
+msgctxt "PageFans"
+msgid "Mid"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:112 rog-control-center/ui/pages/fans.slint:171 rog-control-center/ui/pages/fans.slint:230
+msgctxt "PageFans"
+msgid "GPU"
+msgstr ""
+
+#: rog-control-center/ui/pages/fans.slint:132
+msgctxt "PageFans"
+msgid "Performance"
+msgstr "Perfomans"
+
+#: rog-control-center/ui/pages/fans.slint:191
+msgctxt "PageFans"
+msgid "Quiet"
+msgstr "Sessiz"
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Balanced"
+msgstr "Dengeli"
+
+#: rog-control-center/ui/pages/system.slint:26 rog-control-center/ui/pages/system.slint:30
+msgctxt "SystemPageData"
+msgid "Performance"
+msgstr "Perfomans"
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Quiet"
+msgstr "Sessiz"
+
+#: rog-control-center/ui/pages/system.slint:29
+msgctxt "SystemPageData"
+msgid "Default"
+msgstr "Varsayınal"
+
+#: rog-control-center/ui/pages/system.slint:31
+msgctxt "SystemPageData"
+msgid "BalancePerformance"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:32
+msgctxt "SystemPageData"
+msgid "BalancePower"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:33
+msgctxt "SystemPageData"
+msgid "Power"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:106
+msgctxt "PageSystem"
+msgid "Base system settings"
+msgstr "Temel Sistem Ayarları"
+
+#: rog-control-center/ui/pages/system.slint:111
+msgctxt "PageSystem"
+msgid "Charge limit"
+msgstr "Şarj Sınırı"
+
+#: rog-control-center/ui/pages/system.slint:123
+msgctxt "PageSystem"
+msgid "Throttle Policy"
+msgstr "Güç Politikası"
+
+#: rog-control-center/ui/pages/system.slint:133
+msgctxt "PageSystem"
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#: rog-control-center/ui/pages/system.slint:145
+msgctxt "PageSystem"
+msgid "Panel Overdrive"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:153
+msgctxt "PageSystem"
+msgid "MiniLED Mode"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:161
+msgctxt "PageSystem"
+msgid "POST boot sound"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:179
+msgctxt "PageSystem"
+msgid "System performance settings"
+msgstr "Sistem Perfomans Ayarları"
+
+#: rog-control-center/ui/pages/system.slint:184
+msgctxt "ppt_pl1_spl"
+msgid "ppt_pl1_spl"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:194
+msgctxt "ppt_pl2_sppt"
+msgid "ppt_pl2_sppt"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:204
+msgctxt "ppt_fppt"
+msgid "ppt_fppt"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:214
+msgctxt "ppt_apu_sppt"
+msgid "ppt_apu_sppt"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:224
+msgctxt "ppt_platform_sppt"
+msgid "ppt_platform_sppt"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:234
+msgctxt "nv_dynamic_boost"
+msgid "nv_dynamic_boost"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:244
+msgctxt "nv_temp_target"
+msgid "nv_temp_target"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:290
+msgctxt "PageSystem"
+msgid "Energy Performance Preference linked to Throttle Policy"
+msgstr "Güç Politikasına Bağlı Enerji Performansı Tercihi"
+
+#: rog-control-center/ui/pages/system.slint:294
+msgctxt "PageSystem"
+msgid "Change EPP based on Throttle Policy"
+msgstr "EPP'yi Güç Politikasına göre değiştirin"
+
+#: rog-control-center/ui/pages/system.slint:302
+msgctxt "PageSystem"
+msgid "EPP for Balanced Policy"
+msgstr "Dengeli Politika için EPP"
+
+#: rog-control-center/ui/pages/system.slint:312
+msgctxt "PageSystem"
+msgid "EPP for Performance Policy"
+msgstr "Performans Politikası için EPP"
+
+#: rog-control-center/ui/pages/system.slint:322
+msgctxt "PageSystem"
+msgid "EPP for Quiet Policy"
+msgstr "Sessiz Politikası için EPP"
+
+#: rog-control-center/ui/pages/system.slint:340
+msgctxt "PageSystem"
+msgid "Throttle Policy for power state"
+msgstr "Güç durumu için Güç Politikası"
+
+#: rog-control-center/ui/pages/system.slint:344
+msgctxt "PageSystem"
+msgid "Throttle Policy on Battery"
+msgstr "Pil Güç Politikası"
+
+#: rog-control-center/ui/pages/system.slint:354
+msgctxt "PageSystem"
+msgid "Throttle Policy on AC"
+msgstr "AC'de Güç Politikası"
+
+#: rog-control-center/ui/pages/aura.slint:27
+msgctxt "PageAura"
+msgid "Brightness"
+msgstr "Parlaklık"
+
+#: rog-control-center/ui/pages/aura.slint:38
+msgctxt "PageAura"
+msgid "Aura mode"
+msgstr "Renk Modu"
+
+#: rog-control-center/ui/pages/aura.slint:56
+msgctxt "PageAura"
+msgid "Colour 1"
+msgstr "Renk 1"
+
+#: rog-control-center/ui/pages/aura.slint:82
+msgctxt "PageAura"
+msgid "Colour 2"
+msgstr "Renk 2"
+
+#: rog-control-center/ui/pages/aura.slint:114
+msgctxt "PageAura"
+msgid "Zone"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:137
+msgctxt "PageAura"
+msgid "Direction"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:159
+msgctxt "PageAura"
+msgid "Speed"
+msgstr "Hız"
+
+#: rog-control-center/ui/pages/aura.slint:180
+msgctxt "PageAura"
+msgid "Power Settings"
+msgstr "Güç Ayarları"
+
+#: rog-control-center/ui/widgets/aura_power.slint:32
+msgctxt "AuraPowerGroup"
+msgid "Boot"
+msgstr ""
+
+#: rog-control-center/ui/widgets/aura_power.slint:42
+msgctxt "AuraPowerGroup"
+msgid "Awake"
+msgstr ""
+
+#: rog-control-center/ui/widgets/aura_power.slint:52
+msgctxt "AuraPowerGroup"
+msgid "Sleep"
+msgstr ""
+
+#: rog-control-center/ui/widgets/aura_power.slint:62
+msgctxt "AuraPowerGroup"
+msgid "Shutdown"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:45
+msgctxt "Aura power zone"
+msgid "Logo"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:46
+msgctxt "Aura power zone"
+msgid "Keyboard"
+msgstr "Klavye"
+
+#: rog-control-center/ui/types/aura_types.slint:47
+msgctxt "Aura power zone"
+msgid "Lightbar"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:48
+msgctxt "Aura power zone"
+msgid "Lid"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:49
+msgctxt "Aura power zone"
+msgid "Rear Glow"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:50
+msgctxt "Aura power zone"
+msgid "Keyboard and Lightbar"
+msgstr "Klavye ve Aydınlatma"
+
+#: rog-control-center/ui/types/aura_types.slint:53
+msgctxt "Aura brightness"
+msgid "Off"
+msgstr "Kapalı"
+
+#: rog-control-center/ui/types/aura_types.slint:54
+msgctxt "Aura brightness"
+msgid "Low"
+msgstr "Düşük"
+
+#: rog-control-center/ui/types/aura_types.slint:55
+msgctxt "Aura brightness"
+msgid "Med"
+msgstr "Orta"
+
+#: rog-control-center/ui/types/aura_types.slint:56
+msgctxt "Aura brightness"
+msgid "High"
+msgstr "Yüksek"
+
+#: rog-control-center/ui/types/aura_types.slint:61 rog-control-center/ui/types/aura_types.slint:76
+msgctxt "Basic aura mode"
+msgid "Static"
+msgstr "Sabit"
+
+#: rog-control-center/ui/types/aura_types.slint:62 rog-control-center/ui/types/aura_types.slint:77
+msgctxt "Basic aura mode"
+msgid "Breathe"
+msgstr "Nefes Alma"
+
+#: rog-control-center/ui/types/aura_types.slint:63 rog-control-center/ui/types/aura_types.slint:78
+msgctxt "Basic aura mode"
+msgid "Strobe"
+msgstr "Flaş"
+
+#: rog-control-center/ui/types/aura_types.slint:64
+msgctxt "Basic aura mode"
+msgid "Rainbow"
+msgstr "Gökkuşağı"
+
+#: rog-control-center/ui/types/aura_types.slint:65
+msgctxt "Basic aura mode"
+msgid "Star"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:66
+msgctxt "Basic aura mode"
+msgid "Rain"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:67
+msgctxt "Basic aura mode"
+msgid "Highlight"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:68
+msgctxt "Basic aura mode"
+msgid "Laser"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:69
+msgctxt "Basic aura mode"
+msgid "Ripple"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:70
+msgctxt "Basic aura mode"
+msgid "Nothing"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:71
+msgctxt "Basic aura mode"
+msgid "Pulse"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:72
+msgctxt "Basic aura mode"
+msgid "Comet"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:73
+msgctxt "Basic aura mode"
+msgid "Flash"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:85
+msgctxt "Aura zone"
+msgid "None"
+msgstr "Hiçbiri"
+
+#: rog-control-center/ui/types/aura_types.slint:86
+msgctxt "Aura zone"
+msgid "Key1"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:87
+msgctxt "Aura zone"
+msgid "Key2"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:88
+msgctxt "Aura zone"
+msgid "Key3"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:89
+msgctxt "Aura zone"
+msgid "Key4"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:90
+msgctxt "Aura zone"
+msgid "Logo"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:91
+msgctxt "Aura zone"
+msgid "Lightbar Left"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:92
+msgctxt "Aura zone"
+msgid "Lightbar Right"
+msgstr ""
+
+#: rog-control-center/ui/types/aura_types.slint:96
+msgctxt "Aura direction"
+msgid "Right"
+msgstr "Sağ"
+
+#: rog-control-center/ui/types/aura_types.slint:97
+msgctxt "Aura direction"
+msgid "Left"
+msgstr "Sol"
+
+#: rog-control-center/ui/types/aura_types.slint:98
+msgctxt "Aura direction"
+msgid "Up"
+msgstr "Yukarı"
+
+#: rog-control-center/ui/types/aura_types.slint:99
+msgctxt "Aura direction"
+msgid "Down"
+msgstr "Aşağı"
+
+#: rog-control-center/ui/types/aura_types.slint:103
+msgctxt "Aura speed"
+msgid "Low"
+msgstr "Düşük"
+
+#: rog-control-center/ui/types/aura_types.slint:104
+msgctxt "Aura speed"
+msgid "Medium"
+msgstr "Orta"
+
+#: rog-control-center/ui/types/aura_types.slint:105
+msgctxt "Aura speed"
+msgid "High"
+msgstr "Yüksek"
+
+#: rog-control-center/ui/main_window.slint:50
+msgctxt "MainWindow"
+msgid "ROG"
+msgstr ""
+
+#: rog-control-center/ui/main_window.slint:52
+msgctxt "Menu1"
+msgid "System Control"
+msgstr "Sistem Kontrol"
+
+#: rog-control-center/ui/main_window.slint:53
+msgctxt "Menu2"
+msgid "Keyboard Aura"
+msgstr "Klavye Rengi"
+
+#: rog-control-center/ui/main_window.slint:54
+msgctxt "Menu3"
+msgid "AniMe Matrix"
+msgstr ""
+
+#: rog-control-center/ui/main_window.slint:55
+msgctxt "Menu4"
+msgid "Fan Curves"
+msgstr ""
+
+#: rog-control-center/ui/main_window.slint:56
+msgctxt "Menu5"
+msgid "App Settings"
+msgstr "Uygulama Ayarları"
+
+#: rog-control-center/ui/main_window.slint:57
+msgctxt "Menu6"
+msgid "About"
+msgstr "Hakkında"
+
+#: rog-control-center/ui/main_window.slint:69
+msgctxt "MainWindow"
+msgid "Quit"
+msgstr "Çık"
+

rog-control-center/ui/main_window.slint

@@ -5,6 +5,7 @@ import { SideBar } from "widgets/sidebar.slint";
 import { PageAbout } from "pages/about.slint";
 import { PageFans } from "pages/fans.slint";
 import { PageAnime, AnimePageData } from "pages/anime.slint";
+import { RogItem } from "widgets/common.slint";
 import { PageAura } from "pages/aura.slint";
 import { Node } from "widgets/graph.slint";
 export { Node }
@@ -178,4 +179,39 @@ export component MainWindow inherits Window {
             }
         }
     }
+
+    if SomeError.error_message != "": Rectangle {
+        x: 0px;
+        y: 0px;
+        width: root.width;
+        height: root.height;
+        padding: 10px;
+
+        background: Palette.background;
+        border-color: Palette.border;
+        border-width: 3px;
+        border-radius: 10px;
+
+        VerticalBox {
+            RogItem {
+                min-height: 50px;
+                max-height: 100px;
+                Text {
+                    text <=> SomeError.error_message;
+                    font-size: 18px;
+                }
+            }
+
+            Text {
+                text <=> SomeError.error_help;
+                horizontal-alignment: TextHorizontalAlignment.center;
+                vertical-alignment: TextVerticalAlignment.center;
+            }
+        }
+    }
+}
+
+export global SomeError {
+    in property <string> error_message: "";
+    in property <string> error_help: "";
 }

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

@@ -22,45 +22,35 @@ export component PageAppSettings inherits VerticalLayout {
         mainview := VerticalLayout {
             padding: 10px;
             spacing: 10px;
-            HorizontalLayout {
-                spacing: 10px;
-                max-height: 32px;
-                SystemToggle {
-                    text: @tr("Run in background after closing");
-                    checked <=> AppSettingsPageData.run_in_background;
-                    toggled => {
-                        AppSettingsPageData.set_run_in_background(AppSettingsPageData.run_in_background)
-                    }
-                }
-
-                SystemToggle {
-                    width: parent.width * 1px / 2px;
-                    text: @tr("Start app in background (UI closed)");
-                    checked <=> AppSettingsPageData.startup_in_background;
-                    toggled => {
-                        AppSettingsPageData.set_startup_in_background(AppSettingsPageData.startup_in_background)
-                    }
+            SystemToggle {
+                text: @tr("Run in background after closing");
+                checked <=> AppSettingsPageData.run_in_background;
+                toggled => {
+                    AppSettingsPageData.set_run_in_background(AppSettingsPageData.run_in_background)
                 }
             }
 
-            HorizontalLayout {
-                max-height: 32px;
-                spacing: 10px;
-                SystemToggle {
-                    text: @tr("Enable system tray icon");
-                    checked <=> AppSettingsPageData.enable_tray_icon;
-                    toggled => {
-                        AppSettingsPageData.set_enable_tray_icon(AppSettingsPageData.enable_tray_icon)
-                    }
+            SystemToggle {
+                text: @tr("Start app in background (UI closed)");
+                checked <=> AppSettingsPageData.startup_in_background;
+                toggled => {
+                    AppSettingsPageData.set_startup_in_background(AppSettingsPageData.startup_in_background)
                 }
+            }
 
-                SystemToggle {
-                    width: parent.width * 1px / 2px;
-                    text: @tr("Enable dGPU notifications");
-                    checked <=> AppSettingsPageData.enable_dgpu_notifications;
-                    toggled => {
-                        AppSettingsPageData.set_enable_dgpu_notifications(AppSettingsPageData.enable_dgpu_notifications)
-                    }
+            SystemToggle {
+                text: @tr("Enable system tray icon");
+                checked <=> AppSettingsPageData.enable_tray_icon;
+                toggled => {
+                    AppSettingsPageData.set_enable_tray_icon(AppSettingsPageData.enable_tray_icon)
+                }
+            }
+
+            SystemToggle {
+                text: @tr("Enable dGPU notifications");
+                checked <=> AppSettingsPageData.enable_dgpu_notifications;
+                toggled => {
+                    AppSettingsPageData.set_enable_dgpu_notifications(AppSettingsPageData.enable_dgpu_notifications)
                 }
             }
 

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

@@ -3,7 +3,7 @@ import { Palette, Button, ComboBox, VerticalBox, GroupBox } from "std-widgets.sl
 import { StyleMetrics, Slider, HorizontalBox, TextEdit, SpinBox, LineEdit, ScrollView } from "std-widgets.slint";
 import { ColourSlider } from "../widgets/colour_picker.slint";
 import { AuraPageData, AuraDevType, PowerZones, LaptopAuraPower, AuraEffect } from "../types/aura_types.slint";
-import { AuraPowerGroup } from "../widgets/aura_power.slint";
+import { AuraPowerGroup, AuraPowerGroupOld } from "../widgets/aura_power.slint";
 
 export component PageAura inherits Rectangle {
     property <bool> show_fade_cover: false;
@@ -17,187 +17,191 @@ export component PageAura inherits Rectangle {
         c2.final_colour = AuraPageData.led_mode_data.colour2;
         c2.external_colour_change();
     }
-    VerticalLayout {
-        padding: 10px;
-        spacing: 10px;
-        alignment: LayoutAlignment.start;
-        HorizontalLayout {
+    ScrollView {
+        VerticalLayout {
+            padding: 10px;
             spacing: 10px;
-            SystemDropdown {
-                text: @tr("Brightness");
-                current_index <=> AuraPageData.brightness;
-                current_value: AuraPageData.brightness_names[self.current-index];
-                model <=> AuraPageData.brightness_names;
-                selected => {
-                    AuraPageData.set_brightness(AuraPageData.brightness)
-                }
-            }
-
-            SystemDropdown {
-                width: parent.width * 1px / 2px;
-                text: @tr("Aura mode");
-                current_index <=> AuraPageData.current_available_mode;
-                current_value: AuraPageData.available_mode_names[self.current-index];
-                model <=> AuraPageData.available_mode_names;
-                selected => {
-                    AuraPageData.led_mode_data.mode = AuraPageData.led_mode;
-                    AuraPageData.led_mode_data.mode = AuraPageData.current_available_mode;
-                    self.current_value = AuraPageData.available_mode_names[self.current-index];
-                    AuraPageData.set_led_mode(AuraPageData.current_available_mode);
-                }
-            }
-        }
-
-        RogItem {
+            alignment: LayoutAlignment.start;
             HorizontalLayout {
                 spacing: 10px;
-                VerticalBox {
-                    Text {
-                        text: @tr("Colour 1");
-                        vertical-alignment: TextVerticalAlignment.center;
-                        horizontal-alignment: TextHorizontalAlignment.center;
-                    }
-
-                    HorizontalBox {
-                        c1 := ColourSlider {
-                            enabled: AuraPageData.led_mode == 0 || AuraPageData.led_mode == 1 || AuraPageData.led_mode == 4 || AuraPageData.led_mode == 6 || AuraPageData.led_mode == 7 || AuraPageData.led_mode == 8 || AuraPageData.led_mode == 10 || AuraPageData.led_mode == 11 || AuraPageData.led_mode == 12;
-                            final_colour <=> AuraPageData.color1;
-                            colourbox <=> AuraPageData.colorbox1;
-                            set_hex_from_colour(c1) => {
-                                return AuraPageData.set_hex_from_colour(c1);
-                            }
-                            hex_to_colour(s) => {
-                                return AuraPageData.set_hex_to_colour(s);
-                            }
-                            released => {
-                                AuraPageData.led_mode_data.colour1 = AuraPageData.color1;
-                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
-                            }
-                        }
+                SystemDropdown {
+                    text: @tr("Brightness");
+                    current_index <=> AuraPageData.brightness;
+                    current_value: AuraPageData.brightness_names[self.current-index];
+                    model <=> AuraPageData.brightness_names;
+                    selected => {
+                        AuraPageData.set_brightness(AuraPageData.brightness)
                     }
                 }
 
-                VerticalBox {
-                    Text {
-                        text: @tr("Colour 2");
-                        vertical-alignment: TextVerticalAlignment.center;
-                        horizontal-alignment: TextHorizontalAlignment.center;
+                SystemDropdown {
+                    width: root.width * 1px / 2px;
+                    text: @tr("Aura mode");
+                    current_index <=> AuraPageData.current_available_mode;
+                    current_value: AuraPageData.available_mode_names[self.current-index];
+                    model <=> AuraPageData.available_mode_names;
+                    selected => {
+                        AuraPageData.led_mode_data.mode = AuraPageData.led_mode;
+                        AuraPageData.led_mode_data.mode = AuraPageData.current_available_mode;
+                        self.current_value = AuraPageData.available_mode_names[self.current-index];
+                        AuraPageData.set_led_mode(AuraPageData.current_available_mode);
+                    }
+                }
+            }
+
+            RogItem {
+                min-height: 220px;
+                max-height: 400px;
+                HorizontalLayout {
+                    spacing: 10px;
+                    VerticalBox {
+                        Text {
+                            text: @tr("Colour 1");
+                            vertical-alignment: TextVerticalAlignment.center;
+                            horizontal-alignment: TextHorizontalAlignment.center;
+                        }
+
+                        HorizontalBox {
+                            c1 := ColourSlider {
+                                enabled: AuraPageData.led_mode == 0 || AuraPageData.led_mode == 1 || AuraPageData.led_mode == 4 || AuraPageData.led_mode == 6 || AuraPageData.led_mode == 7 || AuraPageData.led_mode == 8 || AuraPageData.led_mode == 10 || AuraPageData.led_mode == 11 || AuraPageData.led_mode == 12;
+                                final_colour <=> AuraPageData.color1;
+                                colourbox <=> AuraPageData.colorbox1;
+                                set_hex_from_colour(c1) => {
+                                    return AuraPageData.set_hex_from_colour(c1);
+                                }
+                                hex_to_colour(s) => {
+                                    return AuraPageData.set_hex_to_colour(s);
+                                }
+                                released => {
+                                    AuraPageData.led_mode_data.colour1 = AuraPageData.color1;
+                                    AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                                }
+                            }
+                        }
                     }
 
-                    HorizontalBox {
-                        c2 := ColourSlider {
-                            enabled: AuraPageData.led_mode == 1 || AuraPageData.led_mode == 4;
-                            final_colour <=> AuraPageData.color2;
-                            colourbox <=> AuraPageData.colorbox2;
-                            set_hex_from_colour(c1) => {
-                                return AuraPageData.set_hex_from_colour(c1);
-                            }
-                            hex_to_colour(s) => {
-                                return AuraPageData.set_hex_to_colour(s);
-                            }
-                            released => {
-                                AuraPageData.led_mode_data.colour2 = AuraPageData.color2;
-                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                    VerticalBox {
+                        Text {
+                            text: @tr("Colour 2");
+                            vertical-alignment: TextVerticalAlignment.center;
+                            horizontal-alignment: TextHorizontalAlignment.center;
+                        }
+
+                        HorizontalBox {
+                            c2 := ColourSlider {
+                                enabled: AuraPageData.led_mode == 1 || AuraPageData.led_mode == 4;
+                                final_colour <=> AuraPageData.color2;
+                                colourbox <=> AuraPageData.colorbox2;
+                                set_hex_from_colour(c1) => {
+                                    return AuraPageData.set_hex_from_colour(c1);
+                                }
+                                hex_to_colour(s) => {
+                                    return AuraPageData.set_hex_to_colour(s);
+                                }
+                                released => {
+                                    AuraPageData.led_mode_data.colour2 = AuraPageData.color2;
+                                    AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                                }
                             }
                         }
                     }
                 }
             }
-        }
 
-        HorizontalLayout {
-            spacing: 10px;
-            RogItem {
-                padding: 0px;
-                VerticalBox {
-                    Text {
-                        text: @tr("Zone");
-                        vertical-alignment: TextVerticalAlignment.center;
-                        horizontal-alignment: TextHorizontalAlignment.center;
-                    }
+            HorizontalLayout {
+                spacing: 10px;
+                min-height: 80px;
+                max-height: 90px;
+                RogItem {
+                    padding: 0px;
+                    VerticalBox {
+                        Text {
+                            text: @tr("Zone");
+                            vertical-alignment: TextVerticalAlignment.center;
+                            horizontal-alignment: TextHorizontalAlignment.center;
+                        }
 
-                    ComboBox {
-                        // enabled: AuraPageData.led_mode == ;
+                        ComboBox {
+                            // enabled: AuraPageData.led_mode == ;
                         enabled: false;
-                        current_index <=> AuraPageData.zone;
-                        current_value: AuraPageData.zone_names[self.current-index];
-                        model <=> AuraPageData.zone_names;
-                        selected => {
-                            AuraPageData.led_mode_data.zone = self.current-index;
-                            AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                            current_index <=> AuraPageData.zone;
+                            current_value: AuraPageData.zone_names[self.current-index];
+                            model <=> AuraPageData.zone_names;
+                            selected => {
+                                AuraPageData.led_mode_data.zone = self.current-index;
+                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                            }
+                        }
+                    }
+                }
+
+                RogItem {
+                    padding: 0px;
+                    VerticalBox {
+                        Text {
+                            text: @tr("Direction");
+                            vertical-alignment: TextVerticalAlignment.center;
+                            horizontal-alignment: TextHorizontalAlignment.center;
+                        }
+
+                        ComboBox {
+                            enabled: AuraPageData.led_mode == 3;
+                            current_index <=> AuraPageData.direction;
+                            current_value: AuraPageData.direction_names[self.current-index];
+                            model <=> AuraPageData.direction_names;
+                            selected => {
+                                AuraPageData.led_mode_data.direction = self.current-index;
+                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                            }
+                        }
+                    }
+                }
+
+                RogItem {
+                    padding: 0px;
+                    VerticalBox {
+                        Text {
+                            text: @tr("Speed");
+                            vertical-alignment: TextVerticalAlignment.center;
+                            horizontal-alignment: TextHorizontalAlignment.center;
+                        }
+
+                        ComboBox {
+                            enabled: AuraPageData.led_mode == 1 || AuraPageData.led_mode == 2 || AuraPageData.led_mode == 3 || AuraPageData.led_mode == 4 || AuraPageData.led_mode == 5 || AuraPageData.led_mode == 6 || AuraPageData.led_mode == 7 || AuraPageData.led_mode == 8;
+                            current_index <=> AuraPageData.speed;
+                            current_value: AuraPageData.speed_names[self.current-index];
+                            model <=> AuraPageData.speed_names;
+                            selected => {
+                                AuraPageData.led_mode_data.speed = self.current-index;
+                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                            }
                         }
                     }
                 }
             }
 
-            RogItem {
-                padding: 0px;
-                VerticalBox {
-                    Text {
-                        text: @tr("Direction");
-                        vertical-alignment: TextVerticalAlignment.center;
-                        horizontal-alignment: TextHorizontalAlignment.center;
-                    }
-
-                    ComboBox {
-                        enabled: AuraPageData.led_mode == 3;
-                        current_index <=> AuraPageData.direction;
-                        current_value: AuraPageData.direction_names[self.current-index];
-                        model <=> AuraPageData.direction_names;
-                        selected => {
-                            AuraPageData.led_mode_data.direction = self.current-index;
-                            AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
-                        }
-                    }
-                }
-            }
-
-            RogItem {
-                padding: 0px;
-                VerticalBox {
-                    Text {
-                        text: @tr("Speed");
-                        vertical-alignment: TextVerticalAlignment.center;
-                        horizontal-alignment: TextHorizontalAlignment.center;
-                    }
-
-                    ComboBox {
-                        enabled: AuraPageData.led_mode == 1 || AuraPageData.led_mode == 2 || AuraPageData.led_mode == 3 || AuraPageData.led_mode == 4 || AuraPageData.led_mode == 5 || AuraPageData.led_mode == 6 || AuraPageData.led_mode == 7 || AuraPageData.led_mode == 8;
-                        current_index <=> AuraPageData.speed;
-                        current_value: AuraPageData.speed_names[self.current-index];
-                        model <=> AuraPageData.speed_names;
-                        selected => {
-                            AuraPageData.led_mode_data.speed = self.current-index;
-                            AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
-                        }
+            HorizontalLayout {
+                Button {
+                    text: @tr("Power Settings");
+                    clicked => {
+                        root.show_fade_cover = true;
+                        root.show_aura_power = true;
                     }
                 }
             }
         }
 
-        HorizontalBox {
-            Button {
-                text: @tr("Power Settings");
-                clicked => {
-                    root.show_fade_cover = true;
-                    root.show_aura_power = true;
-                }
+        if root.show_fade_cover: Rectangle {
+            background: Palette.background;
+            opacity: 0.8;
+            TouchArea {
+                height: 100%;
+                width: 100%;
             }
         }
     }
 
-    if root.show_fade_cover: Rectangle {
-        width: 100%;
-        height: 100%;
-        background: Palette.background;
-        opacity: 0.8;
-        TouchArea {
-            height: 100%;
-            width: 100%;
-        }
-    }
-
-    if root.show_aura_power && AuraPageData.aura_type == AuraDevType.New: Rectangle {
+    if root.show_aura_power && AuraPageData.device_type == AuraDevType.New: Rectangle {
         width: 100%;
         height: 100%;
         opacity: 1;
@@ -206,11 +210,12 @@ export component PageAura inherits Rectangle {
                 padding: 30px;
                 padding-top: 10px;
                 spacing: 10px;
+                alignment: LayoutAlignment.start;
 
                 for state[idx] in AuraPageData.led_power.states: zone := AuraPowerGroup {
                     group-title: AuraPageData.power_zone_names[state.zone_name_idx];
                     // TODO: use the zone name
-                        boot_checked: state.boot;
+                    boot_checked: state.boot;
                     boot_toggled => {
                         AuraPageData.led_power.states[idx].boot = zone.boot_checked;
                         AuraPageData.set_led_power(AuraPageData.led_power);
@@ -245,4 +250,57 @@ export component PageAura inherits Rectangle {
             }
         }
     }
+
+    if root.show_aura_power && AuraPageData.device_type == AuraDevType.Old: Rectangle {
+        width: 100%;
+        height: 100%;
+        opacity: 1;
+        ScrollView {
+            VerticalLayout {
+                padding: 30px;
+                padding-top: 10px;
+                spacing: 10px;
+                alignment: LayoutAlignment.start;
+
+                Text {
+                    text: "TODO: In progress";
+                }
+
+                for state[idx] in AuraPageData.led_power.states: old_zone := AuraPowerGroupOld {
+                    group-title: @tr("Power Zones");
+                    zone_strings <=> AuraPageData.power_zone_names_old;
+                    selected_zone => {
+                        AuraPageData.led_power.states[idx].zone = AuraPageData.supported_power_zones[old_zone.current_zone];
+                        AuraPageData.set_led_power(AuraPageData.led_power);
+                    }
+                    boot_checked: state.boot;
+                    boot_toggled => {
+                        AuraPageData.led_power.states[idx].boot = old_zone.boot_checked;
+                        AuraPageData.set_led_power(AuraPageData.led_power);
+                    }
+                    awake_checked: state.awake;
+                    awake_toggled => {
+                        AuraPageData.led_power.states[idx].awake = old_zone.awake_checked;
+                        AuraPageData.set_led_power(AuraPageData.led_power);
+                    }
+                    sleep_checked: state.sleep;
+                    sleep_toggled => {
+                        AuraPageData.led_power.states[idx].sleep = old_zone.sleep_checked;
+                        AuraPageData.set_led_power(AuraPageData.led_power);
+                    }
+                }
+            }
+
+            Button {
+                x: root.width - self.width - 6px;
+                y: 6px;
+                text: "X";
+                height: 40px;
+                clicked => {
+                    root.show_aura_power = false;
+                    root.show_fade_cover = false;
+                }
+            }
+        }
+    }
 }

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

@@ -19,7 +19,6 @@ component FanTab inherits Rectangle {
         HorizontalLayout {
             if root.tab_enabled: Graph {
                 nodes <=> root.nodes;
-            
             }
             if !root.tab_enabled: Rectangle {
                 Text {

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

@@ -43,8 +43,12 @@ export global SystemPageData {
     callback set_throttle_policy_linked_epp(bool);
     in-out property <int> throttle_policy_on_ac: 0;
     callback set_throttle_policy_on_ac(int);
+    in-out property <bool> change_throttle_policy_on_ac: true;
+    callback set_change_throttle_policy_on_ac(bool);
     in-out property <int> throttle_policy_on_battery: 0;
     callback set_throttle_policy_on_battery(int);
+    in-out property <bool> change_throttle_policy_on_battery: true;
+    callback set_change_throttle_policy_on_battery(bool);
     in-out property <bool> panel_od;
     callback set_panel_od(bool);
     in-out property <bool> boot_sound;
@@ -340,23 +344,45 @@ export component PageSystem inherits Rectangle {
                             text: @tr("Throttle Policy for power state");
                         }
 
-                        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;
-                            selected => {
-                                SystemPageData.set_throttle_policy_on_battery(SystemPageData.throttle_policy_on_battery)
+                        HorizontalLayout {
+                            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;
+                                selected => {
+                                    SystemPageData.set_throttle_policy_on_battery(SystemPageData.throttle_policy_on_battery)
+                                }
+                            }
+
+                            SystemToggle {
+                                text: @tr("Enabled");
+                                checked <=> SystemPageData.change_throttle_policy_on_battery;
+                                toggled => {
+                                    SystemPageData.set_change_throttle_policy_on_battery(SystemPageData.change_throttle_policy_on_battery);
+                                }
                             }
                         }
 
-                        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;
-                            selected => {
-                                SystemPageData.set_throttle_policy_on_ac(SystemPageData.throttle_policy_on_ac)
+                        HorizontalLayout {
+                            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;
+                                selected => {
+                                    SystemPageData.set_throttle_policy_on_ac(SystemPageData.throttle_policy_on_ac)
+                                }
+                            }
+
+                            SystemToggle {
+                                text: @tr("Enabled");
+                                checked <=> SystemPageData.change_throttle_policy_on_ac;
+                                toggled => {
+                                    SystemPageData.set_change_throttle_policy_on_ac(SystemPageData.change_throttle_policy_on_ac);
+                                }
                             }
                         }
                     }

rog-control-center/ui/types/aura_types.slint

@@ -2,6 +2,8 @@ export enum AuraDevType {
     New,
     Old,
     Tuf,
+    ScsiExtDisk,
+    Unknown,
 }
 
 export struct AuraEffect {
@@ -25,7 +27,7 @@ export enum PowerZones {
     Lightbar,
     Lid,
     RearGlow,
-    KeyboardAndLightbar
+    KeyboardAndLightbar,
 }
 
 export struct AuraPowerState {
@@ -42,6 +44,7 @@ export struct LaptopAuraPower {
 }
 
 export global AuraPageData {
+    // The ordering must match the rog-aura crate
     in-out property <[string]> power_zone_names: [
         @tr("Aura power zone" => "Logo"),
         @tr("Aura power zone" => "Keyboard"),
@@ -50,6 +53,13 @@ export global AuraPageData {
         @tr("Aura power zone" => "Rear Glow"),
         @tr("Aura power zone" => "Keyboard and Lightbar"),
     ];
+    // Exists only for the older 0x1866 keybaords. On page setup it must
+    // be set to match the supported_power_zones
+    in-out property <[string]> power_zone_names_old: [
+        @tr("Aura power zone" => "Keyboard"),
+        @tr("Aura power zone" => "Lightbar"),
+        @tr("Aura power zone" => "Keyboard and Lightbar"),
+    ];
     in-out property <[string]> brightness_names: [
         @tr("Aura brightness" => "Off"),
         @tr("Aura brightness" => "Low"),
@@ -135,13 +145,12 @@ export global AuraPageData {
     }
     callback set_hex_from_colour(color) -> string;
     callback set_hex_to_colour(string) -> color;
-    in-out property <AuraDevType> aura_type: AuraDevType.New;
+    in-out property <AuraDevType> device_type: AuraDevType.Old;
+    // List of indexes to power_zone_names. Must correspond to rog-aura crate
     in-out property <[PowerZones]> supported_power_zones: [
         PowerZones.Keyboard,
-        PowerZones.RearGlow,
-        PowerZones.Lid,
         PowerZones.Lightbar,
-        PowerZones.Logo
+        PowerZones.KeyboardAndLightbar,
     ];
     in-out property <LaptopAuraPower> led_power: {
         states: [{

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

@@ -1,5 +1,6 @@
 import { Palette, VerticalBox, HorizontalBox, GroupBox } from "std-widgets.slint";
-import { SystemToggleVert } from "common.slint";
+import { SystemToggleVert, SystemDropdown } from "common.slint";
+import { PowerZones } from "../types/aura_types.slint";
 
 export component AuraPowerGroup inherits Rectangle {
     min-width: row.min-width;
@@ -68,3 +69,74 @@ export component AuraPowerGroup inherits Rectangle {
         }
     }
 }
+
+export component AuraPowerGroupOld inherits Rectangle {
+    min-width: row.min-width;
+    border-radius: 20px;
+    background: Palette.alternate-background;
+    opacity: 0.9;
+    in-out property <int> current_zone;
+    in-out property <[int]> zones;
+    in-out property <[string]> zone_strings;
+    in-out property <string> group-title;
+    in-out property <bool> boot_checked;
+    in-out property <bool> awake_checked;
+    in-out property <bool> sleep_checked;
+    callback boot_toggled(bool);
+    callback awake_toggled(bool);
+    callback sleep_toggled(bool);
+    callback selected_zone(int);
+    VerticalBox {
+        spacing: 10px;
+        Text {
+            font-size: 18px;
+            color: Palette.alternate-foreground;
+            horizontal-alignment: TextHorizontalAlignment.center;
+            text <=> root.group-title;
+        }
+
+        row := HorizontalBox {
+            alignment: LayoutAlignment.center;
+
+            SystemDropdown {
+                text: @tr("Zone Selection");
+                current_index <=> root.current_zone;
+                current_value: root.zone_strings[root.current_zone];
+                model <=> root.zone_strings;
+                selected => {
+                    root.selected_zone(root.current_zone);
+                }
+            }
+
+            SystemToggleVert {
+                min-width: 96px;
+                max-height: 42px;
+                text: @tr("Boot");
+                checked <=> root.boot_checked;
+                toggled => {
+                    root.boot_toggled(self.checked);
+                }
+            }
+
+            SystemToggleVert {
+                min-width: 96px;
+                max-height: 42px;
+                text: @tr("Awake");
+                checked <=> root.awake_checked;
+                toggled => {
+                    root.awake_toggled(self.checked);
+                }
+            }
+
+            SystemToggleVert {
+                min-width: 96px;
+                max-height: 42px;
+                text: @tr("Sleep");
+                checked <=> root.sleep_checked;
+                toggled => {
+                    root.sleep_toggled(self.checked);
+                }
+            }
+        }
+    }
+}

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

@@ -81,7 +81,7 @@ export component ColourSlider inherits VerticalLayout {
         hsv(base_colour.to-hsv().hue, 1, 0),
     ];
 
-    function set_base_colour(){
+    function set_base_colour() {
         root.base_colour = hsv(c1.value / base_colours.length * 360, 1, 1);
         root.final_colour = hsv(base_colour.to-hsv().hue, ((base_saturation.length - c2.value) / base_saturation.length), ((base_value.length - c3.value) / base_value.length));
         root.colourbox = root.final_colour;

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

@@ -5,7 +5,8 @@ export component RogItem inherits Rectangle {
     border-color: Palette.border;
     border-width: 3px;
     border-radius: 10px;
-    min-height: 46px;
+    min-height: 48px;
+    max-height: 56px;
 }
 
 export component SystemSlider inherits RogItem {
@@ -54,6 +55,7 @@ export component SystemToggle inherits RogItem {
     in-out property <bool> checked;
     callback toggled(bool);
     HorizontalLayout {
+        spacing: 6px;
         HorizontalLayout {
             alignment: LayoutAlignment.start;
             padding-left: 10px;

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

@@ -26,16 +26,20 @@ export component Graph inherits Rectangle {
         y: root.graph_padding;
         function scale_x_to_graph(x: length) -> length {
             ((x - node_min.x) / (node_max.x - node_min.x)) * graph.width
-        }//
+        }
+        //
         function scale_y_to_graph(y: length) -> length {
             ((y - node_min.y) / (node_max.y - node_min.y)) * graph.height
-        }//
+        }
+        //
         function scale_x_to_node(x: length) -> length {
             (x / graph.width) * (node_max.x - node_min.x)
-        }//
+        }
+        //
         function scale_y_to_node(y: length) -> length {
             (y / graph.height) * (node_max.y - node_min.y)
-        }//
+        }
+        //
 
         for n in 11: Path {
             viewbox-width: self.width / 1px;
@@ -43,21 +47,23 @@ export component Graph inherits Rectangle {
             stroke: Palette.alternate-foreground.darker(200%);
             stroke-width: 1px;
             MoveTo {
-                x: scale_x_to_graph(n*10px) / 1px;
-                y: 0; // scale_y_to_graph(n*1px) / 1px;
+                x: scale_x_to_graph(n * 10px) / 1px;
+                y: 0;
+                // scale_y_to_graph(n*1px) / 1px;
             }
 
             LineTo {
-                x: scale_x_to_graph(n*10px) / 1px;
-                y: graph.height / 1px; //scale_y_to_graph(n*1px) / 1px;
+                x: scale_x_to_graph(n * 10px) / 1px;
+                y: graph.height / 1px;
+                //scale_y_to_graph(n*1px) / 1px;
             }
         }
 
         for n in 11: Text {
             color: Palette.accent-background;
             font-size <=> root.axis_font_size;
-            text: "\{n*10}c";
-            x: scale_x_to_graph(n*10px) - self.width / 3;
+            text: "\{n * 10}c";
+            x: scale_x_to_graph(n * 10px) - self.width / 3;
             y: graph.height + 2px;
         }
 
@@ -67,22 +73,24 @@ export component Graph inherits Rectangle {
             stroke: Palette.alternate-foreground.darker(200%);
             stroke-width: 1px;
             MoveTo {
-                x: 0; //scale_x_to_graph(n*10px) / 1px;
-                y: scale_y_to_graph(n*25.5px) / 1px;
+                x: 0;
+                //scale_x_to_graph(n*10px) / 1px;
+                y: scale_y_to_graph(n * 25.5px) / 1px;
             }
 
             LineTo {
-                x: graph.width / 1px; //scale_x_to_graph(n*10px) / 1px;
-                y: scale_y_to_graph(n*25.5px) / 1px;
+                x: graph.width / 1px;
+                //scale_x_to_graph(n*10px) / 1px;
+                y: scale_y_to_graph(n * 25.5px) / 1px;
             }
         }
 
         for n in 11: Text {
             color: Palette.accent-background;
             font-size <=> root.axis_font_size;
-            text: "\{n*10}%";
+            text: "\{n * 10}%";
             x: - self.width;
-            y: graph.height - scale_y_to_graph(n*25.5px) - self.height / 2;
+            y: graph.height - scale_y_to_graph(n * 25.5px) - self.height / 2;
         }
 
         for l[idx] in nodes: path := Rectangle {
@@ -115,7 +123,8 @@ export component Graph inherits Rectangle {
                     tip.background: Palette.accent-background;
                     tip.opacity: 1.0;
                 }
-            ]//
+            ]
+            //
             point := Rectangle {
                 background: Palette.control-foreground;
                 x: scale_x_to_graph(n.x) - self.width / 2;
@@ -133,7 +142,6 @@ export component Graph inherits Rectangle {
                             } else if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) < nodes[idx - 1].x {
                                 n.x = nodes[idx - 1].x + pad;
                             }
-
                             if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) > nodes[idx + 1].y {
                                 n.y = nodes[idx + 1].y - pad;
                             } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < nodes[idx - 1].y {
@@ -145,7 +153,6 @@ export component Graph inherits Rectangle {
                             } else if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) > nodes[idx + 1].x {
                                 n.x = nodes[idx + 1].x - pad;
                             }
-
                             if n.y - scale_y_to_node(self.mouse-y - self.pressed-y) < 0.0 {
                                 n.y = 1px;
                             } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) > nodes[idx + 1].y {
@@ -157,14 +164,14 @@ export component Graph inherits Rectangle {
                             } else if n.x + scale_x_to_node(self.mouse-x - self.pressed-x) < nodes[idx - 1].x {
                                 n.x = nodes[idx - 1].x + pad;
                             }
-
                             if n.y - scale_y_to_node(self.mouse-y - self.pressed-y) > scale_y_to_node(graph.height) {
                                 n.y = scale_y_to_node(graph.height - 1px);
                             } else if n.y + scale_y_to_node(self.height - self.mouse-y - self.pressed-y) < nodes[idx - 1].y {
                                 n.y = nodes[idx - 1].y + pad;
                             }
                         }
-                    }//
+                    }
+                    //
                     moved => {
                         if (self.pressed) {
                             n.x += scale_x_to_node(self.mouse-x - self.pressed-x);
@@ -190,27 +197,32 @@ export component Graph inherits Rectangle {
                 height: label.preferred-height;
                 function x_pos() -> length {
                     scale_x_to_graph(n.x) - label.preferred-width - 8px
-                }//
+                }
+                //
                 function final_x_pos() -> length {
                     if x_pos() > 0 {
                         x_pos()
                     } else {
                         x_pos() + label.preferred-width
                     }
-                }//
+                }
+                //
                 function y_pos() -> length {
                     graph.height - scale_y_to_graph(n.y) - self.height - 4px
-                }//
+                }
+                //
                 function final_y_pos() -> length {
                     if y_pos() > 0 {
                         y_pos()
                     } else {
                         y_pos() + label.preferred-height
                     }
-                }//
+                }
+                //
                 function fan_pct() -> int {
                     Math.floor(n.y / 1px) / 255 * 100
-                }//
+                }
+                //
                 label := Text {
                     color: Palette.accent-foreground;
                     font-size: 16px;

rog-dbus/src/lib.rs

@@ -7,3 +7,44 @@ pub mod zbus_platform;
 pub mod zbus_slash;
 
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
+
+pub fn list_iface_blocking() -> Result<Vec<String>, Box<dyn std::error::Error>> {
+    let conn = zbus::blocking::Connection::system()?;
+    let f = zbus::blocking::fdo::ObjectManagerProxy::new(&conn, "org.asuslinux.Daemon", "/")?;
+    let interfaces = f.get_managed_objects()?;
+    let mut ifaces = Vec::new();
+    for v in interfaces.iter() {
+        for k in v.1.keys() {
+            ifaces.push(k.to_string());
+        }
+    }
+    Ok(ifaces)
+}
+
+pub fn has_iface_blocking(iface: &str) -> Result<bool, Box<dyn std::error::Error>> {
+    let conn = zbus::blocking::Connection::system()?;
+    let f = zbus::blocking::fdo::ObjectManagerProxy::new(&conn, "org.asuslinux.Daemon", "/")?;
+    let interfaces = f.get_managed_objects()?;
+    for v in interfaces.iter() {
+        for k in v.1.keys() {
+            if k.as_str() == iface {
+                return Ok(true);
+            }
+        }
+    }
+    Ok(false)
+}
+
+pub async fn has_iface(iface: &str) -> Result<bool, Box<dyn std::error::Error>> {
+    let conn = zbus::Connection::system().await?;
+    let f = zbus::fdo::ObjectManagerProxy::new(&conn, "org.asuslinux.Daemon", "/").await?;
+    let interfaces = f.get_managed_objects().await?;
+    for v in interfaces.iter() {
+        for k in v.1.keys() {
+            if k.as_str() == iface {
+                return Ok(true);
+            }
+        }
+    }
+    Ok(false)
+}

rog-dbus/src/zbus_platform.rs

@@ -36,9 +36,6 @@ trait Platform {
     /// NextThrottleThermalPolicy method
     fn next_throttle_thermal_policy(&self) -> zbus::Result<()>;
 
-    /// SupportedInterfaces method
-    fn supported_interfaces(&self) -> zbus::Result<Vec<String>>;
-
     /// SupportedProperties method
     fn supported_properties(&self) -> zbus::Result<Vec<Properties>>;
 
@@ -146,12 +143,24 @@ trait Platform {
     #[zbus(property)]
     fn set_throttle_policy_on_ac(&self, throttle_policy: ThrottlePolicy) -> zbus::Result<()>;
 
+    /// ChangeThrottlePolicyOnAc property
+    #[zbus(property)]
+    fn change_throttle_policy_on_ac(&self) -> zbus::Result<bool>;
+    #[zbus(property)]
+    fn set_change_throttle_policy_on_ac(&self, change: bool) -> zbus::Result<()>;
+
     /// ThrottlePolicyOnBattery property
     #[zbus(property)]
     fn throttle_policy_on_battery(&self) -> zbus::Result<ThrottlePolicy>;
     #[zbus(property)]
     fn set_throttle_policy_on_battery(&self, throttle_policy: ThrottlePolicy) -> zbus::Result<()>;
 
+    /// ChangeThrottlePolicyOnAc property
+    #[zbus(property)]
+    fn change_throttle_policy_on_battery(&self) -> zbus::Result<bool>;
+    #[zbus(property)]
+    fn set_change_throttle_policy_on_battery(&self, change: bool) -> zbus::Result<()>;
+
     /// ThrottleQuietEpp property
     #[zbus(property)]
     fn throttle_quiet_epp(&self) -> zbus::Result<CPUEPP>;

rog-platform/src/keyboard_led.rs

@@ -5,12 +5,15 @@ use log::{info, warn};
 use crate::error::{PlatformError, Result};
 use crate::{attr_u8, has_attr, set_attr_u8_array, to_device};
 
+/// The sysfs control for backlight levels. This is only for the 3-step
+/// backlight setting, and for TUF laptops. It is not a hard requirement
+/// for Aura keyboards
 #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Clone)]
-pub struct KeyboardLed {
+pub struct KeyboardBacklight {
     path: PathBuf,
 }
 
-impl KeyboardLed {
+impl KeyboardBacklight {
     attr_u8!("brightness", path);
 
     has_attr!("kbd_rgb_mode" path);
@@ -59,7 +62,7 @@ impl KeyboardLed {
             });
         }
         Err(PlatformError::MissingFunction(
-            "asus::kbd_backlight not found".into(),
+            "KeyboardLed:new(), asus::kbd_backlight not found".into(),
         ))
     }
 }

rog-platform/src/power.rs

@@ -60,13 +60,12 @@ impl AsusPower {
                         info!("Found a battery");
                         if battery.is_none() {
                             info!("Checking battery attributes");
-                            if device
-                                .attribute_value("charge_control_end_threshold")
-                                .is_some()
+                            if let Some(current) =
+                                device.attribute_value("charge_control_end_threshold")
                             {
                                 info!(
                                     "Found battery power at {:?}, matched \
-                                     charge_control_end_threshold",
+                                     charge_control_end_threshold. Current level: {current:?}",
                                     device.sysname()
                                 );
                                 battery = Some(device.syspath().to_path_buf());