Fix: ensure property derive is on all property methods for slash

2026-01-22 17:33:19 +01:00 · 2024-05-09 09:34:02 +12:00
parent a18692ef1e
commit 37bc5e45b9
8 changed files with 41 additions and 31 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ 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
+
 ## [v6.0.3]

 ### NOTE
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,7 +117,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"

 [[package]]
 name = "asusctl"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
 "asusd",
 "cargo-husky",
@@ -135,7 +135,7 @@ dependencies = [

 [[package]]
 name = "asusd"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
 "cargo-husky",
 "concat-idents",
@@ -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",
@@ -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",
@@ -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",
--- a/Cargo.toml
+++ b/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"
--- a/README.md
+++ b/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

--- a/asusd/src/ctrl_slash/trait_impls.rs
+++ b/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;

--- a/rog-aura/data/aura_support.ron
+++ b/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: "",
--- a/rog-control-center/src/types/aura_types.rs
+++ b/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,
        }
    }
 }
--- a/rog-control-center/translations/en/rog-control-center.po
+++ b/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 21:32+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"