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,14 @@ 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

Cargo.lock

@@ -117,7 +117,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "asusctl"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "asusd",
  "cargo-husky",
@@ -135,14 +135,14 @@ dependencies = [
 
 [[package]]
 name = "asusd"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "concat-idents",
  "config-traits",
  "dmi_id",
  "env_logger",
- "futures-lite 1.13.0",
+ "futures-lite 2.3.0",
  "inotify",
  "log",
  "logind-zbus",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "asusd-user"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "config-traits",
@@ -828,7 +828,7 @@ dependencies = [
 
 [[package]]
 name = "config-traits"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "log",
@@ -839,7 +839,7 @@ dependencies = [
 [[package]]
 name = "const-field-offset"
 version = "0.1.5"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "const-field-offset-macro",
  "field-offset",
@@ -848,7 +848,7 @@ dependencies = [
 [[package]]
 name = "const-field-offset-macro"
 version = "0.1.5"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -934,7 +934,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
 [[package]]
 name = "cpuctl"
-version = "6.0.3"
+version = "6.0.4"
 
 [[package]]
 name = "cpufeatures"
@@ -1134,7 +1134,7 @@ dependencies = [
 
 [[package]]
 name = "dmi_id"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "log",
  "udev 0.8.0",
@@ -1252,9 +1252,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1841,7 +1841,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 [[package]]
 name = "i-slint-backend-linuxkms"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "calloop",
  "drm",
@@ -1861,7 +1861,7 @@ dependencies = [
 [[package]]
 name = "i-slint-backend-selector"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "cfg-if",
  "i-slint-backend-linuxkms",
@@ -1873,7 +1873,7 @@ dependencies = [
 [[package]]
 name = "i-slint-backend-winit"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "cfg-if",
  "cfg_aliases 0.2.0",
@@ -1903,7 +1903,7 @@ dependencies = [
 [[package]]
 name = "i-slint-common"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "cfg-if",
  "derive_more",
@@ -1914,7 +1914,7 @@ dependencies = [
 [[package]]
 name = "i-slint-compiler"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "by_address",
  "codemap",
@@ -1943,7 +1943,7 @@ dependencies = [
 [[package]]
 name = "i-slint-core"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "auto_enums",
  "bitflags 2.5.0",
@@ -1986,7 +1986,7 @@ dependencies = [
 [[package]]
 name = "i-slint-core-macros"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "quote",
  "syn 2.0.61",
@@ -1995,7 +1995,7 @@ dependencies = [
 [[package]]
 name = "i-slint-renderer-femtovg"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "cfg-if",
  "const-field-offset",
@@ -2026,7 +2026,7 @@ dependencies = [
 [[package]]
 name = "i-slint-renderer-skia"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "bytemuck",
  "cfg-if",
@@ -3309,7 +3309,7 @@ dependencies = [
 
 [[package]]
 name = "rog-control-center"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "asusd",
  "betrayer",
@@ -3341,7 +3341,7 @@ dependencies = [
 
 [[package]]
 name = "rog_anime"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "dmi_id",
@@ -3358,7 +3358,7 @@ dependencies = [
 
 [[package]]
 name = "rog_aura"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "dmi_id",
@@ -3372,7 +3372,7 @@ dependencies = [
 
 [[package]]
 name = "rog_dbus"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "asusd",
  "cargo-husky",
@@ -3386,7 +3386,7 @@ dependencies = [
 
 [[package]]
 name = "rog_platform"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "concat-idents",
@@ -3401,7 +3401,7 @@ dependencies = [
 
 [[package]]
 name = "rog_profiles"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "log",
@@ -3415,7 +3415,7 @@ dependencies = [
 
 [[package]]
 name = "rog_simulators"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "log",
  "rog_anime",
@@ -3425,7 +3425,7 @@ dependencies = [
 
 [[package]]
 name = "rog_slash"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "cargo-husky",
  "dmi_id",
@@ -3760,7 +3760,7 @@ dependencies = [
 [[package]]
 name = "slint"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "const-field-offset",
  "i-slint-backend-selector",
@@ -3776,7 +3776,7 @@ dependencies = [
 [[package]]
 name = "slint-build"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "i-slint-compiler",
  "spin_on",
@@ -3787,7 +3787,7 @@ dependencies = [
 [[package]]
 name = "slint-macros"
 version = "1.6.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "i-slint-compiler",
  "proc-macro2",
@@ -4496,7 +4496,7 @@ dependencies = [
 [[package]]
 name = "vtable"
 version = "0.2.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "const-field-offset",
  "portable-atomic",
@@ -4507,7 +4507,7 @@ dependencies = [
 [[package]]
 name = "vtable-macro"
 version = "0.2.0"
-source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3"
+source = "git+https://github.com/slint-ui/slint.git#0929e3dfc144656a2a2df7c1b7b473d452ba7764"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -25,7 +25,7 @@ default-members = [
 resolver = "2"
 
 [workspace.package]
-version = "6.0.3"
+version = "6.0.4"
 rust-version = "1.77"
 license = "MPL-2.0"
 readme = "README.md"

README.md

@@ -78,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
 
@@ -88,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
 

asusd/src/ctrl_aura/controller.rs

@@ -143,6 +143,9 @@ impl CtrlKbdLed {
                     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_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;
 

rog-aura/data/aura_support.ron

@@ -89,15 +89,6 @@
         advanced_type: Zoned([ZonedKbLeft, ZonedKbLeftMid, ZonedKbRightMid, ZonedKbRight, LightbarRight, LightbarRightCorner, LightbarRightBottom, LightbarLeftBottom, LightbarLeftCorner, LightbarLeft]),
         power_zones: [Keyboard, Lightbar],
     ),
-    (
-        device_name: "G513QE",
-        product_id: "",
-        layout_name: "g513i",
-        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
-        basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
-        power_zones: [Keyboard],
-    ),
     (
         device_name: "G513Q",
         product_id: "",
@@ -107,6 +98,15 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
+    (
+        device_name: "G513QE",
+        product_id: "",
+        layout_name: "g513i",
+        basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
+        basic_zones: [Key1, Key2, Key3, Key4],
+        advanced_type: None,
+        power_zones: [Keyboard],
+    ),
     (
         device_name: "G513QY",
         product_id: "",
@@ -199,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: [],
@@ -382,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",

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/translations/en/rog-control-center.po

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-05-08 10:28+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"