Merge branch 'FAYZER77-main-patch-34823' into 'main'

Change 733C model profile to add support for Lid LED, and remove unneeded basic zones entries

See merge request asus-linux/asusctl!183

CHANGELOG.md

@@ -7,6 +7,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v6.0.4]
+
+### Changed
+
+- Remove some `todo()` in rogcc
+- Add missing `#[zbus(property)]` derive to Slash dbus properties
+- Match G533Q laptop explicitly to the 0x8166 PID
+
+## [v6.0.3]
+
+### NOTE
+
+- Xorg is not supported any longer. All major desktops and distros are Wayland.
+
+### Changed
+
+- Add a check to prevent non-TUF laptops with screwed up method return from TUF acpi methods from trying to add a TUF aura device without actually being a TUF laptop.
+- Make the G834JZ entry in aura db generic for all G834J
+
+## [v6.0.2]
+
+### Changed
+
+- Clean up code
+- Don't panic if no aura device in ROGCC
+- Try to prevent an errorenous tuf keyboard detection
+
+## [v6.0.1]
+
+### Added
+
+- Support the G713P keyboard
+
+### Changed
+
+- Update all `Cargo.toml` to use workspace deps and remove unused features
+- Update dependencies where possible
+- Switch the UI to use fluent-dark instead of cosmic-dark due to extremely long compile time
+
 ## [v6.0.0]
 
 ### Important note

Cargo.toml

@@ -25,8 +25,15 @@ default-members = [
 resolver = "2"
 
 [workspace.package]
-version = "6.0.0"
+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 = [
@@ -40,13 +47,11 @@ dirs = "^4.0"
 smol = "^1.3"
 mio = "0.8.11"
 
-zbus = "~4.1.2"
-logind-zbus = { version = "~4.0.2" } #, default-features = false, features = ["non_blocking"] }
+zbus = "4.1"
+logind-zbus = { version = "4.0.2" } #, default-features = false, features = ["non_blocking"] }
 
 serde = "^1.0"
 serde_derive = "^1.0"
-serde_json = "^1.0"
-toml = "^0.5.10"
 ron = "*"
 typeshare = "1.0.0"
 
@@ -64,7 +69,7 @@ pix = "^0.13"
 tinybmp = "^0.4.0"
 gif = "^0.12.0"
 
-versions = "4.1"
+versions = "6.2"
 
 notify-rust = { git = "https://github.com/flukejones/notify-rust.git", rev = "54176413b81189a3e4edbdc20a0b4f7e2e35c063", default-features = false, features = [
     "z",
@@ -83,6 +88,10 @@ codegen-units = 1
 opt-level = 1
 codegen-units = 16
 
+[profile.dev.package."*"]
+opt-level = 1
+codegen-units = 16
+
 [profile.bench]
 debug = false
 opt-level = 3

README.md

@@ -11,7 +11,9 @@ Now includes a GUI, `rog-control-center`.
 
 ## Kernel support
 
-**The minimum supported kernel version is 6.10**, which will contain the patches from [here](https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/). Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t)
+**The minimum supported kernel version is 6.10**, which will contain the patches from [here](https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/). This is especially required for 2023+ devices and possibly some lat 2022 devices.
+
+Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t)
 
 ## Goals
 
@@ -31,7 +33,7 @@ See the [rog-aura readme](./rog-aura/README.md) for more details.
 
 ## Discord
 
-[Discord server link](https://discord.gg/z8y99XqPb7)
+[![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/z8y99XqPb7)
 
 ## SUPPORTED LAPTOPS
 
@@ -76,8 +78,7 @@ Rust and cargo are required, they can be installed from [rustup.rs](https://rust
 
 **fedora:**
 
-    dnf install cmake clang-devel libinput-devel libseat-devel libgbm-devel libxkbcommon-devel systemd-devel \
-    libdrm-devel expat-devel pcre2-devel libzstd-devel libappindicator-gtk3
+    dnf install cmake clang-devel libinput-devel libseat-devel libgbm-devel libxkbcommon-devel systemd-devel libdrm-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
     make
     sudo make install
 
@@ -86,7 +87,7 @@ Rust and cargo are required, they can be installed from [rustup.rs](https://rust
 Works with KDE Plasma (without GTK packages)
 
     zypper in -t pattern devel_basis
-    zypper in rustup make cmake libinput-devel libseat-devel libgbm-devel systemd-devel clang-devel llvm-devel gdk-pixbuf-devel cairo-devel pango-devel freetype-devel libexpat-devel libayatana-indicator3-7
+    zypper in rustup make cmake clang-devel libinput-devel libseat-devel libgbm-devel libxkbcommon-devel systemd-devel libdrm-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
     make
     sudo make install
 

asusctl/Cargo.toml

@@ -1,9 +1,12 @@
 [package]
 name = "asusctl"
-license = "MPL-2.0"
-authors = ["Luke D Jones <luke@ljones.dev>"]
-edition = "2021"
+license.workspace = true
 version.workspace = true
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [dependencies]
 rog_anime = { path = "../rog-anime" }
@@ -15,16 +18,11 @@ rog_platform = { path = "../rog-platform" }
 asusd = { path = "../asusd" }
 dmi_id = { path = "../dmi-id" }
 
+ron.workspace = true
 gumdrop.workspace = true
-toml.workspace = true
 zbus.workspace = true
-tokio.workspace = true
 
 [dev-dependencies]
-gif.workspace = true
-tinybmp.workspace = true
-glam.workspace = true
 rog_dbus = { path = "../rog-dbus" }
-tokio.workspace = true
 
-cargo-husky.workspace = true
+cargo-husky.workspace = true

asusctl/src/aura_cli.rs

@@ -87,6 +87,7 @@ impl FromStr for LedBrightness {
         }
     }
 }
+#[allow(clippy::to_string_trait_impl)]
 impl ToString for LedBrightness {
     fn to_string(&self) -> String {
         let s = match self.level {

asusctl/src/main.rs

@@ -22,6 +22,7 @@ use rog_dbus::zbus_slash::SlashProxyBlocking;
 use rog_platform::platform::{GpuMode, Properties, ThrottlePolicy};
 use rog_profiles::error::ProfileError;
 use rog_slash::SlashMode;
+use ron::ser::PrettyConfig;
 use zbus::blocking::Connection;
 
 use crate::aura_cli::{AuraPowerStates, LedBrightness};
@@ -826,8 +827,8 @@ fn handle_fan_curve(
     if let Some(profile) = cmd.mod_profile {
         if cmd.enable_fan_curves.is_none() && cmd.data.is_none() {
             let data = fan_proxy.fan_curve_data(profile)?;
-            let data = toml::to_string(&data)?;
-            println!("\nFan curves for {:?}\n\n{}", profile, data);
+            let ron = ron::ser::to_string_pretty(&data, PrettyConfig::new().depth_limit(4))?;
+            println!("\nFan curves for {:?}\n\n{}", profile, ron);
         }
 
         if let Some(enabled) = cmd.enable_fan_curves {

asusd-user/Cargo.toml

@@ -1,10 +1,12 @@
 [package]
 name = "asusd-user"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-authors = ["Luke D Jones <luke@ljones.dev>"]
-edition = "2021"
-description = "Usermode daemon for user settings, anime, per-key lighting"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [[bin]]
 name = "asusd-user"
@@ -16,8 +18,8 @@ smol.workspace = true
 
 # serialisation
 serde.workspace = true
-serde_json.workspace = true
 serde_derive.workspace = true
+ron.workspace = true
 
 rog_anime = { path = "../rog-anime" }
 rog_aura = { path = "../rog-aura" }
@@ -26,10 +28,10 @@ rog_platform = { path = "../rog-platform" }
 config-traits = { path = "../config-traits" }
 
 zbus.workspace = true
-
-# cli and logging
-log.workspace = true
 env_logger.workspace = true
 
 [dev-dependencies]
-cargo-husky.workspace = true
+cargo-husky.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]

asusd-user/src/ctrl_anime.rs

@@ -8,6 +8,7 @@ use config_traits::StdConfig;
 use rog_anime::error::AnimeError;
 use rog_anime::{ActionData, ActionLoader, AnimTime, Fade, Sequences, Vec2};
 use rog_dbus::zbus_anime::AnimeProxyBlocking;
+use ron::ser::PrettyConfig;
 use serde_derive::{Deserialize, Serialize};
 use zbus::interface;
 use zbus::zvariant::{ObjectPath, Type};
@@ -199,11 +200,12 @@ impl CtrlAnime<'static> {
             config.anime.push(action);
             config.write();
 
-            let json = serde_json::to_string_pretty(&*config).expect("Parse config to JSON failed");
+            let ron = ron::ser::to_string_pretty(&*config, PrettyConfig::new().depth_limit(4))
+                .expect("Parse config to RON failed");
 
             // Release the inner run loop again
             self.inner_early_return.store(false, Ordering::SeqCst);
-            return Ok(json);
+            return Ok(ron);
         }
         Err(zbus::fdo::Error::Failed("UserConfig lock fail".into()))
     }
@@ -244,12 +246,11 @@ impl CtrlAnime<'static> {
             config.anime.push(action);
             config.write();
 
-            let json =
-                serde_json::to_string_pretty(&*config.anime).expect("Parse config to JSON failed");
-
+            let ron = ron::ser::to_string_pretty(&*config, PrettyConfig::new().depth_limit(4))
+                .expect("Parse config to RON failed");
             // Release the inner run loop again
             self.inner_early_return.store(false, Ordering::SeqCst);
-            return Ok(json);
+            return Ok(ron);
         }
         Err(zbus::fdo::Error::Failed("UserConfig lock fail".into()))
     }
@@ -289,12 +290,11 @@ impl CtrlAnime<'static> {
             config.anime.push(action);
             config.write();
 
-            let json =
-                serde_json::to_string_pretty(&*config.anime).expect("Parse config to JSON failed");
-
+            let ron = ron::ser::to_string_pretty(&*config, PrettyConfig::new().depth_limit(4))
+                .expect("Parse config to RON failed");
             // Release the inner run loop again
             self.inner_early_return.store(false, Ordering::SeqCst);
-            return Ok(json);
+            return Ok(ron);
         }
         Err(zbus::fdo::Error::Failed("UserConfig lock fail".into()))
     }
@@ -314,12 +314,11 @@ impl CtrlAnime<'static> {
             config.anime.push(action);
             config.write();
 
-            let json =
-                serde_json::to_string_pretty(&*config.anime).expect("Parse config to JSON failed");
-
+            let ron = ron::ser::to_string_pretty(&*config, PrettyConfig::new().depth_limit(4))
+                .expect("Parse config to RON failed");
             // Release the inner run loop again
             self.inner_early_return.store(false, Ordering::SeqCst);
-            return Ok(json);
+            return Ok(ron);
         }
         Err(zbus::fdo::Error::Failed("UserConfig lock fail".into()))
     }
@@ -337,12 +336,11 @@ impl CtrlAnime<'static> {
             }
             config.write();
 
-            let json =
-                serde_json::to_string_pretty(&*config.anime).expect("Parse config to JSON failed");
-
+            let ron = ron::ser::to_string_pretty(&*config, PrettyConfig::new().depth_limit(4))
+                .expect("Parse config to RON failed");
             // Release the inner run loop again
             self.inner_early_return.store(false, Ordering::SeqCst);
-            return Ok(json);
+            return Ok(ron);
         }
         Err(zbus::fdo::Error::Failed("UserConfig lock fail".into()))
     }

asusd/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "asusd"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
-repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
-homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
-description = "A daemon app for ASUS GX502 and similar laptops to control missing features"
-edition = "2021"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+description.workspace = true
+edition.workspace = true
 
 [[bin]]
 name = "asusd"
@@ -42,7 +42,8 @@ serde_derive.workspace = true
 
 concat-idents.workspace = true
 
-systemd-zbus = "*"
-
 [dev-dependencies]
 cargo-husky.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]

asusd/src/config.rs

@@ -31,18 +31,25 @@ pub struct Config {
     /// The energy_performance_preference for this throttle/platform profile
     pub throttle_performance_epp: CPUEPP,
     /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_pl1_spl: Option<u8>,
     /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_pl2_sppt: Option<u8>,
     /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_fppt: Option<u8>,
     /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_apu_sppt: Option<u8>,
     /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_platform_sppt: Option<u8>,
     /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub nv_dynamic_boost: Option<u8>,
     /// Defaults to `None` if not supported
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub nv_temp_target: Option<u8>,
     /// Temporary state for AC/Batt
     #[serde(skip)]

asusd/src/ctrl_anime/mod.rs

@@ -8,6 +8,7 @@ use std::sync::Arc;
 use std::thread::sleep;
 
 use ::zbus::export::futures_util::lock::Mutex;
+use config_traits::{StdConfig, StdConfigLoad2};
 use log::{error, info, warn};
 use rog_anime::error::AnimeError;
 use rog_anime::usb::{
@@ -62,7 +63,7 @@ pub struct CtrlAnime {
 
 impl CtrlAnime {
     #[inline]
-    pub fn new(config: AnimeConfig) -> Result<CtrlAnime, RogError> {
+    pub fn new() -> Result<CtrlAnime, RogError> {
         let usb = USBRaw::new(0x193b).ok();
         let hid = HidRaw::new("193b").ok();
         let node = if usb.is_some() {
@@ -89,6 +90,7 @@ impl CtrlAnime {
         //     }
         // }
 
+        let config = AnimeConfig::new().load();
         let mut anime_type = get_anime_type()?;
         if let AnimeType::Unknown = anime_type {
             if let Some(model) = config.model_override {

asusd/src/ctrl_aura/config.rs

@@ -16,6 +16,7 @@ pub struct AuraConfig {
     pub brightness: LedBrightness,
     pub current_mode: AuraModeNum,
     pub builtins: BTreeMap<AuraModeNum, AuraEffect>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub multizone: Option<BTreeMap<AuraModeNum, Vec<AuraEffect>>>,
     pub multizone_on: bool,
     pub enabled: LaptopAuraPower,

asusd/src/ctrl_aura/controller.rs

@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, HashSet};
 
 use config_traits::{StdConfig, StdConfigLoad};
+use dmi_id::DMIID;
 use inotify::Inotify;
 use log::{debug, info, warn};
 use rog_aura::aura_detection::LedSupportData;
@@ -121,19 +122,30 @@ impl CtrlKbdLed {
         }
 
         // Check for a TUF laptop LED. Assume there is only ever one.
-        if let Ok(tuf_kbd) = KeyboardLed::new() {
-            if tuf_kbd.has_kbd_rgb_mode() {
-                info!("AuraControl found a TUF laptop keyboard");
-                let ctrl = CtrlKbdLed {
-                    led_type: AuraDeviceType::LaptopTuf,
-                    led_node: LEDNode::KbdLed(tuf_kbd),
-                    supported_data: LedSupportData::get_data("tuf"),
-                    per_key_mode_active: false,
-                    config: Self::init_config("tuf"),
-                    dbus_path: dbus_path_for_tuf(),
-                };
-                devices.push(ctrl);
+        if let Ok(kbd_backlight) = KeyboardLed::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
+                let dmi = DMIID::new().unwrap_or_default();
+                info!("Found a TUF with product family: {}", dmi.product_family);
+                info!("and board name: {}", dmi.board_name);
+
+                if dmi.product_family.contains("TUF") {
+                    info!("AuraControl found a TUF laptop keyboard");
+                    let ctrl = CtrlKbdLed {
+                        led_type: AuraDeviceType::LaptopTuf,
+                        led_node: LEDNode::KbdLed(kbd_backlight),
+                        supported_data: LedSupportData::get_data("tuf"),
+                        per_key_mode_active: false,
+                        config: Self::init_config("tuf"),
+                        dbus_path: dbus_path_for_tuf(),
+                    };
+                    devices.push(ctrl);
+                }
             }
+        } else {
+            let dmi = DMIID::new().unwrap_or_default();
+            warn!("No asus::kbd_backlight found for {} ??", dmi.product_family);
         }
 
         info!("Found {} Aura devices", devices.len());

asusd/src/ctrl_platform.rs

@@ -720,6 +720,7 @@ impl crate::ZbusRun for CtrlPlatform {
 impl ReloadAndNotify for CtrlPlatform {
     type Data = Config;
 
+    /// Called on config file changed externally
     async fn reload_and_notify(
         &mut self,
         signal_context: &SignalContext<'static>,

asusd/src/ctrl_slash/mod.rs

@@ -1,6 +1,7 @@
 pub mod config;
 pub mod trait_impls;
 
+use config_traits::{StdConfig, StdConfigLoad};
 use rog_platform::hid_raw::HidRaw;
 use rog_platform::usb_raw::USBRaw;
 use rog_slash::error::SlashError;
@@ -31,19 +32,13 @@ impl Node {
 }
 
 pub struct CtrlSlash {
-    // node: HidRaw,
     node: Node,
     config: SlashConfig,
-    // slash_type: SlashType,
-    // // set to force thread to exit
-    // thread_exit: Arc<AtomicBool>,
-    // // Set to false when the thread exits
-    // thread_running: Arc<AtomicBool>,
 }
 
 impl CtrlSlash {
     #[inline]
-    pub fn new(config: SlashConfig) -> Result<CtrlSlash, RogError> {
+    pub fn new() -> Result<CtrlSlash, RogError> {
         let slash_type = get_slash_type()?;
         if matches!(slash_type, SlashType::Unknown | SlashType::Unsupported) {
             return Err(RogError::Slash(SlashError::NoDevice));
@@ -61,10 +56,7 @@ impl CtrlSlash {
 
         let ctrl = CtrlSlash {
             node,
-            config,
-            // slash_type,
-            // thread_exit: Arc::new(AtomicBool::new(false)),
-            // thread_running: Arc::new(AtomicBool::new(false)),
+            config: SlashConfig::new().load(),
         };
         ctrl.do_initialization()?;
 

asusd/src/ctrl_slash/trait_impls.rs

@@ -33,6 +33,7 @@ impl CtrlSlashZbus {
     }
 
     /// Set enabled true or false
+    #[zbus(property)]
     async fn set_enabled(&self, enabled: bool) {
         let mut lock = self.0.lock().await;
         let brightness = if enabled && lock.config.slash_brightness == 0 {
@@ -64,6 +65,7 @@ impl CtrlSlashZbus {
     }
 
     /// Set brightness level
+    #[zbus(property)]
     async fn set_brightness(&self, brightness: u8) {
         let mut lock = self.0.lock().await;
         let enabled = brightness > 0;
@@ -90,6 +92,7 @@ impl CtrlSlashZbus {
     }
 
     /// Set interval between slash animations (0-255)
+    #[zbus(property)]
     async fn set_interval(&self, interval: u8) {
         let mut lock = self.0.lock().await;
         lock.node
@@ -114,6 +117,7 @@ impl CtrlSlashZbus {
     }
 
     /// Set interval between slash animations (0-255)
+    #[zbus(property)]
     async fn set_slash_mode(&self, slash_mode: SlashMode) {
         let mut lock = self.0.lock().await;
 

asusd/src/daemon.rs

@@ -5,17 +5,15 @@ use std::sync::Arc;
 use ::zbus::export::futures_util::lock::Mutex;
 use ::zbus::Connection;
 use asusd::config::Config;
-use asusd::ctrl_anime::config::AnimeConfig;
 use asusd::ctrl_anime::trait_impls::CtrlAnimeZbus;
 use asusd::ctrl_anime::CtrlAnime;
 use asusd::ctrl_aura::manager::AuraManager;
 use asusd::ctrl_fancurves::CtrlFanCurveZbus;
 use asusd::ctrl_platform::CtrlPlatform;
-use asusd::ctrl_slash::config::SlashConfig;
 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, StdConfigLoad, StdConfigLoad2, StdConfigLoad3};
+use config_traits::{StdConfig, StdConfigLoad3};
 use log::{error, info};
 use zbus::fdo::ObjectManager;
 
@@ -98,7 +96,7 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
         }
     }
 
-    match CtrlAnime::new(AnimeConfig::new().load()) {
+    match CtrlAnime::new() {
         Ok(ctrl) => {
             let zbus = CtrlAnimeZbus(Arc::new(Mutex::new(ctrl)));
             let sig_ctx = CtrlAnimeZbus::signal_context(&connection)?;
@@ -109,7 +107,7 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
         }
     }
 
-    match CtrlSlash::new(SlashConfig::new().load()) {
+    match CtrlSlash::new() {
         Ok(ctrl) => {
             let zbus = CtrlSlashZbus(Arc::new(Mutex::new(ctrl)));
             // Currently, the Slash has no need for a loop watching power events, however,

config-traits/Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 name = "config-traits"
-license = "MPL-2.0"
-authors = ["Luke D Jones <luke@ljones.dev>"]
-edition = "2021"
+license.workspace = true
 version.workspace = true
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [dependencies]
 serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-toml.workspace = true
 ron.workspace = true
 
 log.workspace = true
 
 [dev-dependencies]
-cargo-husky.workspace = true
+cargo-husky.workspace = true

config-traits/src/lib.rs

@@ -3,10 +3,7 @@
 //! updating them from previous versions where fields or names are changed in
 //! some way.
 //!
-//! The end canonical file format is `.ron` as this supports rust types well,
-//! and includes the ability to add commenting, and is less verbose than `json`.
-//! Currently the crate will also try to parse from `json` and `toml` if the
-//! `ron` parsing fails, then update to `ron` format.
+//! The end canonical file format is `.ron` as this supports rust types well
 
 use std::fs::{self, create_dir, File, OpenOptions};
 use std::io::{Read, Write};
@@ -221,21 +218,9 @@ macro_rules! std_config_load {
                         if let Ok(data) = ron::from_str(&buf) {
                             self = data;
                             log::info!("Parsed RON for {:?}", std::any::type_name::<Self>());
-                        } else if let Ok(data) = serde_json::from_str(&buf) {
-                            self = data;
-                            log::info!("Parsed JSON for {:?}", std::any::type_name::<Self>());
-                        } else if let Ok(data) = toml::from_str(&buf) {
-                            self = data;
-                            log::info!("Parsed TOML for {:?}", std::any::type_name::<Self>());
-                        } $(else if let Ok(data) = ron::from_str::<$generic>(&buf) {
+                        }  $(else if let Ok(data) = ron::from_str::<$generic>(&buf) {
                             self = data.into();
                             log::info!("New version failed, trying previous: Parsed RON for {:?}", std::any::type_name::<$generic>());
-                        } else if let Ok(data) = serde_json::from_str::<$generic>(&buf) {
-                            self = data.into();
-                            log::info!("New version failed, trying previous: Parsed JSON for {:?}", std::any::type_name::<$generic>());
-                        } else if let Ok(data) = toml::from_str::<$generic>(&buf) {
-                            self = data.into();
-                            log::info!("Newvious version failed, trying previous: Parsed TOML for {:?}", std::any::type_name::<$generic>());
                         })* else {
                             self.rename_file_old();
                             self = Self::new();

cpuctl/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
 name = "cpuctl"
-license = "MPL-2.0"
-edition = "2021"
+license.workspace = true
 version.workspace = true
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [dependencies]

dmi-id/Cargo.toml

@@ -1,8 +1,13 @@
 [package]
 name = "dmi_id"
-edition = "2021"
+license.workspace = true
 version.workspace = true
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [dependencies]
 log.workspace = true
-udev.workspace = true
+udev.workspace = true

rog-anime/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "rog_anime"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
-repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
-homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 documentation = "https://docs.rs/rog-anime"
 description = "Types useful for translating images and other data for display on the ASUS AniMe Matrix display"
 keywords = ["ROG", "ASUS", "AniMe"]
-edition = "2021"
 exclude = ["data"]
 
 [features]
@@ -38,4 +38,7 @@ zbus = { workspace = true, optional = true }
 dmi_id = { path = "../dmi-id", optional = true }
 
 [dev-dependencies]
-cargo-husky.workspace = true
+cargo-husky.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]

rog-aura/Cargo.toml

@@ -29,4 +29,4 @@ typeshare.workspace = true
 ron = { version = "*", optional = true }
 
 [dev-dependencies]
-cargo-husky.workspace = true
+cargo-husky.workspace = true

rog-aura/data/aura_support.ron

@@ -27,7 +27,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "FX505D",
+        device_name: "FX505",
         product_id: "",
         layout_name: "fx505d",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
@@ -36,25 +36,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "FX505G",
-        product_id: "",
-        layout_name: "fx505d",
-        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
-        basic_zones: [],
-        advanced_type: None,
-        power_zones: [Keyboard],
-    ),
-    (
-        device_name: "FX506H",
-        product_id: "",
-        layout_name: "fa506i",
-        basic_modes: [Static, Breathe, Strobe, Pulse],
-        basic_zones: [],
-        advanced_type: None,
-        power_zones: [Keyboard],
-    ),
-    (
-        device_name: "FX506L",
+        device_name: "FX506",
         product_id: "",
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, Strobe, Pulse],
@@ -98,15 +80,6 @@
         advanced_type: None,
         power_zones: [Keyboard],
     ),
-    (
-        device_name: "G512LV",
-        product_id: "",
-        layout_name: "ga401q",
-        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
-        basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
-        power_zones: [Keyboard],
-    ),
     (
         device_name: "G513I",
         product_id: "",
@@ -116,6 +89,15 @@
         advanced_type: Zoned([ZonedKbLeft, ZonedKbLeftMid, ZonedKbRightMid, ZonedKbRight, LightbarRight, LightbarRightCorner, LightbarRightBottom, LightbarLeftBottom, LightbarLeftCorner, LightbarLeft]),
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G513Q",
+        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],
+    ),
     (
         device_name: "G513QE",
         product_id: "",
@@ -125,24 +107,6 @@
         advanced_type: None,
         power_zones: [Keyboard],
     ),
-    (
-        device_name: "G513QM",
-        product_id: "",
-        layout_name: "g513i",
-        basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
-        basic_zones: [],
-        advanced_type: PerKey,
-        power_zones: [Keyboard],
-    ),
-    (
-        device_name: "G513QR",
-        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],
-    ),
     (
         device_name: "G513QY",
         product_id: "",
@@ -153,16 +117,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "G513RC",
-        product_id: "",
-        layout_name: "g513i",
-        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
-        basic_zones: [],
-        advanced_type: Zoned([ZonedKbLeft, ZonedKbLeftMid, ZonedKbRightMid, ZonedKbRight, LightbarRight, LightbarRightCorner, LightbarRightBottom, LightbarLeftBottom, LightbarLeftCorner, LightbarLeft]),
-        power_zones: [Keyboard, Lightbar],
-    ),
-    (
-        device_name: "G513RM",
+        device_name: "G513R",
         product_id: "",
         layout_name: "g513i",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
@@ -188,15 +143,6 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
-    (
-        device_name: "G531",
-        product_id: "",
-        layout_name: "g513i-per-key",
-        basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
-        basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: PerKey,
-        power_zones: [Keyboard],
-    ),
     (
         device_name: "G531GD",
         product_id: "",
@@ -253,7 +199,7 @@
     ),
     (
         device_name: "G533Q",
-        product_id: "",
+        product_id: "1866",
         layout_name: "g533q-per-key",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
         basic_zones: [],
@@ -323,6 +269,15 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
+    (
+        device_name: "G713P",
+        product_id: "",
+        layout_name: "ga401q",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
+        basic_zones: [Key1, Key2, Key3, Key4],
+        advanced_type: None,
+        power_zones: [Keyboard],
+    ),
     (
         device_name: "G713QM",
         product_id: "",
@@ -427,9 +382,9 @@
         product_id: "",
         layout_name: "g513i-per-key",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
-        basic_zones: [Logo, BarLeft, BarRight],
+        basic_zones: [],
         advanced_type: PerKey,
-        power_zones: [Keyboard],
+        power_zones: [Keyboard, Lightbar, Logo, Lid],
     ),
     (
         device_name: "G733PZ",
@@ -459,7 +414,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "G814JI",
+        device_name: "G814J",
         product_id: "",
         layout_name: "g814ji-per-key",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
@@ -468,16 +423,7 @@
         power_zones: [Keyboard, Lightbar],
     ),
     (
-        device_name: "G814JZ",
-        product_id: "",
-        layout_name: "g814ji-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: "G834JZ",
+        device_name: "G834J",
         product_id: "",
         layout_name: "g814ji-per-key",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
@@ -531,7 +477,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "GA403UI",
+        device_name: "GA403U",
         product_id: "",
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
@@ -638,15 +584,6 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
-    (
-        device_name: "GU502G",
-        product_id: "",
-        layout_name: "gx502",
-        basic_modes: [Static, Breathe, Strobe, Rainbow, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
-        basic_zones: [],
-        advanced_type: PerKey,
-        power_zones: [Keyboard],
-    ),
     (
         device_name: "GU502L",
         product_id: "",
@@ -675,7 +612,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "GU603VV",
+        device_name: "GU603V",
         product_id: "",
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],

rog-control-center/Cargo.toml

@@ -1,19 +1,21 @@
 [package]
 name = "rog-control-center"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-authors = ["Luke D. Jones <luke@ljones.dev>"]
-edition = "2021"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [features]
 #default = ["mocking"]
 #mocking = []
 
 [dependencies]
-
-betrayer = { git = "https://github.com/flukejones/betrayer.git", features = [
-    "winit",
-] }
+nix = { version = "^0.28.0", features = ["fs"] }
+tempfile = "3.3.0"
+betrayer = { version = "0.2.0" }
 
 asusd = { path = "../asusd" }
 config-traits = { path = "../config-traits" }
@@ -22,7 +24,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", default-features = false }
+supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", rev = "4eb6e97c22b68ae8d1e80500709b0c0580776ad3", default-features = false }
 dmi_id = { path = "../dmi-id" }
 
 gumdrop.workspace = true
@@ -31,36 +33,24 @@ env_logger.workspace = true
 
 tokio.workspace = true
 serde.workspace = true
-ron.workspace = true
-serde_json.workspace = true
 serde_derive.workspace = true
 zbus.workspace = true
 dirs.workspace = true
 notify-rust.workspace = true
 concat-idents.workspace = true
 
-png_pong.workspace = true
-
 versions.workspace = true
 
-nix = "^0.26.1"
-tempfile = "3.3.0"
-
-i-slint-backend-selector = { git = "https://github.com/slint-ui/slint.git" }
-i-slint-core = { git = "https://github.com/slint-ui/slint.git" }
-i-slint-backend-winit = { git = "https://github.com/slint-ui/slint.git" }
-winit = "*"
-
 [dependencies.slint]
 git = "https://github.com/slint-ui/slint.git"
 default-features = false
 features = [
-    "std",
     "gettext",
-    "compat-1-0",
-    "backend-winit-wayland",
+    "compat-1-2",
     "backend-linuxkms",
-    "renderer-femtovg",
+    "backend-winit-wayland",
+    "renderer-winit-femtovg",
+    # "renderer-skia-opengl",
 ]
 
 [build-dependencies.slint-build]

rog-control-center/build.rs

@@ -7,11 +7,20 @@ fn main() {
     // write_locales();
 
     let root = env!("CARGO_MANIFEST_DIR");
-    let mut path = PathBuf::from_str(root).unwrap();
-    path.push("ui/main_window.slint");
+    let mut main = PathBuf::from_str(root).unwrap();
+    main.push("ui/main_window.slint");
+
+    let mut include = PathBuf::from_str(root).unwrap();
+    include.push("ui");
+
+    slint_build::print_rustc_flags().unwrap();
+    // slint_build::compile("ui/main_window.slint").unwrap();
     slint_build::compile_with_config(
-        path,
-        CompilerConfiguration::new().with_style("cosmic-dark".into()),
+        main,
+        CompilerConfiguration::new()
+            // .embed_resources(EmbedResourcesKind::EmbedFiles)
+            .with_include_paths(vec![include])
+            .with_style("fluent-dark".into()),
     )
     .unwrap();
 }

rog-control-center/src/main.rs

@@ -22,8 +22,6 @@ use rog_control_center::{
     get_ipc_file, on_tmp_dir_exists, print_versions, MainWindow, QUIT_APP, SHOWING_GUI, SHOW_GUI,
 };
 use tokio::runtime::Runtime;
-// use winit::monitor::VideoMode;
-// use winit::window::{Fullscreen, WindowLevel};
 
 #[tokio::main]
 async fn main() -> Result<()> {
@@ -73,11 +71,6 @@ async fn main() -> Result<()> {
         .format_timestamp(None)
         .init();
 
-    // start tokio
-    let rt = Runtime::new().expect("Unable to create Runtime");
-    // Enter the runtime so that `tokio::spawn` is available immediately.
-    let _enter = rt.enter();
-
     let supported_properties = match proxy.supported_properties() {
         Ok(s) => s,
         Err(_e) => {
@@ -117,13 +110,19 @@ async fn main() -> Result<()> {
     let enable_tray_icon = config.enable_tray_icon;
     let startup_in_background = config.startup_in_background;
     let config = Arc::new(Mutex::new(config));
-    start_notifications(config.clone())?;
+
+    // start tokio
+    let rt = Runtime::new().expect("Unable to create Runtime");
+    // Enter the runtime so that `tokio::spawn` is available immediately.
+    let _enter = rt.enter();
+    start_notifications(config.clone(), &rt)?;
+
     if enable_tray_icon {
         init_tray(supported_properties, config.clone());
     }
 
     thread_local! { pub static UI: std::cell::RefCell<Option<MainWindow>> = Default::default()};
-    i_slint_backend_selector::with_platform(|_| Ok(())).unwrap();
+    // i_slint_backend_selector::with_platform(|_| Ok(())).unwrap();
 
     let mut do_once = !startup_in_background;
 
@@ -159,7 +158,7 @@ async fn main() -> Result<()> {
                 sleep(Duration::from_millis(50));
 
                 let config_copy = config.clone();
-                i_slint_core::api::invoke_from_event_loop(move || {
+                slint::invoke_from_event_loop(move || {
                     UI.with(|ui| {
                         let mut ui = ui.borrow_mut();
                         if let Some(ui) = ui.as_mut() {
@@ -193,7 +192,7 @@ async fn main() -> Result<()> {
                         }
                     }
 
-                    i_slint_core::api::invoke_from_event_loop(move || {
+                    slint::invoke_from_event_loop(move || {
                         UI.with(|ui| {
                             let mut ui = ui.take();
                             if let Some(ui) = ui.borrow_mut() {
@@ -208,6 +207,7 @@ async fn main() -> Result<()> {
     });
 
     slint::run_event_loop_until_quit().unwrap();
+    rt.shutdown_background();
     Ok(())
 }
 

rog-control-center/src/notify.rs

@@ -18,6 +18,8 @@ use serde::{Deserialize, Serialize};
 use supergfxctl::actions::UserActionRequired as GfxUserAction;
 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;
 
@@ -44,10 +46,13 @@ impl Default for EnabledNotifications {
     }
 }
 
-pub fn start_notifications(config: Arc<Mutex<Config>>) -> Result<()> {
+pub fn start_notifications(
+    config: Arc<Mutex<Config>>,
+    rt: &Runtime,
+) -> Result<Vec<JoinHandle<()>>> {
     // Setup the AC/BAT commands that will run on power status change
     let config_copy = config.clone();
-    tokio::task::spawn_blocking(move || {
+    let blocking = rt.spawn_blocking(move || {
         let power = AsusPower::new()
             .map_err(|e| {
                 error!("AsusPower: {e}");
@@ -61,8 +66,8 @@ pub fn start_notifications(config: Arc<Mutex<Config>>) -> Result<()> {
                 let mut ac = String::new();
                 let mut bat = String::new();
                 if let Ok(config) = config_copy.lock() {
-                    ac = config.ac_command.clone();
-                    bat = config.bat_command.clone();
+                    ac.clone_from(&config.ac_command);
+                    bat.clone_from(&config.bat_command);
                 }
 
                 if p == 0 && p != last_state {
@@ -217,7 +222,7 @@ pub fn start_notifications(config: Arc<Mutex<Config>>) -> Result<()> {
         };
     });
 
-    Ok(())
+    Ok(vec![blocking])
 }
 
 fn convert_gfx_mode(gfx: GfxMode) -> GpuMode {

rog-control-center/src/tray.rs

@@ -136,7 +136,11 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
             .with_tooltip(TRAY_LABEL)
             .with_menu(build_menu())
             .build(do_action)
-            .map_err(|e| log::error!("Tray unable to be initialised: {e:?}"))
+            .map_err(|e| {
+                log::error!(
+                    "Tray unable to be initialised: {e:?}. Do you have a system tray enabled?"
+                )
+            })
         {
             info!("Tray started");
             let rog_blue = read_icon(&PathBuf::from("asus_notif_blue.png"));
@@ -151,41 +155,45 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
                 gpu_integrated,
             });
 
+            let mut has_supergfx = true;
             let conn = zbus::blocking::Connection::system().unwrap();
-            let gfx_proxy = GfxProxy::new(&conn).unwrap();
-            let mut supergfx_active = false;
-            if gfx_proxy.mode().is_ok() {
-                supergfx_active = true;
-                if let Ok(version) = gfx_proxy.version() {
-                    if let Some(version) = Versioning::new(&version) {
-                        let curr_gfx = Versioning::new("5.0.3-RC4").unwrap();
-                        warn!("supergfxd version = {version}");
-                        if version < curr_gfx {
-                            // Don't allow mode changing if too old a version
-                            warn!("supergfxd found but is too old to use");
-                            // tray.gfx_proxy_is_active = false;
+            if let Ok(gfx_proxy) = GfxProxy::new(&conn) {
+                let mut supergfx_active = false;
+                if gfx_proxy.mode().is_ok() {
+                    supergfx_active = true;
+                    if let Ok(version) = gfx_proxy.version() {
+                        if let Some(version) = Versioning::new(&version) {
+                            let curr_gfx = Versioning::new("5.2.0").unwrap();
+                            warn!("supergfxd version = {version}");
+                            if version < curr_gfx {
+                                // Don't allow mode changing if too old a version
+                                warn!("supergfxd found but is too old to use");
+                                has_supergfx = false;
+                            }
                         }
                     }
-                }
-            };
+                };
 
-            info!("Started ROGTray");
-            let mut last_power = GfxPower::Unknown;
-            loop {
-                if let Ok(lock) = config.try_lock() {
-                    if !lock.enable_tray_icon {
-                        return;
+                info!("Started ROGTray");
+                let mut last_power = GfxPower::Unknown;
+                loop {
+                    sleep(Duration::from_millis(1000));
+                    if let Ok(lock) = config.try_lock() {
+                        if !lock.enable_tray_icon {
+                            return;
+                        }
                     }
-                }
-                if let Ok(mode) = gfx_proxy.mode() {
-                    if let Ok(power) = gfx_proxy.power() {
-                        if last_power != power {
-                            set_tray_icon_and_tip(mode, power, &mut tray, supergfx_active);
-                            last_power = power;
+                    if has_supergfx {
+                        if let Ok(mode) = gfx_proxy.mode() {
+                            if let Ok(power) = gfx_proxy.power() {
+                                if last_power != power {
+                                    set_tray_icon_and_tip(mode, power, &mut tray, supergfx_active);
+                                    last_power = power;
+                                }
+                            }
                         }
                     }
                 }
-                sleep(Duration::from_millis(500));
             }
         }
     });

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

@@ -63,8 +63,8 @@ impl From<PowerZones> for SlintPowerZones {
             PowerZones::Lightbar => SlintPowerZones::Lightbar,
             PowerZones::Lid => SlintPowerZones::Lid,
             PowerZones::RearGlow => SlintPowerZones::RearGlow,
-            PowerZones::KeyboardAndLightbar => todo!(),
-            PowerZones::None => todo!(),
+            PowerZones::KeyboardAndLightbar => SlintPowerZones::KeyboardAndLightbar,
+            PowerZones::None => SlintPowerZones::Keyboard,
         }
     }
 }

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

@@ -1,5 +1,6 @@
 use std::sync::{Arc, Mutex};
 
+use log::info;
 use rog_aura::keyboard::LaptopAuraPower;
 use rog_dbus::zbus_aura::AuraProxy;
 use slint::{ComponentHandle, Model, RgbaColor, SharedString};
@@ -92,7 +93,12 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
 
     let handle = ui.as_weak();
     tokio::spawn(async move {
-        let aura = find_aura_iface().await.unwrap();
+        let aura = if let Ok(aura) = find_aura_iface().await {
+            aura
+        } else {
+            info!("This device appears to have no aura interfaces");
+            return;
+        };
 
         set_ui_props_async!(handle, aura, AuraPageData, brightness);
         set_ui_props_async!(handle, aura, AuraPageData, led_mode);

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-05 08:22+0000\n"
+"POT-Creation-Date: 2024-05-08 22:59+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"

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

@@ -6,6 +6,7 @@ export component ColourSlider inherits VerticalLayout {
     property <string> hex: "#FF0000";
     in-out property <float> c1value <=> c1.value;
     in-out property <float> c2value <=> c2.value;
+    in-out property <float> c3value <=> c3.value;
     property <color> base_colour: Colors.red;
     in-out property <color> final_colour: Colors.red;
     in-out property <brush> colourbox: final_colour;
@@ -53,39 +54,52 @@ export component ColourSlider inherits VerticalLayout {
         hsv(350, 1, 1),
         hsv(360, 1, 1),
     ];
-    property <[color]> base_shade: [
-        blend_lightness(base_colour, 1.0),
-        blend_lightness(base_colour, 0.9),
-        blend_lightness(base_colour, 0.8),
-        blend_lightness(base_colour, 0.7),
-        blend_lightness(base_colour, 0.6),
-        blend_lightness(base_colour, 0.5),
-        blend_lightness(base_colour, 0.4),
-        blend_lightness(base_colour, 0.3),
-        blend_lightness(base_colour, 0.2),
-        blend_lightness(base_colour, 0.1),
-        blend_lightness(base_colour, 0.0)
+    property <[color]> base_saturation: [
+        hsv(base_colour.to-hsv().hue, 1, 1),
+        hsv(base_colour.to-hsv().hue, 0.9, 1),
+        hsv(base_colour.to-hsv().hue, 0.8, 1),
+        hsv(base_colour.to-hsv().hue, 0.7, 1),
+        hsv(base_colour.to-hsv().hue, 0.6, 1),
+        hsv(base_colour.to-hsv().hue, 0.5, 1),
+        hsv(base_colour.to-hsv().hue, 0.4, 1),
+        hsv(base_colour.to-hsv().hue, 0.3, 1),
+        hsv(base_colour.to-hsv().hue, 0.2, 1),
+        hsv(base_colour.to-hsv().hue, 0.1, 1),
+        hsv(base_colour.to-hsv().hue, 0, 1),
     ];
-    function blend_lightness(c1: color,f: float) -> color {
-        rgb(c1.red * f, c1.green * f, c1.blue * f)
-    }
-    //
+    property <[color]> base_value: [
+        hsv(base_colour.to-hsv().hue, 1, 1),
+        hsv(base_colour.to-hsv().hue, 1, 0.9),
+        hsv(base_colour.to-hsv().hue, 1, 0.8),
+        hsv(base_colour.to-hsv().hue, 1, 0.7),
+        hsv(base_colour.to-hsv().hue, 1, 0.6),
+        hsv(base_colour.to-hsv().hue, 1, 0.5),
+        hsv(base_colour.to-hsv().hue, 1, 0.4),
+        hsv(base_colour.to-hsv().hue, 1, 0.3),
+        hsv(base_colour.to-hsv().hue, 1, 0.2),
+        hsv(base_colour.to-hsv().hue, 1, 0.1),
+        hsv(base_colour.to-hsv().hue, 1, 0),
+    ];
+
     function set_base_colour(){
-        root.base_colour = base_colours[c1.value].mix(base_colours[c1.value + 1], c1.value - Math.floor(c1.value));
-        root.final_colour = blend_lightness(base_colour, ((base_shade.length - c2.value) / base_shade.length));
+        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;
     }
-    //
+
     callback external_colour_change();
 
     external_colour_change => {
         if (root.final_colour.to-hsv().hue < 0) {
-            c1.value = (root.base_colours.length - 1) * ((root.final_colour.to-hsv().hue + 360) / 360);
+            c1.value = root.base_colours.length * (root.final_colour.to-hsv().hue + 360) / 360;
         } else {
-            c1.value = (root.base_colours.length - 1) * (root.final_colour.to-hsv().hue / 360);
+            c1.value = root.base_colours.length * root.final_colour.to-hsv().hue / 360;
         }
-        c2.value = root.base_shade.length - (root.base_shade.length * root.final_colour.to-hsv().value);
+        // c1.value = root.base_colours.length * 360 / root.final_colour.to-hsv().hue;
+        c2.value = root.base_saturation.length - root.base_saturation.length * root.final_colour.to-hsv().saturation;
+        c3.value = root.base_value.length - root.base_value.length * root.final_colour.to-hsv().value;
         root.set_base_colour();
+        hex = set_hex_from_colour(final_colour);
     }
     Rectangle {
         height: 32px;
@@ -100,7 +114,7 @@ export component ColourSlider inherits VerticalLayout {
             width: parent.width;
             height: parent.height;
             minimum: 0;
-            maximum: root.base_colours.length - 1;
+            maximum: root.base_colours.length;
             // One less than the array length
             changed => {
                 set_base_colour();
@@ -118,14 +132,38 @@ export component ColourSlider inherits VerticalLayout {
         border-radius: 7px;
         border-color: Palette.border;
         // 11 colours
-        background: !root.enabled ? Palette.alternate-background : @linear-gradient(90deg, base_shade[0], base_shade[1], base_shade[2], base_shade[3], base_shade[4], base_shade[5], base_shade[6], base_shade[7], base_shade[8], base_shade[9], base_shade[10]);
+            background: !root.enabled ? Palette.alternate-background : @linear-gradient(90deg, base_saturation[0], base_saturation[1], base_saturation[2], base_saturation[3], base_saturation[4], base_saturation[5], base_saturation[6], base_saturation[7], base_saturation[8], base_saturation[9], base_saturation[10]);
         clip: true;
         c2 := Slider {
             enabled <=> root.enabled;
             width: parent.width;
             height: parent.height;
             minimum: 0;
-            maximum: 11;
+            maximum: root.base_saturation.length;
+            changed => {
+                set_base_colour();
+                hex = set_hex_from_colour(final_colour);
+            }
+            released => {
+                root.released();
+            }
+        }
+    }
+
+    Rectangle {
+        height: 32px;
+        border-width: 2px;
+        border-radius: 7px;
+        border-color: Palette.border;
+        // 11 colours
+        background: !root.enabled ? Palette.alternate-background : @linear-gradient(90deg, base_value[0], base_value[1], base_value[2], base_value[3], base_value[4], base_value[5], base_value[6], base_value[7], base_value[8], base_value[9], base_value[10]);
+        clip: true;
+        c3 := Slider {
+            enabled <=> root.enabled;
+            width: parent.width;
+            height: parent.height;
+            minimum: 0;
+            maximum: root.base_value.length;
             changed => {
                 set_base_colour();
                 hex = set_hex_from_colour(final_colour);

rog-dbus/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "rog_dbus"
+license.workspace = true
 version.workspace = true
-license = "MPL-2.0"
-readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
-repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
-homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 description = "dbus interface methods for asusctl"
-edition = "2021"
 
 [dependencies]
 asusd = { path = "../asusd" }
@@ -19,4 +19,4 @@ rog_platform = { path = "../rog-platform" }
 zbus.workspace = true
 
 [dev-dependencies]
-cargo-husky.workspace = true
+cargo-husky.workspace = true

rog-platform/Cargo.toml

@@ -1,13 +1,16 @@
 [package]
 name = "rog_platform"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-edition = "2021"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [dependencies]
 log.workspace = true
 serde.workspace = true
-serde_derive.workspace = true
 zbus.workspace = true
 concat-idents.workspace = true
 udev.workspace = true
@@ -18,4 +21,3 @@ rusb.workspace = true
 
 [dev-dependencies]
 cargo-husky.workspace = true
-rog_aura = { path = "../rog-aura" }

rog-platform/src/usb_raw.rs

@@ -27,7 +27,7 @@ impl USBRaw {
         device: &Device<rusb::GlobalContext>,
     ) -> Result<DeviceHandle<rusb::GlobalContext>> {
         // We don't expect this ID to ever change
-        let mut device = device.open()?;
+        let device = device.open()?;
         device.reset()?;
         device.set_auto_detach_kernel_driver(true)?;
         device.claim_interface(0)?;

rog-profiles/Cargo.toml

@@ -1,9 +1,12 @@
 [package]
 name = "rog_profiles"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-authors = ["Luke D. Jones <luke@ljones.dev>"]
-edition = "2021"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [features]
 default = ["dbus"]
@@ -20,4 +23,7 @@ rog_platform = { path = "../rog-platform" }
 zbus = { workspace = true, optional = true }
 
 [dev-dependencies]
-cargo-husky.workspace = true
+cargo-husky.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]

rog-slash/Cargo.toml

@@ -1,14 +1,15 @@
 [package]
 name = "rog_slash"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-authors = ["Luke <luke@ljones.dev>"]
-repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
-homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 documentation = "https://docs.rs/rog-slash"
 description = "ASUS Slash display"
 keywords = ["ROG", "ASUS", "AniMe", "Slash"]
-edition = "2021"
 exclude = ["data"]
 
 [features]
@@ -21,20 +22,14 @@ name = "rog_slash"
 path = "src/lib.rs"
 
 [dependencies]
-png_pong.workspace = true
-pix.workspace = true
-gif.workspace = true
-log.workspace = true
-
 serde.workspace = true
 serde_derive.workspace = true
-
-glam.workspace = true
 typeshare.workspace = true
-
 zbus = { workspace = true, optional = true }
-
 dmi_id = { path = "../dmi-id", optional = true }
 
 [dev-dependencies]
-cargo-husky.workspace = true
+cargo-husky.workspace = true
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]

simulators/Cargo.toml

@@ -1,14 +1,12 @@
 [package]
 name = "rog_simulators"
-license = "MPL-2.0"
+license.workspace = true
 version.workspace = true
-readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
-repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
-homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
-documentation = "https://docs.rs/rog-anime"
-edition = "2021"
-exclude = ["data"]
+readme.workspace = true
+authors.workspace = true
+repository.workspace = true
+homepage.workspace = true
+edition.workspace = true
 
 [[bin]]
 name = "anime_sim"
@@ -17,11 +15,7 @@ path = "src/simulator.rs"
 
 [dependencies]
 log.workspace = true
-
-glam.workspace = true
-
 uhid-virt = "^0.0.7"
-
 rog_anime = { path = "../rog-anime", features = ["dbus"] }
 
 [dependencies.sdl2]