fix: make the linter happy again

rog-control-center toast message update

See merge request asus-linux/asusctl!248

.cargo-husky/hooks/post-commit

@@ -0,0 +1,53 @@
+#!/bin/sh
+set -e
+
+ROOT_DIR=$(git rev-parse --show-toplevel)
+AURA_DATA="${ROOT_DIR}/rog-aura/data/aura_support.ron"
+SPEC_FILE="${ROOT_DIR}/distro-packaging/asusctl.spec"
+TRANSLATION="${ROOT_DIR}/rog-control-center/translations/en/rog-control-center.po"
+VERSION=$(grep -Pm1 'version = "(\d+.\d+.\d+.*)"' "${ROOT_DIR}/Cargo.toml" | cut -d'"' -f2)
+
+if [ -z "$VERSION" ]; then
+    echo "Error: Could not extract version from Cargo.toml"
+    exit 1
+fi
+if [ ! -f "$SPEC_FILE" ]; then
+    echo "Error: Spec file not found at ${SPEC_FILE}"
+    exit 1
+fi
+
+# Update spec file
+sed -i "s/^%define version.*/%define version ${VERSION}/" "$SPEC_FILE"
+if git diff --quiet "$SPEC_FILE"; then
+    echo "No changes to spec file"
+else
+    git add "$SPEC_FILE"
+    git commit --no-verify -m "chore: update spec file version to ${VERSION}"
+    echo "Updated spec file version to ${VERSION}"
+fi
+
+# Update translations only if UI files changed
+if git diff-tree -r HEAD@{1} HEAD --name-only | grep -q "^rog-control-center/ui/"; then
+    echo 'find -name \*.slint | xargs slint-tr-extractor -o ${TRANSLATION}'
+    find -name \*.slint | xargs slint-tr-extractor -o $TRANSLATION
+    if git diff --quiet "$TRANSLATION"; then
+        echo "No changes to translation file"
+    else
+        git add "$TRANSLATION"
+        git commit --no-verify -m "chore: update translations"
+        echo "Updated ${TRANSLATION}"
+    fi
+else
+    echo "No changes in rog-control-center/ui/, skipping translation update"
+fi
+
+# Update aura data
+cargo test --package rog_aura --lib -- aura_detection::tests::check_data_file_parse --exact
+cargo test --package rog_aura --lib -- aura_detection::tests::find_data_file_groups --exact
+if git diff --quiet "$AURA_DATA"; then
+    echo "No changes to aura data file"
+else
+    git add "$AURA_DATA"
+    git commit --no-verify -m "chore: update aura data"
+    echo "Updated $AURA_DATA"
+fi

.cargo-husky/hooks/pre-commit

@@ -1,18 +1,6 @@
 #!/bin/sh
-
 set -e
 
-echo 'find -name \*.slint | xargs slint-tr-extractor -o rog-control-center/translations/en/rog-control-center.po'
-find -name \*.slint | xargs slint-tr-extractor -o rog-control-center/translations/en/rog-control-center.po
-
-echo '+cargo +nightly fmt --all -- --check'
-cargo +nightly fmt --all -- --check
-
-echo '+cargo clippy --all -- -D warnings'
-cargo clippy --all -- -D warnings
-
-echo '+cargo test --all'
-cargo test --all -- --test-threads=1
-
-echo '+cargo cranky'
-cargo cranky
+echo '+cargo fmt --all -- --check'
+cargo fmt --all -- --check
+git add -u

.cargo-husky/hooks/pre-push

@@ -2,8 +2,8 @@
 
 set -e
 
-echo '+cargo +nightly fmt --all -- --check'
-cargo +nightly fmt --all -- --check
+echo '+cargo fmt --all -- --check'
+cargo fmt --all -- --check
 echo '+cargo clippy --all -- -D warnings'
 cargo clippy --all -- -D warnings
 echo '+cargo cranky'

.gitignore

@@ -9,6 +9,7 @@ vendor_*
 .vscode
 .~lock.*
 *.ods#
+*.patch
 
 # gnome extension
 node-modules

.gitlab-ci.yml

@@ -1,22 +1,26 @@
 image: rust:latest
 
+# Use shallow clone to reduce checkout size
+variables:
+  GIT_DEPTH: "1"
+  # Put cargo home and target under project dir so we can clean them easily
+  CARGO_HOME: "$CI_PROJECT_DIR/.cargo"
+  CARGO_TARGET_DIR: "$CI_PROJECT_DIR/ci-target"
+  GIT_SUBMODULE_STRATEGY: normal
+
+# Cache only cargo registries/git metadata to speed dependency fetches.
+# Avoid caching compiled `target` artifacts which are large and easily fill disk.
 .rust_cache: &rust_cache
   cache:
-    # key: $CI_COMMIT_REF_SLUG
+    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
-      # Don't include `incremental` to save space
-      # Debug
-      - target/debug/build/
-      - target/debug/deps/
-      - target/debug/.fingerprint/
-      - target/debug/.cargo-lock
-      # Release
-      - target/release/build/
-      - target/release/deps/
-      - target/release/.fingerprint/
-      - target/release/.cargo-lock
+      - .cargo/registry
+      - .cargo/git
 
 before_script:
+  - df -h
+  - echo "Cleaning stale targets to free space if present"
+  - rm -rf "$CI_PROJECT_DIR/target" "$CI_PROJECT_DIR/ci-target" || true
   - apt-get update -qq && apt-get install -y -qq libudev-dev libgtk-3-dev grep llvm clang libclang-dev libsdl2-dev libsdl2-gfx-dev
 
 stages:
@@ -31,20 +35,24 @@ format:
     - tags
   <<: *rust_cache
   script:
-    - echo "nightly" > rust-toolchain
-    - rustup component add rustfmt
+    - rustup component add rustfmt || true
     - cargo fmt --check
+  after_script:
+    - du -sh "$CI_PROJECT_DIR/ci-target" || true
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
 
 check:
   except:
     - tags
   <<: *rust_cache
   script:
-    - rustup component add clippy
-    - cargo check
+    - rustup component add clippy || true
+    - cargo check --locked --workspace
     # deny currently catches too much
     #- cargo install cargo-deny && cargo deny
     - cargo install cargo-cranky && cargo cranky
+  after_script:
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
 
 test:
   except:
@@ -52,7 +60,9 @@ test:
   <<: *rust_cache
   script:
     - mkdir -p .git/hooks > /dev/null
-    - cargo test --all -- --test-threads=1
+    - cargo test --locked --all
+  after_script:
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true
 
 release:
   only:
@@ -60,11 +70,15 @@ release:
   <<: *rust_cache
   script:
     - cargo install cargo-vendor-filterer
-    - make && make vendor
+    - cargo fetch
+    - make FROZEN=1 && make vendor
   artifacts:
     paths:
       - vendor_asusctl*.tar.xz
       - cargo-config
+    expire_in: 1 week
+  after_script:
+    - rm -rf vendor vendor_asusctl*.tar.xz "$CI_PROJECT_DIR/ci-target" || true
 
 pages:
   stage: deploy
@@ -72,14 +86,14 @@ pages:
     - tags
   <<: *rust_cache
   script:
-    - cargo doc --document-private-items --no-deps --workspace
+    - cargo doc --locked --document-private-items --no-deps --workspace
     - rm -rf public
     - mkdir public
-    - cp -R target/doc/* public
-    - cp extra/index.html public
+    - cp -R ci-target/doc/* public
+    - if [ -f extra/index.html ]; then cp extra/index.html public; else echo "no extra/index.html to copy"; fi
   artifacts:
     paths:
       - public
-
-variables:
-  GIT_SUBMODULE_STRATEGY: normal
+    expire_in: 1 week
+  after_script:
+    - rm -rf "$CI_PROJECT_DIR/ci-target" || true

CHANGELOG.md

@@ -1,6 +1,217 @@
 # Changelog
 
-## [Unreleased]
+## [6.3.2]
+
+### Changes
+- Improve the notification area, @shevchenko0013 strikes again!
+- Improve firmware attributes handling
+
+## [6.3.1]
+
+### Changes
+- Removed a lighting mode that is unavailable in windows to G835L: thanks to @shevchenko0013 again!
+- Added translations for Ukranian language, thanks @shevchenko0013!
+- Added LEDs definition for G615LR, thanks @btnrv
+- Fix improper usage of Quiet when only LowPower is available
+
+## [6.3.0]
+
+### Changed
+- Added support for TUF keyboard powerstate control
+- Improved AniMe Matrix support thanks to @Seom1177 !
+- Fixed a bug with one-shot battery change, thanks @bitr8 !
+- Changed the CLI interface of asusctl to be less confusing
+- Added support for G835L, thanks to @shevchenko0013 !
+
+## [6.2.0]
+
+### Changed
+- Added aura support for FX607V: thanks @jomp16
+- Added testing support for G835LW
+- Added support for GU605C models slash lighting: thanks @Otters
+- Restore fedora: thanks @ali205412
+- Add support to G614F models slash lighting
+
+## [6.1.22]
+
+### Changed
+- Allow configuration of nv_tgp
+- Treat dGPU attributes as power profiles
+- Add EXPERTBOOK DMI match to ensure the service is loaded
+- Support G815L thanks to @solost !
+
+## [6.1.21]
+
+### Changed
+- Kill Fedora: screw your cursed cargo bullshit
+- Restore CI building
+
+## [6.1.20]
+
+### Changed
+- Addded support for G635L: thanks @luca_pisl !
+- Suppress verbose output in applications too, not just daemon
+
+## [6.1.18]
+
+### Changed
+- Add aura support for G614FR (ROG Strix G16 2025)
+- all notifications now respects the timeout 
+- improve udev daemon-starting rule
+- reduce log noise
+
+## [v6.1.17]
+
+### Changed
+- Fix Makefile
+- Share a single HID device
+
+## [v6.1.16]
+
+### Changed
+- Expose more properties via rog-control-center
+- Add support for a few more models
+
+## [v6.1.15]
+
+### Changed
+- Reflect the current asus-armoury status on AC plug connection status change
+
+## [v6.1.14]
+
+### Changed
+- Fix formatting
+- Attempt to fix tests
+
+## [v6.1.13]
+
+### Changed
+- Fix a problem in reloading the service (@evertvorster)
+- Add Azerbaijani language (@rashadgasimli)
+- Add Ubuntu installation instructions
+
+## [v6.1.12]
+
+### Changed
+- Fix an unbounded event loop caused by other processes causing a "modify" event on the screen backlight brightness.
+
+## [v6.1.11]
+
+### Changed
+- Fix anime flickering issue when using custom anims (@I-Al-Istannen)
+- Include pt_BR translations file (@PabloKiryu)
+
+## Added
+- Support for the screenpad brightness on some Laptops. This includes syncing to the primary screen brightness, and a gamma adjustment to set brightness scaling.
+  - Add asusctl CLI options
+  - Add UI options
+  - Add a fake gamma correction (`asusctl backlight --sync-screenpad-brightness`, 1.5 for example sets screenpad low brightness lower than primary, and scales upwards)
+
+### Changed
+- asusd: single line fix for profile switching
+
+## [v6.1.9]
+
+### Changed
+- ROGCC: better handling of platform profiles
+
+## [v6.1.8]
+
+### Changed
+- Testing CI for opensuse RPM build
+- ROGCC: Fixes to showing the PPT enablement toggle
+- ROGCC: Fixes to how PPT and NV sliders work and enable/disable
+- RGOCC: Fix quiet fan-curves availability
+
+## [v6.1.7]
+
+### Changed
+- Fix Slash display enable
+
+## [v6.1.6]
+
+### Changed
+- Disable skia bindings for UI again. It causes failures in build pipelines and requires extra dependencies.
+
+## [v6.1.5]
+
+### Changed
+- Update dependencies
+- Fix fan-curve proxy type signatures
+
+## [v6.1.4]
+
+### Changed
+- Fix git doing me a dirty
+
+## [v6.1.3]
+
+### Changed
+- Many small bugfixes such as for platform profile switching
+
+## [v6.1.2]
+
+### Changed
+- Try a slightly different tact to fix charge control slider
+
+## [v6.1.1]
+
+### Changed
+- Fix aura data matching
+- Fix charge control slider
+
+## [v6.1.0]
+
+### Changed
+- Update deps
+- Add support for G513RC RGB modes
+- Many UI fixes
+- Fixes to PPT settings in UI
+
+## [v6.1.0-rc7]
+
+- Refactor PPT handling more:
+  1. Per profile, per-ac/dc
+  2. Do not apply unless group is enabled
+  3. Better reset/disable handling
+  4. Selecting a profile defaults PPT to off/disabled
+- Bugfix: prevent an AniMe thread async deadlock
+
+## [v6.1.0-rc6]
+
+### Changed
+- Two small fixes, one for `low-power` profile name, and one for base gpu tdp
+- Move to using platform_profile api only (no throttle_thermal_policy)
+
+## [v6.1.0-rc5]
+
+### Changed
+- Per-AC/DC, per-profile tunings enabled (Battery vs AC power +  platform profile)
+- Add ability to restore PPT defaults
+- Add PPT help dialogue to UI
+- Bug fix: correctly set charge limit from UI
+
+## [v6.1.0-rc4]
+
+### Changed
+- Bug fix: UI was setting incorrect value for FPPT
+- Bug fix: Re-add callbacks for the throttle and epp settings in UI
+- Bug fix: Fix UI settigns for AniMe Matrix display
+- Bug fix: better handle missing tray (for example gnome)
+- Strip out all outdated and unsafe tuning stuff
+- Allow each performance profile to have different PPT settings
+
+## [v6.1.0-rc3]
+
+### Changed
+- Bug fixes
+- Partial support for per-profile CPU tunings (WIP)
+
+## [v6.1.0-rc2]
+
+### Added
+- asus-armoury driver support. WIP, will be adjusted/changed further
+- More "Slash" display controls
 
 ## [v6.1.0-rc1]
 

Cargo.toml

@@ -1,9 +1,12 @@
 [workspace.package]
-version = "6.1.0-rc1"
+version = "6.3.1"
 rust-version = "1.82"
 license = "MPL-2.0"
 readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
+authors = [
+  "Luke <luke@ljones.dev>",
+  "Denis Benato <benato.denis96@gmail.com>"
+]
 repository = "https://gitlab.com/asus-linux/asusctl"
 homepage = "https://gitlab.com/asus-linux/asusctl"
 description = "Laptop feature control for ASUS ROG laptops and others"
@@ -12,48 +15,43 @@ edition = "2021"
 [workspace]
 resolver = "2"
 members = [
-    "asusctl",
-    "asusd",
-    "asusd-user",
-    "config-traits",
-    "cpuctl",
-    "dmi-id",
-    "rog-platform",
-    "rog-dbus",
-    "rog-anime",
-    "rog-aura",
-    "rog-profiles",
-    "rog-control-center",
-    "rog-slash",
-    "simulators", "rog-scsi",
-]
-default-members = [
-    "asusctl",
-    "asusd",
-    "asusd-user",
-    "cpuctl",
-    "rog-control-center",
+  "asusctl",
+  "asusd",
+  "asusd-user",
+  "config-traits",
+  "dmi-id",
+  "rog-platform",
+  "rog-dbus",
+  "rog-anime",
+  "rog-aura",
+  "rog-profiles",
+  "rog-control-center",
+  "rog-slash",
+  "simulators",
+  "rog-scsi",
 ]
 
+default-members = ["asusctl", "asusd", "asusd-user", "rog-control-center"]
+
 [workspace.dependencies]
 tokio = { version = "^1.39.0", default-features = false, features = [
-    "macros",
-    "sync",
-    "time",
-    "rt",
-    "rt-multi-thread",
+  "macros",
+  "sync",
+  "time",
+  "rt",
+  "rt-multi-thread",
 ] }
 concat-idents = "^1.1"
 dirs = "^4.0"
 smol = "^2.0"
 mio = "0.8.11"
 
-zbus = "5.1"
-logind-zbus = { version = "5.0.0" } #, default-features = false, features = ["non_blocking"] }
+futures-util = "0.3.31"
+zbus = "5.13.1"
+logind-zbus = { version = "5.2.0" } #, default-features = false, features = ["non_blocking"] }
 
 serde = { version = "^1.0", features = ["serde_derive"] }
 ron = "*"
-typeshare = "1.0.0"
 
 log = "^0.4"
 env_logger = "^0.10.0"
@@ -62,18 +60,18 @@ glam = { version = "^0.22", features = ["serde"] }
 gumdrop = "^0.8"
 udev = { version = "^0.8", features = ["mio"] }
 rusb = "^0.9"
-inotify = "^0.10.0"
+inotify = "^0.10"
 
 png_pong = "^0.8"
 pix = "^0.13"
-tinybmp = "^0.4.0"
-gif = "^0.12.0"
+tinybmp = "^0.4"
+gif = "^0.12"
 
 versions = "6.2"
 
-notify-rust = { version = "4.11.0", features = ["z", "async"] }
+notify-rust = { version = "4.11.5", features = ["z", "async"] }
 
-sg = {git = "https://github.com/flukejones/sg-rs.git"}
+sg = { git = "https://github.com/flukejones/sg-rs.git" }
 
 [profile.release]
 # thin = 57s, asusd = 9.0M
@@ -82,15 +80,15 @@ lto = "fat"
 debug = false
 opt-level = 3
 panic = "abort"
-codegen-units = 1
+# codegen-units = 1
 
 [profile.dev]
 opt-level = 1
-codegen-units = 16
+# codegen-units = 1
 
 [profile.dev.package."*"]
 opt-level = 1
-codegen-units = 16
+# codegen-units = 1
 
 [profile.bench]
 debug = false

MANUAL.md

@@ -48,7 +48,7 @@ The LED controller (e.g, aura) enables setting many of the factory modes availab
 
 #### Supported laptops
 
-There are over 60 supported laptops as of 01-01-2023. Please see [the rog-aura crate readme for further details](/rog-aura/README.md).
+There are over 80 supported laptops as of 01-01-2023. Please see [the rog-aura crate readme for further details](/rog-aura/README.md).
 
 ### Charge control
 
@@ -420,13 +420,13 @@ To switch to next/previous Aura modes you will need to bind both the aura keys (
 **Next**
 
 ```
-asusctl led-mode -n
+asusctl aura -n
 ```
 
 **Previous**
 
 ```
-asusctl led-mode -p
+asusctl aura -p
 ```
 
 To switch Fan/Thermal profiles you need to bind the Fn+F5 key to `asusctl profile -n`.

Makefile

@@ -1,4 +1,4 @@
-VERSION := $(shell /usr/bin/grep -Pm1 'version = "(\d+.\d+.\d+)"' Cargo.toml | cut -d'"' -f2)
+VERSION := $(shell /usr/bin/grep -Pm1 'version = "(\d+.\d+.\d+.*)"' Cargo.toml | cut -d'"' -f2)
 
 INSTALL = install
 INSTALL_PROGRAM = ${INSTALL} -D -m 0755
@@ -17,9 +17,11 @@ BIN_D := asusd
 BIN_U := asusd-user
 LEDCFG := aura_support.ron
 
+DESTDIR_REALPATH = $(shell realpath $(DESTDIR))
+
 SRC := Cargo.toml Cargo.lock Makefile $(shell find -type f -wholename '**/src/*.rs')
 
-STRIP_BINARIES ?= 1
+STRIP_BINARIES ?= 0
 
 DEBUG ?= 0
 ifeq ($(DEBUG),0)
@@ -35,6 +37,15 @@ ifeq ($(X11),1)
 	ARGS += --features "rog-control-center/x11"
 endif
 
+# Always use the versions in Cargo.lock by default
+ARGS += --locked
+
+# Allow optionally freezing the build to avoid any network access and enforce Cargo.lock strictly
+FROZEN ?= 0
+ifeq ($(FROZEN),1)
+	ARGS += --frozen
+endif
+
 VENDORED ?= 0
 ifeq ($(VENDORED),1)
 	ARGS += --frozen
@@ -48,24 +59,38 @@ clean:
 distclean:
 	rm -rf .cargo vendor vendor.tar.xz
 
-install-program:
-	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_ROG)" "$(DESTDIR)$(bindir)/$(BIN_ROG)"
+target/$(TARGET)/$(BIN_D): $(SRC)
+	$(MAKE) build
 
-	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)"
+target/$(TARGET)/$(BIN_C): $(SRC)
+	$(MAKE) build
+
+target/$(TARGET)/$(BIN_U): $(SRC)
+	$(MAKE) build
+
+target/$(TARGET)/$(BIN_ROG): $(SRC)
+	$(MAKE) build
+
+install-asusd: target/$(TARGET)/$(BIN_D)
 	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
+
+install-asusctl: target/$(TARGET)/$(BIN_C)
+	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)"
+
+install-asusd_user: target/$(TARGET)/$(BIN_U)
 	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_U)" "$(DESTDIR)$(bindir)/$(BIN_U)"
 
-install-data:
+install-rog_gui: target/$(TARGET)/$(BIN_ROG)
+	$(INSTALL_PROGRAM) "./target/$(TARGET)/$(BIN_ROG)" "$(DESTDIR)$(bindir)/$(BIN_ROG)"
+
+.PHONY: install-asusd install-asusctl install-asusd_user install-rog_gui
+
+install-program: install-asusd install-asusctl install-asusd_user install-rog_gui
+
+install-data-rog_gui:
 	$(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).desktop" "$(DESTDIR)$(datarootdir)/applications/$(BIN_ROG).desktop"
 	$(INSTALL_DATA) "./rog-control-center/data/$(BIN_ROG).png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/$(BIN_ROG).png"
-	cd rog-aura/data/layouts && find . -type f -name "*.ron" -exec $(INSTALL_DATA) "{}" "$(DESTDIR)$(datarootdir)/rog-gui/layouts/{}" \;
-
-	$(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
-	$(INSTALL_DATA) "./rog-aura/data/$(LEDCFG)" "$(DESTDIR)$(datarootdir)/asusd/$(LEDCFG)"
-	$(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
-
-	$(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
-	$(INSTALL_DATA) "./data/$(BIN_U).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_U).service"
+	cd rog-aura/data/layouts && find . -type f -name "*.ron" -exec $(INSTALL_DATA) "{}" "$(DESTDIR_REALPATH)$(datarootdir)/rog-gui/layouts/{}" \;
 
 	$(INSTALL_DATA) "./data/icons/asus_notif_yellow.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_yellow.png"
 	$(INSTALL_DATA) "./data/icons/asus_notif_green.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_green.png"
@@ -81,9 +106,24 @@ install-data:
 	$(INSTALL_DATA) "./data/icons/scalable/gpu-vfio.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/status/gpu-vfio.svg"
 	$(INSTALL_DATA) "./data/icons/scalable/notification-reboot.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/status/notification-reboot.svg"
 
-	cd rog-anime/data && find "./anime" -type f -exec $(INSTALL_DATA) "{}" "$(DESTDIR)$(datarootdir)/asusd/{}" \;
+install-data-asusd:
+	$(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
+	$(INSTALL_DATA) "./rog-aura/data/$(LEDCFG)" "$(DESTDIR)$(datarootdir)/asusd/$(LEDCFG)"
+	$(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
+
+	$(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
+
+	cd rog-anime/data && find "./anime" -type f -exec $(INSTALL_DATA) "{}" "$(DESTDIR_REALPATH)$(datarootdir)/asusd/{}" \;
+
+install-data-asusd_user:
+	$(INSTALL_DATA) "./data/$(BIN_U).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_U).service"
+
+.PHONY: install-data-asusd install-data-asusd_user
+
+install-data: install-data-asusd install-data-asusd_user install-data-rog_gui
 
 install: install-program install-data
+	$(INSTALL_DATA) "./LICENSE" "$(DESTDIR)$(datarootdir)/asusctl/LICENSE"
 
 uninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_ROG)"
@@ -118,16 +158,12 @@ vendor:
 	mv .cargo/config ./cargo-config
 	rm -rf .cargo
 	rm -rf vendor
+	# Ensure cargo-vendor-filterer is installed (CI installs it already)
+	command -v cargo-vendor-filterer >/dev/null 2>&1 || cargo install --locked cargo-vendor-filterer
 	cargo vendor-filterer --all-features --platform x86_64-unknown-linux-gnu vendor
 	tar pcfJ vendor_asusctl_$(VERSION).tar.xz vendor
 	rm -rf vendor
 
-bindings:
-	typeshare ./rog-anime/src/ --lang=typescript --output-file=bindings/ts/anime.ts
-	typeshare ./rog-aura/src/ --lang=typescript --output-file=bindings/ts/aura.ts
-	typeshare ./rog-profiles/src/ --lang=typescript --output-file=bindings/ts/profiles.ts
-	typeshare ./rog-platform/src/ --lang=typescript --output-file=bindings/ts/platform.ts
-
 translate:
 	find -name \*.slint | xargs slint-tr-extractor -o rog-control-center/translations/en/rog-control-center.po
 

README.md

@@ -1,6 +1,6 @@
 # `asusctl` for ASUS ROG
 
-[Become a Patron!](https://www.patreon.com/bePatron?u=7602281) - [Asus Linux Website](https://asus-linux.org/)
+[![Become a Patron!](https://github.com/codebard/patron-button-and-widgets-by-codebard/blob/master/images/become_a_patron_button.png?raw=true)](https://www.patreon.com/bePatron?u=7602281) [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/V7V5CLU67) - [Asus Linux Website](https://asus-linux.org/)
 
 **WARNING:** Many features are developed in tandem with kernel patches. If you see a feature is missing you either need a patched kernel or latest release.
 
@@ -11,9 +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/). This is especially required for 2023+ devices and possibly some late 2022 devices.
+Due to on-going driver work the minimum suggested kernel version is always **the latest*, as improvements and fixes are continuous.
 
-Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t)
+Support for TDP is tied to the new asus-armoury driver: available mainline since linux 6.19: everything older is not supported.
 
 ## X11 support
 
@@ -37,20 +37,20 @@ See the [rog-aura readme](./rog-aura/README.md) for more details.
 
 ## Discord
 
-[![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/z8y99XqPb7)
+[![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/B8GftRW2Hd)
 
 ## SUPPORTED LAPTOPS
 
 Most ASUS gaming laptops that have a USB keyboard. If `lsusb` shows something similar
 to this:
 
-```
+```plain
 Bus 001 Device 002: ID 0b05:1866 ASUSTek Computer, Inc. N-KEY Device
 ```
 
 or
 
-```
+```plain
 Bus 003 Device 002: ID 0b05:19b6 ASUSTek Computer, Inc. [unknown]
 ```
 
@@ -72,43 +72,56 @@ The list is a bit outdated as many features have been enabled in the Linux kerne
 - [x] Toggle bios setting for boot/POST sound
 - [x] Toggle GPU MUX (g-sync, or called MUX on 2022+ laptops)
 
-# GUI
+## GUI
 
 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
+## 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.
+Rust and cargo are required, they can be installed from [rustup.rs](https://rustup.rs/).
+
+Distro packaging should work with the stable toolchain. If your distro does not provide a recent Rust toolchain, install rustup and use the stable toolchain.
 
 **fedora:**
 
-    dnf install cmake clang-devel  libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
-    make
-    sudo make install
+```sh
+dnf install cmake clang-devel  libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
+make
+sudo make install
+```
 
 **openSUSE:**
 
 Works with KDE Plasma (without GTK packages)
 
-    zypper in -t pattern devel_basis
-    zypper in rustup make cmake clang-devel libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
-    make
-    sudo make install
+```sh
+zypper in -t pattern devel_basis
+zypper in rustup make cmake clang-devel libxkbcommon-devel systemd-devel expat-devel pcre2-devel libzstd-devel gtk3-devel
+make
+sudo make install
+```
 
 **Debian(unsuported):**
 
 officially unsuported,but you can still try and test it by yourself(some features may not be available).
 
-    sudo apt install libclang-dev libudev-dev libfontconfig-dev build-essential cmake libxkbcommon-dev
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-    make
-    sudo make install
+```sh
+sudo apt install libclang-dev libudev-dev libfontconfig-dev build-essential cmake libxkbcommon-dev
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+make
+sudo make install
+```
 
 **Ubuntu, Popos (unsuported):**
 
-instructions removed as outdated
+```sh
+sudo apt install make cargo gcc pkg-config openssl libasound2-dev cmake build-essential python3 libfreetype6-dev libexpat1-dev libxcb-composite0-dev libssl-dev libx11-dev libfontconfig1-dev curl libclang-dev libudev-dev checkinstall libseat-dev libinput-dev libxkbcommon-dev libgbm-dev
+
+make
+sudo make install
+```
 
 ## Installing
 
@@ -126,15 +139,15 @@ You may also need to activate the service for debian install. If running Pop!\_O
 
 If you are upgrading from a previous installed version, you will need to restart the service or reboot.
 
-```
-$ systemctl daemon-reload && systemctl restart asusd
+```sh
+systemctl daemon-reload && systemctl restart asusd
 ```
 
 ## Uninstalling
 
 Run `sudo make uninstall` in the source repo, and remove `/etc/asusd/`.
 
-# Contributing
+## Contributing
 
 See `CONTRIBUTING.md`. Additionally, also do `cargo clean` and `cargo test` on first checkout to ensure the commit hooks are used (via `cargo-husky`).
 
@@ -142,17 +155,17 @@ Generation of the bindings with `make bindings` requires `typeshare` to be insta
 
 Dbus introsepction XML requires with `make introspection` requires `anime_sim` to be running before starting `asusd`.
 
-# OTHER
+## OTHER
 
-## AniMe Matrix simulator
+### AniMe Matrix simulator
 
 A simulator using SDL2 can be built using `cargo build --package rog_simulators` and run with `./target/debug/anime_sim`. Once started `asusd` will need restarting to pick it up. If running this sim on a laptop _with_ the display, the simulated display will be used instead of the physical display.
 
-## Supporting more laptops
+### Supporting more laptops
 
 Please file a support request.
 
-# License & Trademarks
+## License & Trademarks
 
 Mozilla Public License 2 (MPL-2.0)
 
@@ -165,3 +178,7 @@ Reference to any ASUS products, services, processes, or other information and/or
 The use of ROG and ASUS trademarks within this website and associated tools and libraries is only to provide a recognisable identifier to users to enable them to associate that these tools will work with ASUS ROG laptops.
 
 ---
+
+## AI Disaclaimer
+
+Portions of this code have been written by various AI tools and reviewed by the maintainer exaclty as with every other contribution.

asusctl/Cargo.toml

@@ -18,10 +18,25 @@ rog_profiles = { path = "../rog-profiles" }
 rog_platform = { path = "../rog-platform" }
 dmi_id = { path = "../dmi-id" }
 
+log.workspace = true
+env_logger.workspace = true
+
 ron.workspace = true
 gumdrop.workspace = true
 zbus.workspace = true
+argh = "0.1"
 
 [dev-dependencies]
 rog_dbus = { path = "../rog-dbus" }
 
+[package.metadata.deb]
+license-file = ["../LICENSE", "4"]
+extended-description = """\
+An utility for Linux to control many aspects of various ASUS laptops
+but can also be used with non-asus laptops with reduced features."""
+depends = "$auto"
+section = "utility"
+priority = "optional"
+assets = [
+  ["target/release/asusctl", "usr/bin/", "755"],
+]

asusctl/src/anime_cli.rs

@@ -1,154 +1,151 @@
-use gumdrop::Options;
-use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping, Brightness};
+use argh::FromArgs;
+use rog_anime::usb::{AnimAwake, AnimBooting, AnimShutdown, AnimSleeping};
 use rog_anime::AnimeType;
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "anime", description = "anime commands")]
 pub struct AnimeCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "override the display type")]
+    #[argh(option, description = "override the display type")]
     pub override_type: Option<AnimeType>,
-    #[options(meta = "", help = "enable/disable the display")]
+    #[argh(option, description = "enable/disable the display")]
     pub enable_display: Option<bool>,
-    #[options(meta = "", help = "enable/disable the builtin run/powersave animation")]
-    pub enable_powersave_anim: Option<bool>,
-    #[options(
-        meta = "",
-        help = "set global base brightness value <Off, Low, Med, High>"
+    #[argh(
+        option,
+        description = "enable/disable the builtin run/powersave animation"
     )]
-    pub brightness: Option<Brightness>,
-    #[options(help = "clear the display")]
+    pub enable_powersave_anim: Option<bool>,
+    #[argh(
+        option,
+        description = "set global base brightness value <off, low, med, high>"
+    )]
+    pub brightness: Option<rog_anime::usb::Brightness>,
+    #[argh(switch, description = "clear the display")]
     pub clear: bool,
-    #[options(
-        no_short,
-        meta = "",
-        help = "turn the anime off when external power is unplugged"
+    #[argh(
+        option,
+        description = "turn the anime off when external power is unplugged"
     )]
     pub off_when_unplugged: Option<bool>,
-    #[options(
-        no_short,
-        meta = "",
-        help = "turn the anime off when the laptop suspends"
-    )]
+    #[argh(option, description = "turn the anime off when the laptop suspends")]
     pub off_when_suspended: Option<bool>,
-    #[options(
-        no_short,
-        meta = "",
-        help = "turn the anime off when the lid is closed"
-    )]
+    #[argh(option, description = "turn the anime off when the lid is closed")]
     pub off_when_lid_closed: Option<bool>,
-    #[options(no_short, meta = "", help = "Off with his head!!!")]
+    #[argh(option, description = "off with his head!!!")]
     pub off_with_his_head: Option<bool>,
-    #[options(command)]
+    #[argh(subcommand)]
     pub command: Option<AnimeActions>,
 }
 
-#[derive(Options)]
+/// Anime subcommands (image, gif, builtins, etc.)
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum AnimeActions {
-    #[options(help = "display a PNG image")]
     Image(AnimeImage),
-    #[options(help = "display a diagonal/pixel-perfect PNG")]
     PixelImage(AnimeImageDiagonal),
-    #[options(help = "display an animated GIF")]
     Gif(AnimeGif),
-    #[options(help = "display an animated diagonal/pixel-perfect GIF")]
     PixelGif(AnimeGifDiagonal),
-    #[options(help = "change which builtin animations are shown")]
     SetBuiltins(Builtins),
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "set-builtins",
+    description = "change which builtin animations are shown"
+)]
 pub struct Builtins {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:GlitchConstruction, StaticEmergence>"
     )]
     pub boot: AnimBooting,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:BinaryBannerScroll, RogLogoGlitch>"
     )]
     pub awake: AnimAwake,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:BannerSwipe, Starfield>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:BannerSwipe, Starfield>"
     )]
     pub sleep: AnimSleeping,
-    #[options(
-        meta = "",
-        help = "Default is used if unspecified, <default:GlitchOut, SeeYa>"
+    #[argh(
+        option,
+        description = "default is used if unspecified, <default:GlitchOut, SeeYa>"
     )]
     pub shutdown: AnimShutdown,
-    #[options(meta = "", help = "set/apply the animations <true/false>")]
+    #[argh(option, description = "set/apply the animations <true/false>")]
     pub set: Option<bool>,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "image", description = "display a PNG image")]
 pub struct AnimeImage {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the png to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
+    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
     pub scale: f32,
-    #[options(meta = "", default = "0.0", help = "x position (float)")]
+    #[argh(option, default = "0.0", description = "x position (float)")]
     pub x_pos: f32,
-    #[options(meta = "", default = "0.0", help = "y position (float)")]
+    #[argh(option, default = "0.0", description = "y position (float)")]
     pub y_pos: f32,
-    #[options(meta = "", default = "0.0", help = "the angle in radians")]
+    #[argh(option, default = "0.0", description = "the angle in radians")]
     pub angle: f32,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "pixel-image",
+    description = "display a diagonal/pixel-perfect PNG"
+)]
 pub struct AnimeImageDiagonal {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the png to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "gif", description = "display an animated GIF")]
 pub struct AnimeGif {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the gif to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
+    #[argh(option, default = "1.0", description = "scale 1.0 == normal")]
     pub scale: f32,
-    #[options(meta = "", default = "0.0", help = "x position (float)")]
+    #[argh(option, default = "0.0", description = "x position (float)")]
     pub x_pos: f32,
-    #[options(meta = "", default = "0.0", help = "y position (float)")]
+    #[argh(option, default = "0.0", description = "y position (float)")]
     pub y_pos: f32,
-    #[options(meta = "", default = "0.0", help = "the angle in radians")]
+    #[argh(option, default = "0.0", description = "the angle in radians")]
     pub angle: f32,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
-    #[options(
-        meta = "",
+    #[argh(
+        option,
         default = "1",
-        help = "how many loops to play - 0 is infinite"
+        description = "how many loops to play - 0 is infinite"
     )]
     pub loops: u32,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "pixel-gif",
+    description = "display an animated diagonal/pixel-perfect GIF"
+)]
 pub struct AnimeGifDiagonal {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "full path to the png to display")]
+    #[argh(option, description = "full path to the gif to display")]
     pub path: String,
-    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    #[argh(option, default = "1.0", description = "brightness 0.0-1.0")]
     pub bright: f32,
-    #[options(
-        meta = "",
+    #[argh(
+        option,
         default = "1",
-        help = "how many loops to play - 0 is infinite"
+        description = "how many loops to play - 0 is infinite"
     )]
     pub loops: u32,
 }

asusctl/src/aura_cli.rs

@@ -1,68 +1,67 @@
+use std::fmt;
 use std::str::FromStr;
 
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_aura::error::Error;
 use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed};
 
-#[derive(Options, Debug)]
+#[derive(FromArgs, Debug, Clone)]
+#[argh(
+    subcommand,
+    name = "aura-power-old",
+    description = "aura power (old ROGs and TUF laptops)"
+)]
 pub struct LedPowerCommand1 {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(meta = "", help = "Control if LEDs enabled while awake <true/false>")]
+    #[argh(
+        option,
+        description = "control if LEDs enabled while awake <true/false>"
+    )]
     pub awake: Option<bool>,
-    #[options(help = "Use with awake option, if excluded defaults to false")]
+
+    #[argh(
+        switch,
+        description = "use with awake option; if excluded defaults to false"
+    )]
     pub keyboard: bool,
-    #[options(help = "Use with awake option, if excluded defaults to false")]
+
+    #[argh(
+        switch,
+        description = "use with awake option; if excluded defaults to false"
+    )]
     pub lightbar: bool,
-    #[options(meta = "", help = "Control boot animations <true/false>")]
+
+    #[argh(option, description = "control boot animations <true/false>")]
     pub boot: Option<bool>,
-    #[options(meta = "", help = "Control suspend animations <true/false>")]
+
+    #[argh(option, description = "control suspend animations <true/false>")]
     pub sleep: Option<bool>,
 }
 
-#[derive(Options, Debug)]
+#[derive(FromArgs, Debug, Clone)]
+#[argh(subcommand, name = "aura-power", description = "aura power")]
 pub struct LedPowerCommand2 {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(command)]
+    #[argh(subcommand)]
     pub command: Option<SetAuraZoneEnabled>,
 }
 
-#[derive(Options, Debug)]
+/// Subcommands to enable/disable specific aura zones
+#[derive(FromArgs, Debug, Clone)]
+#[argh(subcommand)]
 pub enum SetAuraZoneEnabled {
-    /// Applies to both old and new models
-    #[options(help = "")]
-    Keyboard(AuraPowerStates),
-    #[options(help = "")]
-    Logo(AuraPowerStates),
-    #[options(help = "")]
-    Lightbar(AuraPowerStates),
-    #[options(help = "")]
-    Lid(AuraPowerStates),
-    #[options(help = "")]
-    RearGlow(AuraPowerStates),
-    #[options(help = "")]
-    Ally(AuraPowerStates),
+    Keyboard(KeyboardPower),
+    Logo(LogoPower),
+    Lightbar(LightbarPower),
+    Lid(LidPower),
+    RearGlow(RearGlowPower),
+    Ally(AllyPower),
 }
 
-#[derive(Debug, Clone, Options)]
-pub struct AuraPowerStates {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub boot: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub awake: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub sleep: bool,
-    #[options(help = "defaults to false if option unused")]
-    pub shutdown: bool,
-}
-
-#[derive(Options)]
+/// Keyboard brightness argument helper
+#[derive(Debug, Clone)]
 pub struct LedBrightness {
     level: Option<u8>,
 }
+
 impl LedBrightness {
     pub fn new(level: Option<u8>) -> Self {
         LedBrightness { level }
@@ -72,174 +71,302 @@ impl LedBrightness {
         self.level
     }
 }
+
 impl FromStr for LedBrightness {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let s = s.to_lowercase();
         match s.as_str() {
-            "off" => Ok(LedBrightness { level: Some(0x00) }),
-            "low" => Ok(LedBrightness { level: Some(0x01) }),
-            "med" => Ok(LedBrightness { level: Some(0x02) }),
-            "high" => Ok(LedBrightness { level: Some(0x03) }),
-            _ => {
-                print!("Invalid argument, must be one of: off, low, med, high");
-                Err(Error::ParseBrightness)
-            }
+            "off" => Ok(Self::new(Some(0x00))),
+            "low" => Ok(Self::new(Some(0x01))),
+            "med" => Ok(Self::new(Some(0x02))),
+            "high" => Ok(Self::new(Some(0x03))),
+            _ => Err(Error::ParseBrightness),
         }
     }
 }
-#[allow(clippy::to_string_trait_impl)]
-impl ToString for LedBrightness {
-    fn to_string(&self) -> String {
+
+impl fmt::Display for LedBrightness {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let s = match self.level {
-            Some(0x00) => "low",
-            Some(0x01) => "med",
-            Some(0x02) => "high",
+            Some(0x00) => "off",
+            Some(0x01) => "low",
+            Some(0x02) => "med",
+            Some(0x03) => "high",
             _ => "unknown",
         };
-        s.to_owned()
+        write!(f, "{}", s)
     }
 }
 
-#[derive(Debug, Clone, Options, Default)]
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "keyboard",
+    description = "set power states for keyboard zone"
+)]
+pub struct KeyboardPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "logo",
+    description = "set power states for logo zone"
+)]
+pub struct LogoPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "lightbar",
+    description = "set power states for lightbar zone"
+)]
+pub struct LightbarPower {
+    #[argh(switch, description = "enable power while device is booting")]
+    pub boot: bool,
+    #[argh(switch, description = "enable power while device is awake")]
+    pub awake: bool,
+    #[argh(switch, description = "enable power while device is sleeping")]
+    pub sleep: bool,
+    #[argh(
+        switch,
+        description = "enable power while device is shutting down or hibernating"
+    )]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "lid",
+    description = "set power states for lid zone"
+)]
+pub struct LidPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rear-glow",
+    description = "set power states for rear glow zone"
+)]
+pub struct RearGlowPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "ally",
+    description = "set power states for ally zone"
+)]
+pub struct AllyPower {
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub boot: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub awake: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub sleep: bool,
+    #[argh(switch, description = "defaults to false if option unused")]
+    pub shutdown: bool,
+}
+
+/// Single speed-based effect
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rainbow-cycle",
+    description = "single speed-based effect"
+)]
 pub struct SingleSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "WORD", help = "set the speed: low, med, high")]
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Options, Default)]
+/// Single speed effect with direction
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "rainbow-wave",
+    description = "single speed effect with direction"
+)]
 pub struct SingleSpeedDirection {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the direction: up, down, left, right")]
+    #[argh(option, description = "set the direction: up, down, left, right")]
     pub direction: Direction,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Static single-colour effect
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "static",
+    description = "static single-colour effect"
+)]
 pub struct SingleColour {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour: Colour,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Single-colour effect with speed
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "highlight",
+    description = "single-colour effect with speed"
+)]
 pub struct SingleColourSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour: Colour,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Options, Default)]
+/// Two-colour breathing effect
+#[derive(FromArgs, Debug, Clone, Default)]
+#[argh(
+    subcommand,
+    name = "breathe",
+    description = "two-colour breathing effect"
+)]
 pub struct TwoColourSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(no_long, meta = "", help = "set the first RGB value e.g, ff00ff")]
+    #[argh(option, description = "set the first RGB value e.g. ff00ff")]
     pub colour: Colour,
-    #[options(no_long, meta = "", help = "set the second RGB value e.g, ff00ff")]
+
+    #[argh(option, description = "set the second RGB value e.g. ff00ff")]
     pub colour2: Colour,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
-    #[options(
-        no_long,
-        meta = "",
-        help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
+
+    #[argh(
+        option,
+        default = "AuraZone::None",
+        description = "set the zone for this effect e.g. 0, 1, one, logo, lightbar-left"
     )]
     pub zone: AuraZone,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Multi-zone colour settings
+#[derive(FromArgs, Debug, Clone, Default)]
+#[allow(dead_code)]
+#[argh(description = "multi-zone colour settings")]
 pub struct MultiZone {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
     pub colour1: Colour,
-    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
     pub colour2: Colour,
-    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour3: Colour,
-    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
     pub colour4: Colour,
 }
 
-#[derive(Debug, Clone, Default, Options)]
+/// Multi-colour with speed
+#[derive(FromArgs, Debug, Clone, Default)]
+#[allow(dead_code)]
+#[argh(description = "multi-colour with speed")]
 pub struct MultiColourSpeed {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(short = "a", meta = "", help = "set the RGB value e.g, ff00ff")]
+    #[argh(option, short = 'a', description = "set the RGB value e.g. ff00ff")]
     pub colour1: Colour,
-    #[options(short = "b", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'b', description = "set the RGB value e.g. ff00ff")]
     pub colour2: Colour,
-    #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'c', description = "set the RGB value e.g. ff00ff")]
     pub colour3: Colour,
-    #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
+
+    #[argh(option, short = 'd', description = "set the RGB value e.g. ff00ff")]
     pub colour4: Colour,
-    #[options(no_long, meta = "", help = "set the speed: low, med, high")]
+
+    #[argh(option, description = "set the speed: low, med, high")]
     pub speed: Speed,
 }
 
-/// Byte value for setting the built-in mode.
-///
-/// Enum corresponds to the required integer value
-// NOTE: The option names here must match those in rog-aura crate
-#[derive(Options)]
+/// Builtin aura effects
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum SetAuraBuiltin {
-    #[options(help = "set a single static colour")]
-    Static(SingleColour), // 0
-    #[options(help = "pulse between one or two colours")]
-    Breathe(TwoColourSpeed), // 1
-    #[options(help = "strobe through all colours")]
-    RainbowCycle(SingleSpeed), // 2
-    #[options(help = "rainbow cycling in one of four directions")]
+    Static(SingleColour),              // 0
+    Breathe(TwoColourSpeed),           // 1
+    RainbowCycle(SingleSpeed),         // 2
     RainbowWave(SingleSpeedDirection), // 3
-    #[options(help = "rain pattern mimicking raindrops")]
-    Stars(TwoColourSpeed), // 4
-    #[options(help = "rain pattern of three preset colours")]
-    Rain(SingleSpeed), // 5
-    #[options(help = "pressed keys are highlighted to fade")]
-    Highlight(SingleColourSpeed), // 6
-    #[options(help = "pressed keys generate horizontal laser")]
-    Laser(SingleColourSpeed), // 7
-    #[options(help = "pressed keys ripple outwards like a splash")]
-    Ripple(SingleColourSpeed), // 8
-    #[options(help = "set a rapid pulse")]
-    Pulse(SingleColour), // 10
-    #[options(help = "set a vertical line zooming from left")]
-    Comet(SingleColour), // 11
-    #[options(help = "set a wide vertical line zooming from left")]
-    Flash(SingleColour), // 12
+    Stars(TwoColourSpeed),             // 4
+    Rain(SingleSpeed),                 // 5
+    Highlight(SingleColourSpeed),      // 6
+    Laser(SingleColourSpeed),          // 7
+    Ripple(SingleColourSpeed),         // 8
+    Pulse(SingleColour),               // 10
+    Comet(SingleColour),               // 11
+    Flash(SingleColour),               // 12
 }
 
 impl Default for SetAuraBuiltin {

asusctl/src/cli_opts.rs

@@ -1,5 +1,5 @@
-use gumdrop::Options;
-use rog_platform::platform::ThrottlePolicy;
+use argh::FromArgs;
+use rog_platform::platform::PlatformProfile;
 
 use crate::anime_cli::AnimeCommand;
 use crate::aura_cli::{LedBrightness, LedPowerCommand1, LedPowerCommand2, SetAuraBuiltin};
@@ -7,117 +7,308 @@ use crate::fan_curve_cli::FanCurveCommand;
 use crate::scsi_cli::ScsiCommand;
 use crate::slash_cli::SlashCommand;
 
-#[derive(Default, Options)]
+#[derive(FromArgs, Default, Debug)]
+/// asusctl command-line options
 pub struct CliStart {
-    #[options(help_flag, help = "print help message")]
-    pub help: bool,
-    #[options(help = "show program version number")]
-    pub version: bool,
-    #[options(help = "show supported functions of this laptop")]
-    pub show_supported: bool,
-    #[options(meta = "", help = "<off, low, med, high>")]
-    pub kbd_bright: Option<LedBrightness>,
-    #[options(help = "Toggle to next keyboard brightness")]
-    pub next_kbd_bright: bool,
-    #[options(help = "Toggle to previous keyboard brightness")]
-    pub prev_kbd_bright: bool,
-    #[options(meta = "", help = "Set your battery charge limit <20-100>")]
-    pub chg_limit: Option<u8>,
-    #[options(help = "Toggle one-shot battery charge to 100%")]
-    pub one_shot_chg: bool,
-    #[options(command)]
-    pub command: Option<CliCommand>,
+    #[argh(subcommand)]
+    pub command: CliCommand,
 }
 
-#[derive(Options)]
+/// Top-level subcommands for asusctl
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
 pub enum CliCommand {
-    #[options(help = "Set the keyboard lighting from built-in modes")]
     Aura(LedModeCommand),
-    #[options(help = "Set the LED power states")]
     AuraPowerOld(LedPowerCommand1),
-    #[options(help = "Set the LED power states")]
     AuraPower(LedPowerCommand2),
-    #[options(help = "Set or select platform_profile")]
+    Brightness(BrightnessCommand),
     Profile(ProfileCommand),
-    #[options(help = "Set, select, or modify fan curves if supported")]
     FanCurve(FanCurveCommand),
-    #[options(help = "Set the graphics mode (obsoleted by supergfxctl)")]
-    Graphics(GraphicsCommand),
-    #[options(name = "anime", help = "Manage AniMe Matrix")]
     Anime(AnimeCommand),
-    #[options(name = "slash", help = "Manage Slash Ledbar")]
     Slash(SlashCommand),
-    #[options(name = "scsi", help = "Manage SCSI external drive")]
     Scsi(ScsiCommand),
-    #[options(help = "Change bios settings")]
-    Platform(PlatformCommand),
+    Armoury(ArmouryCommand),
+    Backlight(BacklightCommand),
+    Battery(BatteryCommand),
+    Info(InfoCommand),
 }
 
-#[derive(Debug, Clone, Options)]
+impl Default for CliCommand {
+    fn default() -> Self {
+        CliCommand::Info(InfoCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "profile", description = "profile management")]
 pub struct ProfileCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-
-    #[options(help = "toggle to next profile in list")]
-    pub next: bool,
-
-    #[options(help = "list available profiles")]
-    pub list: bool,
-
-    #[options(help = "get profile")]
-    pub profile_get: bool,
-
-    #[options(meta = "", help = "set the active profile")]
-    pub profile_set: Option<ThrottlePolicy>,
+    #[argh(subcommand)]
+    pub command: ProfileSubCommand,
 }
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum ProfileSubCommand {
+    Next(ProfileNextCommand),
+    List(ProfileListCommand),
+    Get(ProfileGetCommand),
+    Set(ProfileSetCommand),
+}
+
+impl Default for ProfileSubCommand {
+    fn default() -> Self {
+        ProfileSubCommand::List(ProfileListCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "next",
+    description = "toggle to next profile in list"
+)]
+pub struct ProfileNextCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "list", description = "list available profiles")]
+pub struct ProfileListCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "get", description = "get profile")]
+pub struct ProfileGetCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "set", description = "set profile")]
+pub struct ProfileSetCommand {
+    #[argh(positional, description = "profile to set")]
+    pub profile: PlatformProfile,
+
+    #[argh(
+        switch,
+        short = 'a',
+        description = "set the profile to use on AC power"
+    )]
+    pub ac: bool,
+
+    #[argh(
+        switch,
+        short = 'b',
+        description = "set the profile to use on battery power"
+    )]
+    pub battery: bool,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "aura", description = "led mode commands")]
 pub struct LedModeCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(help = "switch to next aura mode")]
+    #[argh(switch, description = "switch to next aura mode")]
     pub next_mode: bool,
-    #[options(help = "switch to previous aura mode")]
+
+    #[argh(switch, description = "switch to previous aura mode")]
     pub prev_mode: bool,
-    #[options(command)]
+
+    #[argh(subcommand)]
     pub command: Option<SetAuraBuiltin>,
 }
 
-#[derive(Options)]
-pub struct GraphicsCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "armoury",
+    description = "armoury / firmware attributes"
+)]
+pub struct ArmouryCommand {
+    #[argh(subcommand)]
+    pub command: ArmourySubCommand,
 }
 
-#[derive(Options, Debug)]
-pub struct PlatformCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(
-        meta = "",
-        short = "S",
-        no_long,
-        help = "set bios POST sound: asusctl -S <true/false>"
-    )]
-    pub post_sound_set: Option<bool>,
-    #[options(no_long, short = "s", help = "read bios POST sound")]
-    pub post_sound_get: bool,
-    #[options(
-        meta = "",
-        short = "D",
-        no_long,
-        help = "Switch GPU MUX mode: 0 = Discrete, 1 = Optimus, reboot required"
-    )]
-    pub gpu_mux_mode_set: Option<u8>,
-    #[options(no_long, short = "d", help = "get GPU mode")]
-    pub gpu_mux_mode_get: bool,
-    #[options(
-        meta = "",
-        short = "O",
-        no_long,
-        help = "Set device panel overdrive <true/false>"
-    )]
-    pub panel_overdrive_set: Option<bool>,
-    #[options(no_long, short = "o", help = "get panel overdrive")]
-    pub panel_overdrive_get: bool,
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum ArmourySubCommand {
+    Set(ArmouryPropertySetCommand),
+    Get(ArmouryPropertyGetCommand),
+    List(ArmouryPropertyListCommand),
 }
+
+impl Default for ArmourySubCommand {
+    fn default() -> Self {
+        ArmourySubCommand::List(ArmouryPropertyListCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "set",
+    description = "set an asus-armoury firmware-attribute"
+)]
+pub struct ArmouryPropertySetCommand {
+    #[argh(
+        positional,
+        description = "name of the attribute to set (see asus-armoury list for available properties)"
+    )]
+    pub property: String,
+
+    #[argh(positional, description = "value to set for the given attribute")]
+    pub value: i32,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "list",
+    description = "list all firmware-attributes supported by asus-armoury"
+)]
+pub struct ArmouryPropertyListCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "get",
+    description = "get a firmware-attribute from asus-armoury"
+)]
+pub struct ArmouryPropertyGetCommand {
+    #[argh(
+        positional,
+        description = "name of the property to get (see asus-armoury list for available properties)"
+    )]
+    pub property: String,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(subcommand, name = "backlight", description = "backlight options")]
+pub struct BacklightCommand {
+    #[argh(option, description = "set screen brightness <0-100>")]
+    pub screenpad_brightness: Option<i32>,
+
+    #[argh(
+        option,
+        description = "set screenpad gamma brightness 0.5 - 2.2, 1.0 == linear"
+    )]
+    pub screenpad_gamma: Option<f32>,
+
+    #[argh(
+        option,
+        description = "set screenpad brightness to sync with primary display"
+    )]
+    pub sync_screenpad_brightness: Option<bool>,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "battery", description = "battery options")]
+pub struct BatteryCommand {
+    #[argh(subcommand)]
+    pub command: BatterySubCommand,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum BatterySubCommand {
+    Limit(BatteryLimitCommand),
+    OneShot(BatteryOneShotCommand),
+    Info(BatteryInfoCommand),
+}
+
+impl Default for BatterySubCommand {
+    fn default() -> Self {
+        BatterySubCommand::OneShot(BatteryOneShotCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "limit",
+    description = "set battery charge limit <20-100>"
+)]
+pub struct BatteryLimitCommand {
+    #[argh(positional, description = "charge limit percentage 20-100")]
+    pub limit: u8,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "oneshot",
+    description = "one-shot full charge (optional percent)"
+)]
+pub struct BatteryOneShotCommand {
+    #[argh(positional, description = "optional target percent (defaults to 100)")]
+    pub percent: Option<u8>,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "info",
+    description = "show current battery charge limit"
+)]
+pub struct BatteryInfoCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "info",
+    description = "show program version and system info"
+)]
+pub struct InfoCommand {
+    #[argh(switch, description = "show supported functions of this laptop")]
+    pub show_supported: bool,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "leds", description = "keyboard brightness control")]
+pub struct BrightnessCommand {
+    #[argh(subcommand)]
+    pub command: BrightnessSubCommand,
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(subcommand)]
+pub enum BrightnessSubCommand {
+    Set(BrightnessSetCommand),
+    Get(BrightnessGetCommand),
+    Next(BrightnessNextCommand),
+    Prev(BrightnessPrevCommand),
+}
+
+impl Default for BrightnessSubCommand {
+    fn default() -> Self {
+        BrightnessSubCommand::Get(BrightnessGetCommand::default())
+    }
+}
+
+#[derive(FromArgs, Debug)]
+#[argh(
+    subcommand,
+    name = "set",
+    description = "set keyboard brightness <off, low, med, high>"
+)]
+pub struct BrightnessSetCommand {
+    #[argh(positional, description = "brightness level: off, low, med, high")]
+    pub level: LedBrightness,
+}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "get",
+    description = "get current keyboard brightness"
+)]
+pub struct BrightnessGetCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "next",
+    description = "toggle to next keyboard brightness"
+)]
+pub struct BrightnessNextCommand {}
+
+#[derive(FromArgs, Debug, Default)]
+#[argh(
+    subcommand,
+    name = "prev",
+    description = "toggle to previous keyboard brightness"
+)]
+pub struct BrightnessPrevCommand {}

asusctl/src/fan_curve_cli.rs

@@ -1,49 +1,44 @@
-use gumdrop::Options;
-use rog_platform::platform::ThrottlePolicy;
+use argh::FromArgs;
+use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use rog_profiles::FanCurvePU;
 
-#[derive(Debug, Clone, Options)]
+#[derive(FromArgs, Debug, Clone)]
+#[argh(subcommand, name = "fan-curve", description = "fan curve commands")]
 pub struct FanCurveCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-
-    #[options(help = "get enabled fan profiles")]
+    #[argh(switch, description = "get enabled fan profiles")]
     pub get_enabled: bool,
 
-    #[options(help = "set the active profile's fan curve to default")]
+    #[argh(switch, description = "set the active profile's fan curve to default")]
     pub default: bool,
 
-    #[options(
-        meta = "",
-        help = "profile to modify fan-curve for. Shows data if no options provided"
+    #[argh(
+        option,
+        description = "profile to modify fan-curve for. shows data if no options provided"
     )]
-    pub mod_profile: Option<ThrottlePolicy>,
+    pub mod_profile: Option<PlatformProfile>,
 
-    #[options(
-        meta = "",
-        help = "enable or disable <true/false> fan all curves for a profile. `--mod_profile` \
-                required"
+    #[argh(
+        option,
+        description = "enable or disable <true/false> fan all curves for a profile; --mod_profile required"
     )]
     pub enable_fan_curves: Option<bool>,
 
-    #[options(
-        meta = "",
-        help = "enable or disable <true/false> a single fan curve for a profile. `--mod_profile` \
-                and `--fan` required"
+    #[argh(
+        option,
+        description = "enable or disable <true/false> a single fan curve for a profile; --mod_profile and --fan required"
     )]
     pub enable_fan_curve: Option<bool>,
 
-    #[options(
-        meta = "",
-        help = "select fan <cpu/gpu/mid> to modify. `--mod_profile` required"
+    #[argh(
+        option,
+        description = "select fan <cpu/gpu/mid> to modify; --mod_profile required"
     )]
     pub fan: Option<FanCurvePU>,
 
-    #[options(
-        meta = "",
-        help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%. \
-                `--mod-profile` required. If '%' is omitted the fan range is 0-255"
+    #[argh(
+        option,
+        description = "data format = 30c:1%,49c:2%,...; --mod-profile required. If '%' is omitted the fan range is 0-255"
     )]
     pub data: Option<CurveData>,
 }

asusctl/src/scsi_cli.rs

@@ -1,35 +1,30 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_scsi::{AuraMode, Colour, Direction, Speed};
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "scsi", description = "scsi LED commands")]
 pub struct ScsiCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-
-    #[options(help = "Enable the SCSI drive LEDs")]
+    #[argh(option, description = "enable the SCSI drive LEDs")]
     pub enable: Option<bool>,
 
-    #[options(meta = "", help = "Set LED mode (so 'list' for all options)")]
+    #[argh(option, description = "set LED mode (use 'list' for all options)")]
     pub mode: Option<AuraMode>,
 
-    #[options(
-        meta = "",
-        help = "Set LED mode speed <slowest, slow, med, fast, fastest> (does not apply to all)"
+    #[argh(
+        option,
+        description = "set LED mode speed <slowest, slow, med, fast, fastest>"
     )]
     pub speed: Option<Speed>,
 
-    #[options(
-        meta = "",
-        help = "Set LED mode direction <forward, reverse> (does not apply to all)"
-    )]
+    #[argh(option, description = "set LED mode direction <forward, reverse>")]
     pub direction: Option<Direction>,
 
-    #[options(
-        meta = "",
-        help = "Set LED colours <hex>, specify up to 4 with repeated arg"
+    #[argh(
+        option,
+        description = "set LED colours <hex>, specify up to 4 with repeated arg"
     )]
     pub colours: Vec<Colour>,
 
-    #[options(help = "list available animations")]
+    #[argh(switch, description = "list available animations")]
     pub list: bool,
 }

asusctl/src/slash_cli.rs

@@ -1,20 +1,34 @@
-use gumdrop::Options;
+use argh::FromArgs;
 use rog_slash::SlashMode;
 
-#[derive(Options)]
+#[derive(FromArgs, Debug)]
+#[argh(subcommand, name = "slash", description = "slash ledbar commands")]
 pub struct SlashCommand {
-    #[options(help = "print help message")]
-    pub help: bool,
-    #[options(help = "Enable the Slash Ledbar")]
+    #[argh(switch, description = "enable the Slash Ledbar")]
     pub enable: bool,
-    #[options(help = "Ddisable the Slash Ledbar")]
+    #[argh(switch, description = "disable the Slash Ledbar")]
     pub disable: bool,
-    #[options(meta = "", help = "Set brightness value <0-255>")]
+    #[argh(option, short = 'l', description = "set brightness value <0-255>")]
     pub brightness: Option<u8>,
-    #[options(meta = "", help = "Set interval value <0-5>")]
+    #[argh(option, description = "set interval value <0-5>")]
     pub interval: Option<u8>,
-    #[options(meta = "", help = "Set SlashMode (so 'list' for all options)")]
-    pub slash_mode: Option<SlashMode>,
-    #[options(help = "list available animations")]
+    #[argh(option, description = "set SlashMode (use 'list' for options)")]
+    pub mode: Option<SlashMode>,
+    #[argh(switch, description = "list available animations")]
     pub list: bool,
+
+    #[argh(option, short = 'B', description = "show the animation on boot")]
+    pub show_on_boot: Option<bool>,
+    #[argh(option, short = 'S', description = "show the animation on shutdown")]
+    pub show_on_shutdown: Option<bool>,
+    #[argh(option, short = 's', description = "show the animation on sleep")]
+    pub show_on_sleep: Option<bool>,
+    #[argh(option, short = 'b', description = "show the animation on battery")]
+    pub show_on_battery: Option<bool>,
+    #[argh(
+        option,
+        short = 'w',
+        description = "show the low-battery warning animation"
+    )]
+    pub show_battery_warning: Option<bool>,
 }

asusd-user/Cargo.toml

@@ -32,3 +32,16 @@ config-traits = { path = "../config-traits" }
 
 zbus.workspace = true
 env_logger.workspace = true
+
+[package.metadata.deb]
+license-file = ["../LICENSE", "4"]
+extended-description = """\
+An user utility for Linux to control fancy things on various ASUS laptops
+like keyboard effects or anime matrix animation cycles."""
+depends = "$auto"
+section = "utility"
+priority = "optional"
+assets = [
+  ["target/release/asusd-user", "usr/bin/", "755"],
+  ["../asusd_user-fakeinstall/usr/lib/systemd/user/*", "usr/lib/systemd/user/", "644"],
+]

asusd-user/src/ctrl_anime.rs

@@ -151,10 +151,7 @@ impl CtrlAnime<'static> {
     pub async fn add_to_server(self, server: &mut zbus::Connection) {
         server
             .object_server()
-            .at(
-                &ObjectPath::from_str_unchecked("/org/asuslinux/Anime"),
-                self,
-            )
+            .at(&ObjectPath::from_str_unchecked("/xyz/ljones/Anime"), self)
             .await
             .map_err(|err| {
                 println!("CtrlAnime: add_to_server {}", err);
@@ -170,7 +167,7 @@ impl CtrlAnime<'static> {
 // - Do actions
 // - Write config if required
 // - Unset inner_early_return
-#[interface(name = "org.asuslinux.Daemon")]
+#[interface(name = "xyz.ljones.Asusd")]
 impl CtrlAnime<'static> {
     pub fn insert_asus_gif(
         &mut self,

asusd-user/src/daemon.rs

@@ -42,7 +42,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let early_return = Arc::new(AtomicBool::new(false));
     // Set up the anime data and run loop/thread
-    if supported.contains(&"org.asuslinux.Anime".to_string()) {
+    if supported.contains(&"xyz.ljones.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-user/src/zbus_anime.rs

@@ -1,8 +1,8 @@
-//! # `DBus` interface proxy for: `org.asuslinux.Daemon`
+//! # `DBus` interface proxy for: `xyz.ljones.Asusd`
 //!
 //! This code was generated by `zbus-xmlgen` `1.0.0` from `DBus` introspection
-//! data. Source: `Interface '/org/asuslinux/Anime' from service
-//! 'org.asuslinux.Daemon' on session bus`.
+//! data. Source: `Interface '/xyz/ljones/Anime' from service
+//! 'xyz.ljones.Asusd' on session bus`.
 //!
 //! You may prefer to adapt it, instead of using it verbatim.
 //!
@@ -23,10 +23,7 @@
 
 use zbus::proxy;
 
-#[proxy(
-    interface = "org.asuslinux.Daemon",
-    default_path = "/org/asuslinux/Anime"
-)]
+#[proxy(interface = "xyz.ljones.Asusd", default_path = "/xyz/ljones/Anime")]
 trait Daemon {
     /// InsertAsusGif method
     fn insert_asus_gif(

asusd/Cargo.toml

@@ -34,6 +34,7 @@ tokio.workspace = true
 log.workspace = true
 env_logger.workspace = true
 
+futures-util.workspace = true
 zbus.workspace = true
 logind-zbus.workspace = true
 
@@ -44,3 +45,18 @@ concat-idents.workspace = true
 
 [dev-dependencies]
 cargo-husky.workspace = true
+
+[package.metadata.deb]
+license-file = ["../LICENSE", "4"]
+extended-description = """\
+The dbus server for asusctl and rog-control-center applications."""
+depends = "$auto"
+section = "utility"
+priority = "optional"
+assets = [
+  ["target/release/asusd", "usr/bin/", "755"],
+  ["../asusd-fakeinstall/usr/lib/systemd/system/*", "usr/lib/systemd/system/", "644"],
+  ["../asusd-fakeinstall/usr/lib/udev/rules.d/*", "usr/lib/udev/rules.d/", "644"],
+  ["../asusd-fakeinstall/usr/share/asusd/*", "usr/share/share/asusd/", "644"],
+  ["../asusd-fakeinstall/usr/share/dbus-1/system.d/*", "usr/share/dbus-1/system.d/", "644"],
+]

asusd/src/asus_armoury.rs

@@ -0,0 +1,544 @@
+use std::sync::Arc;
+
+use config_traits::StdConfig;
+use log::{debug, error, info, warn};
+use rog_platform::asus_armoury::{
+    AttrValue, Attribute, FirmwareAttribute, FirmwareAttributeType, FirmwareAttributes,
+};
+use rog_platform::platform::{PlatformProfile, RogPlatform};
+use rog_platform::power::AsusPower;
+use serde::{Deserialize, Serialize};
+use tokio::sync::Mutex;
+use zbus::object_server::SignalEmitter;
+use zbus::zvariant::{ObjectPath, OwnedObjectPath, OwnedValue, Type, Value};
+use zbus::{fdo, interface, Connection};
+
+use crate::config::Config;
+use crate::error::RogError;
+use crate::{Reloadable, ASUS_ZBUS_PATH};
+
+const MOD_NAME: &str = "asus_armoury";
+
+#[derive(Debug, Default, Clone, Deserialize, Serialize, Type, Value, OwnedValue)]
+pub struct PossibleValues {
+    strings: Vec<String>,
+    nums: Vec<i32>,
+}
+
+fn dbus_path_for_attr(attr_name: &str) -> OwnedObjectPath {
+    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{attr_name}")).into()
+}
+
+#[derive(Clone)]
+pub struct AsusArmouryAttribute {
+    attr: Attribute,
+    config: Arc<Mutex<Config>>,
+    /// platform control required here for access to PPD or Throttle profile
+    platform: RogPlatform,
+    power: AsusPower,
+}
+
+impl AsusArmouryAttribute {
+    pub fn new(
+        attr: Attribute,
+        platform: RogPlatform,
+        power: AsusPower,
+        config: Arc<Mutex<Config>>,
+    ) -> Self {
+        Self {
+            attr,
+            config,
+            platform,
+            power,
+        }
+    }
+
+    pub fn attribute_name(&self) -> String {
+        String::from(self.attr.name())
+    }
+
+    fn resolve_i32_value(refreshed: Option<i32>, cached: &AttrValue) -> i32 {
+        refreshed
+            .or(match cached {
+                AttrValue::Integer(i) => Some(*i),
+                _ => None,
+            })
+            .unwrap_or(-1)
+    }
+
+    pub async fn emit_limits(&self, connection: &Connection) -> Result<(), RogError> {
+        let path = dbus_path_for_attr(self.attr.name());
+        let signal = SignalEmitter::new(connection, path)?;
+        self.min_value_changed(&signal).await?;
+        self.max_value_changed(&signal).await?;
+        self.scalar_increment_changed(&signal).await?;
+        self.current_value_changed(&signal).await?;
+        Ok(())
+    }
+
+    pub async fn move_to_zbus(self, connection: &Connection) -> Result<(), RogError> {
+        let path = dbus_path_for_attr(self.attr.name());
+        connection
+            .object_server()
+            .at(path.clone(), self)
+            .await
+            .map_err(|e| error!("Couldn't add server at path: {path}, {e:?}"))
+            .ok();
+        Ok(())
+    }
+
+    async fn watch_and_notify(
+        &mut self,
+        signal_ctxt: SignalEmitter<'static>,
+    ) -> Result<(), RogError> {
+        use futures_util::StreamExt;
+
+        let name = self.name();
+        macro_rules! watch_value_notify {
+            ($attr_str:expr, $fn_prop_changed:ident) => {
+                match self.attr.get_watcher($attr_str) {
+                    Ok(watch) => {
+                        let name = <&str>::from(name);
+                        let ctrl = self.clone();
+                        let sig = signal_ctxt.clone();
+                        tokio::spawn(async move {
+                            let mut buffer = [0; 32];
+                            if let Ok(stream) = watch.into_event_stream(&mut buffer) {
+                                stream
+                                    .for_each(|_| async {
+                                        debug!("{} changed", name);
+                                        ctrl.$fn_prop_changed(&sig).await.ok();
+                                    })
+                                    .await;
+                            } else {
+                                info!(
+                                    "inotify event stream failed for {} ({}). You can ignore this \
+                                     if unsupported",
+                                    name, $attr_str
+                                );
+                            }
+                        });
+                    }
+                    Err(e) => info!(
+                        "inotify watch failed: {}. You can ignore this if your device does not \
+                         support the feature",
+                        e
+                    ),
+                }
+            };
+        }
+
+        // "current_value", "default_value", "min_value", "max_value"
+        watch_value_notify!("current_value", current_value_changed);
+        watch_value_notify!("default_value", default_value_changed);
+        watch_value_notify!("min_value", min_value_changed);
+        watch_value_notify!("max_value", max_value_changed);
+
+        Ok(())
+    }
+}
+
+#[derive(Clone, Default)]
+pub struct ArmouryAttributeRegistry {
+    attrs: Vec<AsusArmouryAttribute>,
+}
+
+impl ArmouryAttributeRegistry {
+    pub fn push(&mut self, attr: AsusArmouryAttribute) {
+        self.attrs.push(attr);
+    }
+
+    pub async fn emit_limits(&self, connection: &Connection) -> Result<(), RogError> {
+        let mut last_err: Option<RogError> = None;
+        for attr in &self.attrs {
+            if let Err(e) = attr.emit_limits(connection).await {
+                error!(
+                    "Failed to emit updated limits for attribute '{}': {e:?}",
+                    attr.attribute_name()
+                );
+                last_err = Some(e);
+            }
+        }
+        if let Some(err) = last_err {
+            Err(err)
+        } else {
+            Ok(())
+        }
+    }
+}
+
+impl crate::Reloadable for AsusArmouryAttribute {
+    async fn reload(&mut self) -> Result<(), RogError> {
+        info!("Reloading {}", self.attr.name());
+        let attribute: FirmwareAttribute = self.attr.name().into();
+        let name = self.attr.name();
+
+        let config = self.config.lock().await;
+        let apply_value = match attribute.property_type() {
+            FirmwareAttributeType::Ppt => {
+                let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
+                let power_plugged = self
+                    .power
+                    .get_online()
+                    .map_err(|e| {
+                        error!("Could not get power status: {e:?}");
+                        e
+                    })
+                    .unwrap_or_default()
+                    == 1;
+
+                let apply_value = {
+                    config.select_tunings_ref(power_plugged, profile).and_then(
+                        |tuning| match tuning.enabled {
+                            true => tuning.group.get(&self.name()).copied(),
+                            false => None,
+                        },
+                    )
+                };
+
+                apply_value.map_or(AttrValue::None, AttrValue::Integer)
+            }
+            FirmwareAttributeType::Gpu => {
+                info!("Reload called on GPU attribute {name}: doing nothing");
+                AttrValue::None
+            }
+            _ => {
+                info!("Reload called on firmware attribute {name}");
+                match config.armoury_settings.get(&attribute) {
+                    Some(saved_value) => AttrValue::Integer(*saved_value),
+                    None => AttrValue::None,
+                }
+            }
+        };
+
+        self.attr.set_current_value(&apply_value).map_err(|e| {
+            error!("Could not set {} value: {e:?}", self.attr.name());
+            self.attr.base_path_exists();
+            e
+        })?;
+
+        info!(
+            "Restored asus-armoury setting {} to {:?}",
+            self.attr.name(),
+            apply_value
+        );
+
+        Ok(())
+    }
+}
+
+/// If return is `-1` on a property then there is available value for that
+/// property
+#[interface(name = "xyz.ljones.AsusArmoury")]
+impl AsusArmouryAttribute {
+    #[zbus(property)]
+    fn name(&self) -> FirmwareAttribute {
+        self.attr.name().into()
+    }
+
+    #[zbus(property)]
+    async fn available_attrs(&self) -> Vec<String> {
+        let mut attrs = Vec::new();
+        if !matches!(self.attr.default_value(), AttrValue::None) {
+            attrs.push("default_value".to_string());
+        }
+        if !matches!(self.attr.min_value(), AttrValue::None) {
+            attrs.push("min_value".to_string());
+        }
+        if !matches!(self.attr.max_value(), AttrValue::None) {
+            attrs.push("max_value".to_string());
+        }
+        if !matches!(self.attr.scalar_increment(), AttrValue::None) {
+            attrs.push("scalar_increment".to_string());
+        }
+        if !matches!(self.attr.possible_values(), AttrValue::None) {
+            attrs.push("possible_values".to_string());
+        }
+        // TODO: Don't unwrap, use error
+        if let Ok(value) = self.attr.current_value().map_err(|e| {
+            error!("Failed to read: {e:?}");
+            e
+        }) {
+            if !matches!(value, AttrValue::None) {
+                attrs.push("current_value".to_string());
+            }
+        }
+        attrs
+    }
+
+    /// If return is `-1` then there is no default value
+    #[zbus(property)]
+    async fn default_value(&self) -> i32 {
+        match self.attr.default_value() {
+            AttrValue::Integer(i) => *i,
+            _ => -1,
+        }
+    }
+
+    async fn restore_default(&self) -> fdo::Result<()> {
+        self.attr.restore_default()?;
+        if self.name().property_type() == FirmwareAttributeType::Ppt {
+            let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
+            let power_plugged = self
+                .power
+                .get_online()
+                .map_err(|e| {
+                    error!("Could not get power status: {e:?}");
+                    e
+                })
+                .unwrap_or_default();
+
+            let mut config = self.config.lock().await;
+            let tuning = config.select_tunings(power_plugged == 1, profile);
+            if let Some(tune) = tuning.group.get_mut(&self.name()) {
+                if let AttrValue::Integer(i) = self.attr.default_value() {
+                    *tune = *i;
+                }
+            }
+            if tuning.enabled {
+                self.attr
+                    .set_current_value(self.attr.default_value())
+                    .map_err(|e| {
+                        error!("Could not set value: {e:?}");
+                        e
+                    })?;
+            }
+            config.write();
+        }
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn min_value(&self) -> i32 {
+        Self::resolve_i32_value(self.attr.refresh_min_value(), self.attr.min_value())
+    }
+
+    #[zbus(property)]
+    async fn max_value(&self) -> i32 {
+        Self::resolve_i32_value(self.attr.refresh_max_value(), self.attr.max_value())
+    }
+
+    #[zbus(property)]
+    async fn scalar_increment(&self) -> i32 {
+        Self::resolve_i32_value(
+            self.attr.refresh_scalar_increment(),
+            self.attr.scalar_increment(),
+        )
+    }
+
+    #[zbus(property)]
+    async fn possible_values(&self) -> Vec<i32> {
+        match self.attr.possible_values() {
+            AttrValue::EnumInt(i) => i.clone(),
+            _ => Vec::default(),
+        }
+    }
+
+    #[zbus(property)]
+    async fn current_value(&self) -> fdo::Result<i32> {
+        if self.name().property_type() == FirmwareAttributeType::Ppt {
+            let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
+            let power_plugged = self
+                .power
+                .get_online()
+                .map_err(|e| {
+                    error!("Could not get power status: {e:?}");
+                    e
+                })
+                .unwrap_or_default()
+                == 1;
+            let config = self.config.lock().await;
+            if let Some(tuning) = config.select_tunings_ref(power_plugged, profile) {
+                if let Some(tune) = tuning.group.get(&self.name()) {
+                    return Ok(*tune);
+                }
+            }
+            if let AttrValue::Integer(i) = self.attr.default_value() {
+                return Ok(*i);
+            }
+            return Err(fdo::Error::Failed(
+                "Could not read current value".to_string(),
+            ));
+        }
+
+        if let Ok(AttrValue::Integer(i)) = self.attr.current_value() {
+            return Ok(i);
+        }
+        Err(fdo::Error::Failed(
+            "Could not read current value".to_string(),
+        ))
+    }
+
+    #[zbus(property)]
+    async fn set_current_value(&mut self, value: i32) -> fdo::Result<()> {
+        let name = self.attr.name();
+        let apply_value = match self.name().property_type() {
+            FirmwareAttributeType::Ppt => {
+                let profile: PlatformProfile = self.platform.get_platform_profile()?.into();
+                let power_plugged = self
+                    .power
+                    .get_online()
+                    .map_err(|e| {
+                        error!("Could not get power status: {e:?}");
+                        e
+                    })
+                    .unwrap_or_default();
+
+                let mut config = self.config.lock().await;
+                let tuning = config.select_tunings(power_plugged == 1, profile);
+
+                if let Some(tune) = tuning.group.get_mut(&self.name()) {
+                    *tune = value;
+                } else {
+                    tuning.group.insert(self.name(), value);
+                    debug!("Store tuning config for {name} = {:?}", value);
+                }
+
+                match tuning.enabled {
+                    true => {
+                        debug!("Tuning is enabled: setting value to PPT property {name} = {value}");
+                        AttrValue::Integer(value)
+                    }
+                    false => {
+                        warn!("Tuning is disabled: skipping setting value to PPT property {name}");
+                        AttrValue::None
+                    }
+                }
+            }
+            _ => {
+                let mut settings = self.config.lock().await;
+                settings
+                    .armoury_settings
+                    .entry(self.name())
+                    .and_modify(|setting| {
+                        debug!("Set config for {name} = {value}");
+                        *setting = value;
+                    })
+                    .or_insert_with(|| {
+                        debug!("Adding config for {name} = {value}");
+                        value
+                    });
+
+                AttrValue::Integer(value)
+            }
+        };
+
+        self.attr.set_current_value(&apply_value).map_err(|e| {
+            error!("Could not set value {value} to attribute {name}: {e:?}");
+            e
+        })?;
+
+        // write config after setting value
+        self.config.lock().await.write();
+        Ok(())
+    }
+}
+
+pub async fn start_attributes_zbus(
+    conn: &Connection,
+    platform: RogPlatform,
+    power: AsusPower,
+    attributes: FirmwareAttributes,
+    config: Arc<Mutex<Config>>,
+) -> Result<ArmouryAttributeRegistry, RogError> {
+    let mut registry = ArmouryAttributeRegistry::default();
+    for attr in attributes.attributes() {
+        let mut attr = AsusArmouryAttribute::new(
+            attr.clone(),
+            platform.clone(),
+            power.clone(),
+            config.clone(),
+        );
+
+        let registry_attr = attr.clone();
+
+        if let Err(e) = attr.reload().await {
+            error!(
+                "Skipping attribute '{}' due to reload error: {e:?}",
+                attr.attr.name()
+            );
+            break;
+        }
+
+        let attr_name = attr.attribute_name();
+
+        let path = dbus_path_for_attr(attr_name.as_str());
+        match zbus::object_server::SignalEmitter::new(conn, path) {
+            Ok(sig) => {
+                if let Err(e) = attr.watch_and_notify(sig).await {
+                    error!("Failed to start watcher for '{}': {e:?}", attr.attr.name());
+                }
+            }
+            Err(e) => {
+                error!(
+                    "Failed to create SignalEmitter for '{}': {e:?}",
+                    attr.attr.name()
+                );
+            }
+        }
+
+        if let Err(e) = attr.move_to_zbus(conn).await {
+            error!("Failed to register attribute '{attr_name}' on zbus: {e:?}");
+            continue;
+        }
+
+        registry.push(registry_attr);
+    }
+    Ok(registry)
+}
+
+pub async fn set_config_or_default(
+    attrs: &FirmwareAttributes,
+    config: &mut Config,
+    power_plugged: bool,
+    profile: PlatformProfile,
+) {
+    for attr in attrs.attributes().iter() {
+        let name: FirmwareAttribute = attr.name().into();
+        if name.property_type() == FirmwareAttributeType::Ppt {
+            let tuning = config.select_tunings(power_plugged, profile);
+            if !tuning.enabled {
+                debug!("Tuning group is not enabled, skipping");
+                return;
+            }
+
+            if let Some(tune) = tuning.group.get(&name) {
+                attr.set_current_value(&AttrValue::Integer(*tune))
+                    .map_err(|e| {
+                        error!("Failed to set {}: {e}", <&str>::from(name));
+                    })
+                    .ok();
+            } else {
+                let default = attr.default_value();
+                attr.set_current_value(default)
+                    .map_err(|e| {
+                        error!("Failed to set {}: {e}", <&str>::from(name));
+                    })
+                    .ok();
+                if let AttrValue::Integer(i) = default {
+                    tuning.group.insert(name, *i);
+                    info!(
+                        "Set default tuning config for {} = {:?}",
+                        <&str>::from(name),
+                        i
+                    );
+                    // config.write();
+                }
+            }
+        } else {
+            // Handle non-PPT attributes (boolean and other settings)
+            if let Some(saved_value) = config.armoury_settings.get(&name) {
+                attr.set_current_value(&AttrValue::Integer(*saved_value))
+                    .map_err(|e| {
+                        error!("Failed to set {}: {e}", <&str>::from(name));
+                    })
+                    .ok();
+                info!(
+                    "Restored armoury setting for {} = {:?}",
+                    <&str>::from(name),
+                    saved_value
+                );
+            }
+        }
+    }
+}

asusd/src/aura_anime/config.rs

@@ -138,38 +138,44 @@ impl AniMeConfig {
         // create a default config here
         AniMeConfig {
             system: vec![],
-            boot: vec![ActionLoader::ImageAnimation {
-                file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
-                scale: 0.9,
-                angle: 0.65,
-                translation: Vec2::default(),
-                brightness: 1.0,
-                time: AnimTime::Fade(Fade::new(
-                    Duration::from_secs(2),
-                    Some(Duration::from_secs(2)),
-                    Duration::from_secs(2),
-                )),
-            }],
-            wake: vec![ActionLoader::ImageAnimation {
-                file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
-                scale: 0.9,
-                angle: 0.65,
-                translation: Vec2::default(),
-                brightness: 1.0,
-                time: AnimTime::Fade(Fade::new(
-                    Duration::from_secs(2),
-                    Some(Duration::from_secs(2)),
-                    Duration::from_secs(2),
-                )),
-            }],
-            shutdown: vec![ActionLoader::ImageAnimation {
-                file: "/usr/share/asusd/anime/custom/sonic-wait.gif".into(),
-                scale: 0.9,
-                angle: 0.0,
-                translation: Vec2::new(3.0, 2.0),
-                brightness: 1.0,
-                time: AnimTime::Infinite,
-            }],
+            boot: vec![
+                ActionLoader::ImageAnimation {
+                    file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
+                    scale: 0.9,
+                    angle: 0.65,
+                    translation: Vec2::default(),
+                    brightness: 1.0,
+                    time: AnimTime::Fade(Fade::new(
+                        Duration::from_secs(2),
+                        Some(Duration::from_secs(2)),
+                        Duration::from_secs(2),
+                    )),
+                },
+            ],
+            wake: vec![
+                ActionLoader::ImageAnimation {
+                    file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
+                    scale: 0.9,
+                    angle: 0.65,
+                    translation: Vec2::default(),
+                    brightness: 1.0,
+                    time: AnimTime::Fade(Fade::new(
+                        Duration::from_secs(2),
+                        Some(Duration::from_secs(2)),
+                        Duration::from_secs(2),
+                    )),
+                },
+            ],
+            shutdown: vec![
+                ActionLoader::ImageAnimation {
+                    file: "/usr/share/asusd/anime/custom/sonic-wait.gif".into(),
+                    scale: 0.9,
+                    angle: 0.0,
+                    translation: Vec2::new(3.0, 2.0),
+                    brightness: 1.0,
+                    time: AnimTime::Infinite,
+                },
+            ],
             ..Default::default()
         }
     }

asusd/src/aura_anime/mod.rs

@@ -8,7 +8,7 @@ use std::sync::Arc;
 use std::thread::sleep;
 
 use config_traits::StdConfig;
-use log::{error, info, warn};
+use log::{debug, error, info, warn};
 use rog_anime::usb::{
     pkt_flush, pkt_set_brightness, pkt_set_enable_display, pkt_set_enable_powersave_anim,
     pkts_for_init, Brightness,
@@ -16,7 +16,7 @@ use rog_anime::usb::{
 use rog_anime::{ActionData, AnimeDataBuffer, AnimePacketType};
 use rog_platform::hid_raw::HidRaw;
 use rog_platform::usb_raw::USBRaw;
-use tokio::sync::{Mutex, MutexGuard};
+use tokio::sync::Mutex;
 
 use self::config::{AniMeConfig, AniMeConfigCached};
 use crate::error::RogError;
@@ -59,6 +59,8 @@ impl AniMe {
                 config.rename_file_old();
                 *config = AniMeConfig::new();
                 config.write();
+            } else {
+                debug!("Initialised AniMe cache");
             }
         } else {
             error!("AniMe Matrix could not init cache")
@@ -70,11 +72,9 @@ impl AniMe {
         self.do_init_cache().await;
         let pkts = pkts_for_init();
         self.write_bytes(&pkts[0]).await?;
-        self.write_bytes(&pkts[1]).await
-    }
-
-    pub async fn lock_config(&self) -> MutexGuard<AniMeConfig> {
-        self.config.lock().await
+        self.write_bytes(&pkts[1]).await?;
+        debug!("Succesfully initialised AniMe matrix display");
+        Ok(())
     }
 
     pub async fn write_bytes(&self, message: &[u8]) -> Result<(), RogError> {
@@ -176,7 +176,7 @@ impl AniMe {
                                     return Ok(true); // Do safe exit
                                 }
                                 let inner = inner.clone();
-                                tokio::task::spawn_local(async move {
+                                tokio::task::spawn(async move {
                                     inner
                                         .write_data_buffer(frame)
                                         .await
@@ -227,10 +227,11 @@ impl AniMe {
                     })
                     .ok();
             }
+            // A write can block for many milliseconds so lets not hold the config lock for
+            // the same period
+            let enabled = inner.config.lock().await.builtin_anims_enabled;
             inner
-                .write_bytes(&pkt_set_enable_powersave_anim(
-                    inner.config.lock().await.builtin_anims_enabled,
-                ))
+                .write_bytes(&pkt_set_enable_powersave_anim(enabled))
                 .await
                 .map_err(|err| {
                     warn!("rog_anime::run_animation:callback {}", err);

asusd/src/aura_anime/trait_impls.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::Ordering;
 
 use config_traits::StdConfig;
-use log::{error, warn};
+use log::{debug, error, warn};
 use logind_zbus::manager::ManagerProxy;
 use rog_anime::usb::{
     pkt_set_brightness, pkt_set_builtin_animations, pkt_set_enable_display,
@@ -51,8 +51,11 @@ impl AniMeZbus {
             .object_server()
             .at(path.clone(), self)
             .await
-            .map_err(|e| error!("Couldn't add server at path: {path}, {e:?}"))
-            .ok();
+            .map_err(|e| {
+                error!("Couldn't add server at path: {path}, {e:?}");
+                e
+            })?;
+        debug!("start_tasks was successful");
         Ok(())
     }
 }
@@ -60,13 +63,17 @@ impl AniMeZbus {
 // None of these calls can be guarnateed to succeed unless we loop until okay
 // If the try_lock *does* succeed then any other thread trying to lock will not
 // grab it until we finish.
-#[interface(name = "org.asuslinux.Anime")]
+#[interface(name = "xyz.ljones.Anime")]
 impl AniMeZbus {
     /// Writes a data stream of length. Will force system thread to exit until
     /// it is restarted
     async fn write(&self, input: AnimeDataBuffer) -> zbus::fdo::Result<()> {
         let bright = self.0.config.lock().await.display_brightness;
-        self.0.set_builtins_enabled(false, bright).await?;
+        if self.0.config.lock().await.builtin_anims_enabled {
+            // This clears the display, causing flickers if done indiscriminately on every
+            // write. Therefore, we guard it behind a config check.
+            self.0.set_builtins_enabled(false, bright).await?;
+        }
         self.0.thread_exit.store(true, Ordering::SeqCst);
         self.0.write_data_buffer(input).await.map_err(|err| {
             warn!("ctrl_anime::run_animation:callback {}", err);
@@ -166,10 +173,7 @@ impl AniMeZbus {
     async fn set_builtin_animations(&self, settings: Animations) {
         self.0
             .write_bytes(&pkt_set_builtin_animations(
-                settings.boot,
-                settings.awake,
-                settings.sleep,
-                settings.shutdown,
+                settings.boot, settings.awake, settings.sleep, settings.shutdown,
             ))
             .await
             .map_err(|err| {
@@ -443,53 +447,60 @@ impl crate::CtrlTask for AniMeZbus {
 
 impl crate::Reloadable for AniMeZbus {
     async fn reload(&mut self) -> Result<(), RogError> {
-        if let Ok(config) = self.0.config.try_lock() {
-            let anim = &config.builtin_anims;
-            // Set builtins
-            if config.builtin_anims_enabled {
-                self.0
-                    .write_bytes(&pkt_set_builtin_animations(
-                        anim.boot,
-                        anim.awake,
-                        anim.sleep,
-                        anim.shutdown,
-                    ))
-                    .await?;
-            }
-            // Builtins enabled or na?
+        let AniMeConfig {
+            builtin_anims_enabled,
+            builtin_anims,
+            display_enabled,
+            display_brightness,
+            off_when_lid_closed,
+            off_when_unplugged,
+            ..
+        } = *self.0.config.lock().await;
+
+        // Set builtins
+        if builtin_anims_enabled {
             self.0
-                .set_builtins_enabled(config.builtin_anims_enabled, config.display_brightness)
+                .write_bytes(&pkt_set_builtin_animations(
+                    builtin_anims.boot,
+                    builtin_anims.awake,
+                    builtin_anims.sleep,
+                    builtin_anims.shutdown,
+                ))
                 .await?;
+        }
+        // Builtins enabled or na?
+        self.0
+            .set_builtins_enabled(builtin_anims_enabled, display_brightness)
+            .await?;
 
-            let manager = get_logind_manager().await;
-            let lid_closed = manager.lid_closed().await.unwrap_or_default();
-            let power_plugged = manager.on_external_power().await.unwrap_or_default();
+        let manager = get_logind_manager().await;
+        let lid_closed = manager.lid_closed().await.unwrap_or_default();
+        let power_plugged = manager.on_external_power().await.unwrap_or_default();
 
-            let turn_off = (lid_closed && config.off_when_lid_closed)
-                || (!power_plugged && config.off_when_unplugged);
+        let turn_off =
+            (lid_closed && off_when_lid_closed) || (!power_plugged && off_when_unplugged);
+        self.0
+            .write_bytes(&pkt_set_enable_display(!turn_off))
+            .await
+            .map_err(|err| {
+                warn!("create_sys_event_tasks::reload {}", err);
+            })
+            .ok();
+
+        if turn_off || !display_enabled {
+            self.0.write_bytes(&pkt_set_enable_display(false)).await?;
+            // early return so we don't run animation thread
+            return Ok(());
+        }
+
+        if !builtin_anims_enabled && !self.0.cache.boot.is_empty() {
             self.0
-                .write_bytes(&pkt_set_enable_display(!turn_off))
+                .write_bytes(&pkt_set_enable_powersave_anim(false))
                 .await
-                .map_err(|err| {
-                    warn!("create_sys_event_tasks::reload {}", err);
-                })
                 .ok();
 
-            if turn_off || !config.display_enabled {
-                self.0.write_bytes(&pkt_set_enable_display(false)).await?;
-                // early return so we don't run animation thread
-                return Ok(());
-            }
-
-            if !config.builtin_anims_enabled && !self.0.cache.boot.is_empty() {
-                self.0
-                    .write_bytes(&pkt_set_enable_powersave_anim(false))
-                    .await
-                    .ok();
-
-                let action = self.0.cache.boot.clone();
-                self.0.run_thread(action, true).await;
-            }
+            let action = self.0.cache.boot.clone();
+            self.0.run_thread(action, true).await;
         }
         Ok(())
     }

asusd/src/aura_laptop/config.rs

@@ -82,8 +82,9 @@ impl AuraConfig {
             config
                 .builtins
                 .insert(*n, AuraEffect::default_with_mode(*n));
-
-            if !config.support_data.basic_zones.is_empty() {
+        }
+        if !config.support_data.basic_zones.is_empty() {
+            for n in &config.support_data.basic_modes {
                 let mut default = vec![];
                 for (i, tmp) in config.support_data.basic_zones.iter().enumerate() {
                     default.push(AuraEffect {
@@ -118,14 +119,14 @@ impl AuraConfig {
             self.multizone_on = false;
         } else {
             if let Some(multi) = self.multizone.as_mut() {
-                if let Some(fx) = multi.get_mut(effect.mode()) {
-                    for fx in fx.iter_mut() {
+                if let Some(fx_vec) = multi.get_mut(effect.mode()) {
+                    for fx in fx_vec.iter_mut() {
                         if fx.zone == effect.zone {
                             *fx = effect;
                             return;
                         }
                     }
-                    fx.push(effect);
+                    fx_vec.push(effect);
                 } else {
                     multi.insert(*effect.mode(), vec![effect]);
                 }
@@ -230,6 +231,8 @@ impl AuraConfig {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::{Mutex, MutexGuard, OnceLock};
+
     use rog_aura::keyboard::AuraPowerState;
     use rog_aura::{
         AuraEffect, AuraModeNum, AuraZone, Colour, Direction, LedBrightness, PowerZones, Speed,
@@ -237,8 +240,20 @@ mod tests {
 
     use super::AuraConfig;
 
+    // Global mutex to serialize tests that rely on process-wide environment
+    // variables
+    static TEST_MUTEX: OnceLock<Mutex<()>> = OnceLock::new();
+
+    fn test_lock() -> MutexGuard<'static, ()> {
+        TEST_MUTEX
+            .get_or_init(|| Mutex::new(()))
+            .lock()
+            .expect("TEST_MUTEX poisoned")
+    }
+
     #[test]
     fn set_multizone_4key_config() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "");
         let mut config = AuraConfig::new("19b6");
 
@@ -330,6 +345,7 @@ mod tests {
 
     #[test]
     fn set_multizone_multimode_config() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "");
         let mut config = AuraConfig::new("19b6");
 
@@ -378,6 +394,7 @@ mod tests {
 
     #[test]
     fn verify_0x1866_g531i() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "G513I");
         let mut config = AuraConfig::new("1866");
 
@@ -409,6 +426,7 @@ mod tests {
 
     #[test]
     fn verify_0x19b6_g634j() {
+        let _guard = test_lock();
         std::env::set_var("BOARD_NAME", "G634J");
         let mut config = AuraConfig::new("19b6");
 

asusd/src/aura_laptop/mod.rs

@@ -28,7 +28,7 @@ impl Aura {
         Ok(())
     }
 
-    pub async fn lock_config(&self) -> MutexGuard<AuraConfig> {
+    pub async fn lock_config(&self) -> MutexGuard<'_, AuraConfig> {
         self.config.lock().await
     }
 
@@ -96,11 +96,7 @@ impl Aura {
         if matches!(dev_type, AuraDeviceType::LaptopKeyboardTuf) {
             if let Some(platform) = &self.backlight {
                 let buf = [
-                    1,
-                    mode.mode as u8,
-                    mode.colour1.r,
-                    mode.colour1.g,
-                    mode.colour1.b,
+                    1, mode.mode as u8, mode.colour1.r, mode.colour1.g, mode.colour1.b,
                     mode.speed as u8,
                 ];
                 platform.lock().await.set_kbd_rgb_mode(&buf)?;
@@ -142,14 +138,24 @@ impl Aura {
             let hid_raw = hid_raw.lock().await;
             if let Some(p) = config.enabled.states.first() {
                 if p.zone == PowerZones::Ally {
-                    let msg = [0x5d, 0xd1, 0x09, 0x01, p.new_to_byte() as u8, 0x0, 0x0];
+                    let msg = [
+                        0x5d,
+                        0xd1,
+                        0x09,
+                        0x01,
+                        p.new_to_byte() as u8,
+                        0x0,
+                        0x0,
+                    ];
                     hid_raw.write_bytes(&msg)?;
                     return Ok(());
                 }
             }
 
             let bytes = config.enabled.to_bytes(config.led_type);
-            let msg = [0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3]];
+            let msg = [
+                0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3],
+            ];
             hid_raw.write_bytes(&msg)?;
         }
         Ok(())
@@ -194,7 +200,9 @@ impl Aura {
                     let r = row[9];
                     let g = row[10];
                     let b = row[11];
-                    tuf.lock().await.set_kbd_rgb_mode(&[0, 0, r, g, b, 0])?;
+                    tuf.lock().await.set_kbd_rgb_mode(&[
+                        0, 0, r, g, b, 0,
+                    ])?;
                 }
             }
         }
@@ -206,7 +214,9 @@ impl Aura {
             if let Some(hid_raw) = &self.hid {
                 let mut config = self.config.lock().await;
                 if config.ally_fix.is_none() {
-                    let msg = [0x5d, 0xbd, 0x01, 0xff, 0xff, 0xff, 0xff];
+                    let msg = [
+                        0x5d, 0xbd, 0x01, 0xff, 0xff, 0xff, 0xff,
+                    ];
                     hid_raw.lock().await.write_bytes(&msg)?;
                     info!("Reset Ally power settings to base");
                     config.ally_fix = Some(true);

asusd/src/aura_laptop/trait_impls.rs

@@ -14,7 +14,7 @@ use crate::error::RogError;
 use crate::{CtrlTask, Reloadable};
 
 pub const AURA_ZBUS_NAME: &str = "Aura";
-pub const AURA_ZBUS_PATH: &str = "/org/asuslinux";
+pub const AURA_ZBUS_PATH: &str = "/xyz/ljones";
 
 #[derive(Clone)]
 pub struct AuraZbus(Aura);
@@ -50,7 +50,7 @@ impl AuraZbus {
 /// The main interface for changing, reading, or notfying
 ///
 /// LED commands are split between Brightness, Modes, Per-Key
-#[interface(name = "org.asuslinux.Aura")]
+#[interface(name = "xyz.ljones.Aura")]
 impl AuraZbus {
     /// Return the device type for this Aura keyboard
     #[zbus(property)]
@@ -71,7 +71,13 @@ impl AuraZbus {
     #[zbus(property)]
     async fn set_brightness(&mut self, brightness: LedBrightness) -> Result<(), ZbErr> {
         if let Some(bl) = self.0.backlight.as_ref() {
-            return Ok(bl.lock().await.set_brightness(brightness.into())?);
+            let res = bl.lock().await.set_brightness(brightness.into());
+            if res.is_ok() {
+                let mut config = self.0.config.lock().await;
+                config.brightness = brightness;
+                config.write();
+            }
+            return Ok(res?);
         }
         Err(ZbErr::Failed("No sysfs brightness control".to_string()))
     }
@@ -227,7 +233,7 @@ impl AuraZbus {
 
 impl CtrlTask for AuraZbus {
     fn zbus_path() -> &'static str {
-        "/org/asuslinux"
+        "/xyz/ljones"
     }
 
     async fn create_tasks(&self, _: SignalEmitter<'static>) -> Result<(), RogError> {

asusd/src/aura_manager.rs

@@ -4,6 +4,7 @@
 // - Add it to Zbus server
 // - If udev sees device removed then remove the zbus path
 
+use std::collections::HashMap;
 use std::sync::Arc;
 
 use dmi_id::DMIID;
@@ -23,8 +24,9 @@ use crate::aura_scsi::trait_impls::ScsiZbus;
 use crate::aura_slash::trait_impls::SlashZbus;
 use crate::aura_types::DeviceHandle;
 use crate::error::RogError;
+use crate::ASUS_ZBUS_PATH;
 
-pub const ASUS_ZBUS_PATH: &str = "/org/asuslinux";
+const MOD_NAME: &str = "aura";
 
 /// Returns only the Device details concatenated in a form usable for
 /// adding/appending to a filename
@@ -54,26 +56,27 @@ pub fn filename_partial(parent: &Device) -> Option<OwnedObjectPath> {
 fn dbus_path_for_dev(parent: &Device) -> Option<OwnedObjectPath> {
     if let Some(filename) = filename_partial(parent) {
         return Some(
-            ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{filename}")).into(),
+            ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{filename}"))
+                .into(),
         );
     }
     None
 }
 
 fn dbus_path_for_tuf() -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/tuf")).into()
+    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/tuf")).into()
 }
 
 fn dbus_path_for_slash() -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/slash")).into()
+    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/slash")).into()
 }
 
 fn dbus_path_for_anime() -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/anime")).into()
+    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/anime")).into()
 }
 
 fn dbus_path_for_scsi(prod_id: &str) -> OwnedObjectPath {
-    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{prod_id}_scsi")).into()
+    ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{prod_id}_scsi")).into()
 }
 
 fn dev_prop_matches(dev: &Device, prop: &str, value: &str) -> bool {
@@ -83,15 +86,6 @@ fn dev_prop_matches(dev: &Device, prop: &str, value: &str) -> bool {
     false
 }
 
-// TODO:
-// - make this the HID manager (and universal)
-// - *really* need to make most of this actual kernel drivers
-//   - LED class
-//   - RGB modes (how, attribute?)
-//   - power features (how, attribute?)
-//   - what about per-key stuff?
-//   - how would the AniMe be exposed? Just a series of LEDs?
-
 /// A device.
 ///
 /// Each controller within should track its dbus path so it can be removed if
@@ -99,23 +93,46 @@ fn dev_prop_matches(dev: &Device, prop: &str, value: &str) -> bool {
 pub struct AsusDevice {
     device: DeviceHandle,
     dbus_path: OwnedObjectPath,
+    hid_key: Option<String>,
 }
 
 pub struct DeviceManager {
     _dbus_connection: Connection,
+    _hid_handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
 }
 
 impl DeviceManager {
+    #[allow(clippy::type_complexity)]
+    async fn get_or_create_hid_handle(
+        handles: &Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+        endpoint: &Device,
+    ) -> Result<(Arc<Mutex<HidRaw>>, String), RogError> {
+        let dev_node = endpoint
+            .devnode()
+            .ok_or_else(|| RogError::MissingFunction("hidraw devnode missing".to_string()))?;
+        let key = dev_node.to_string_lossy().to_string();
+
+        if let Some(existing) = handles.lock().await.get(&key).cloned() {
+            return Ok((existing, key));
+        }
+
+        let hidraw = HidRaw::from_device(endpoint.clone())?;
+        let handle = Arc::new(Mutex::new(hidraw));
+        handles.lock().await.insert(key.clone(), handle.clone());
+        Ok((handle, key))
+    }
+
     async fn init_hid_devices(
         connection: &Connection,
         device: Device,
+        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
     ) -> Result<Vec<AsusDevice>, RogError> {
         let mut devices = Vec::new();
         if let Some(usb_device) = device.parent_with_subsystem_devtype("usb", "usb_device")? {
             if let Some(usb_id) = usb_device.attribute_value("idProduct") {
                 if let Some(vendor_id) = usb_device.attribute_value("idVendor") {
                     if vendor_id != "0b05" {
-                        debug!("Not ASUS vendor ID");
+                        debug!("Not ASUS vendor ID: {}", vendor_id.to_string_lossy());
                         return Ok(devices);
                     }
                     // Almost all devices are identified by the productId.
@@ -123,9 +140,10 @@ impl DeviceManager {
                     // 1. Generate an interface path
                     // 2. Create the device
                     // Use the top-level endpoint, not the parent
-                    if let Ok(hidraw) = HidRaw::from_device(device) {
+                    if let Ok((dev, hid_key)) =
+                        Self::get_or_create_hid_handle(&handles, &device).await
+                    {
                         debug!("Testing device {usb_id:?}");
-                        let dev = Arc::new(Mutex::new(hidraw));
                         // SLASH DEVICE
                         if let Ok(dev_type) = DeviceHandle::new_slash_hid(
                             dev.clone(),
@@ -141,6 +159,7 @@ impl DeviceManager {
                                 devices.push(AsusDevice {
                                     device: dev_type,
                                     dbus_path: path,
+                                    hid_key: Some(hid_key.clone()),
                                 });
                             }
                         }
@@ -159,6 +178,7 @@ impl DeviceManager {
                                 devices.push(AsusDevice {
                                     device: dev_type,
                                     dbus_path: path,
+                                    hid_key: Some(hid_key.clone()),
                                 });
                             }
                         }
@@ -177,9 +197,12 @@ impl DeviceManager {
                                 devices.push(AsusDevice {
                                     device: dev_type,
                                     dbus_path: path,
+                                    hid_key: Some(hid_key),
                                 });
                             }
                         }
+                    } else {
+                        warn!("Failed to initialise shared hid handle for {usb_id:?}");
                     }
                 }
             }
@@ -188,7 +211,10 @@ impl DeviceManager {
     }
 
     /// To be called on daemon startup
-    async fn init_all_hid(connection: &Connection) -> Result<Vec<AsusDevice>, RogError> {
+    async fn init_all_hid(
+        connection: &Connection,
+        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+    ) -> Result<Vec<AsusDevice>, RogError> {
         // track and ensure we use only one hidraw per prod_id
         // let mut interfaces = HashSet::new();
         let mut devices: Vec<AsusDevice> = Vec::new();
@@ -207,7 +233,7 @@ impl DeviceManager {
             .scan_devices()
             .map_err(|e| PlatformError::IoPath("enumerator".to_owned(), e))?
         {
-            devices.append(&mut Self::init_hid_devices(connection, device).await?);
+            devices.append(&mut Self::init_hid_devices(connection, device, handles.clone()).await?);
         }
 
         Ok(devices)
@@ -220,7 +246,7 @@ impl DeviceManager {
     ) -> Option<AsusDevice> {
         // "ID_MODEL_ID" "1932"
         // "ID_VENDOR_ID" "0b05"
-        if dev_prop_matches(&device, "ID_VENDOR_ID", "0b05") {
+        if dev_prop_matches(device, "ID_VENDOR_ID", "0b05") {
             if let Some(dev_node) = device.devnode() {
                 let prod_id = device
                     .property_value("ID_MODEL_ID")
@@ -235,6 +261,7 @@ impl DeviceManager {
                         return Some(AsusDevice {
                             device: dev_type,
                             dbus_path: path,
+                            hid_key: None,
                         });
                     }
                 }
@@ -275,17 +302,20 @@ impl DeviceManager {
                     found.push(path);
                 }
             } else {
-                warn!("No serial for SCSI device");
+                debug!("No serial for SCSI device: {:?}", device.devpath());
             }
         }
 
         Ok(devices)
     }
 
-    pub async fn find_all_devices(connection: &Connection) -> Vec<AsusDevice> {
+    pub async fn find_all_devices(
+        connection: &Connection,
+        handles: Arc<Mutex<HashMap<String, Arc<Mutex<HidRaw>>>>>,
+    ) -> Vec<AsusDevice> {
         let mut devices: Vec<AsusDevice> = Vec::new();
         // HID first, always
-        if let Ok(devs) = &mut Self::init_all_hid(connection).await {
+        if let Ok(devs) = &mut Self::init_all_hid(connection, handles.clone()).await {
             devices.append(devs);
         }
         // USB after, need to check if HID picked something up and if so, skip it
@@ -313,6 +343,7 @@ impl DeviceManager {
                     devices.push(AsusDevice {
                         device: dev_type,
                         dbus_path: path,
+                        hid_key: None,
                     });
                 }
             } else {
@@ -326,11 +357,18 @@ impl DeviceManager {
                 if let DeviceHandle::AniMe(anime) = dev_type.clone() {
                     let path = dbus_path_for_anime();
                     let ctrl = AniMeZbus::new(anime);
-                    ctrl.start_tasks(connection, path.clone()).await.unwrap();
-                    devices.push(AsusDevice {
-                        device: dev_type,
-                        dbus_path: path,
-                    });
+                    if ctrl
+                        .start_tasks(connection, path.clone())
+                        .await
+                        .map_err(|e| error!("Failed to start tasks: {e:?}, not adding this device"))
+                        .is_ok()
+                    {
+                        devices.push(AsusDevice {
+                            device: dev_type,
+                            dbus_path: path,
+                            hid_key: None,
+                        });
+                    }
                 }
             } else {
                 info!("Tested device was not AniMe Matrix");
@@ -356,6 +394,7 @@ impl DeviceManager {
                         devices.push(AsusDevice {
                             device: dev_type,
                             dbus_path: path,
+                            hid_key: None,
                         });
                     }
                 }
@@ -371,16 +410,19 @@ impl DeviceManager {
 
     pub async fn new(connection: Connection) -> Result<Self, RogError> {
         let conn_copy = connection.clone();
-        let devices = Arc::new(Mutex::new(Self::find_all_devices(&conn_copy).await));
+        let hid_handles = Arc::new(Mutex::new(HashMap::new()));
+        let devices = Self::find_all_devices(&conn_copy, hid_handles.clone()).await;
+        info!("Found {} valid devices on startup", devices.len());
+        let devices = Arc::new(Mutex::new(devices));
         let manager = Self {
             _dbus_connection: connection,
+            _hid_handles: hid_handles.clone(),
         };
 
         // TODO: The /sysfs/ LEDs don't cause events, so they need to be manually
         // checked for and added
 
-        // detect all plugged in aura devices (eventually)
-        // only USB devices are detected for here
+        let hid_handles_thread = hid_handles.clone();
         std::thread::spawn(move || {
             let mut monitor = MonitorBuilder::new()?.listen()?;
             let mut poll = Poll::new()?;
@@ -409,6 +451,7 @@ impl DeviceManager {
 
                     let devices = devices.clone();
                     let conn_copy = conn_copy.clone();
+                    let hid_handles = hid_handles_thread.clone();
                     block_on(async move {
                         // SCSCI devs
                         if subsys == "block" {
@@ -427,20 +470,20 @@ impl DeviceManager {
                                     {
                                         index
                                     } else {
-                                        warn!("No device for dbus path: {path:?}");
+                                        if dev_prop_matches(&event.device(), "ID_VENDOR_ID", "0b05")
+                                        {
+                                            warn!("No device for dbus path: {path:?}");
+                                        }
                                         return Ok(());
                                     };
                                     info!("removing: {path:?}");
                                     let dev = devices.lock().await.remove(index);
                                     let path = path.clone();
-                                    match dev.device {
-                                        DeviceHandle::Scsi(_) => {
-                                            conn_copy
-                                                .object_server()
-                                                .remove::<ScsiZbus, _>(&path)
-                                                .await?;
-                                        }
-                                        _ => {}
+                                    if let DeviceHandle::Scsi(_) = dev.device {
+                                        conn_copy
+                                            .object_server()
+                                            .remove::<ScsiZbus, _>(&path)
+                                            .await?;
                                     }
                                 }
                             } else if action == "add" {
@@ -484,6 +527,7 @@ impl DeviceManager {
                                         // Iter in reverse so as to not screw up indexing
                                         for index in removals.iter().rev() {
                                             let dev = devices.lock().await.remove(*index);
+                                            let hid_key = dev.hid_key.clone();
                                             let path = path.clone();
                                             let res = match dev.device {
                                                 DeviceHandle::Aura(_) => {
@@ -513,14 +557,20 @@ impl DeviceManager {
                                                 _ => todo!(),
                                             };
                                             info!("AuraManager removed: {path:?}, {res}");
+                                            if let Some(key) = hid_key {
+                                                hid_handles.lock().await.remove(&key);
+                                            }
                                         }
                                     }
                                 } else if action == "add" {
                                     let evdev = event.device();
-                                    if let Ok(mut new_devs) =
-                                        Self::init_hid_devices(&conn_copy, evdev)
-                                            .await
-                                            .map_err(|e| error!("Couldn't add new device: {e:?}"))
+                                    if let Ok(mut new_devs) = Self::init_hid_devices(
+                                        &conn_copy,
+                                        evdev,
+                                        hid_handles.clone(),
+                                    )
+                                    .await
+                                    .map_err(|e| error!("Couldn't add new device: {e:?}"))
                                     {
                                         devices.lock().await.append(&mut new_devs);
                                     }

asusd/src/aura_scsi/mod.rs

@@ -20,7 +20,7 @@ impl ScsiAura {
         Self { device, config }
     }
 
-    pub async fn lock_config(&self) -> MutexGuard<ScsiConfig> {
+    pub async fn lock_config(&self) -> MutexGuard<'_, ScsiConfig> {
         self.config.lock().await
     }
 

asusd/src/aura_scsi/trait_impls.rs

@@ -34,7 +34,7 @@ impl ScsiZbus {
     }
 }
 
-#[interface(name = "org.asuslinux.ScsiAura")]
+#[interface(name = "xyz.ljones.ScsiAura")]
 impl ScsiZbus {
     /// Return the device type for this Aura keyboard
     #[zbus(property)]

asusd/src/aura_slash/config.rs

@@ -9,20 +9,32 @@ const CONFIG_FILE: &str = "slash.ron";
 pub struct SlashConfig {
     #[serde(skip)]
     pub slash_type: SlashType,
-    pub slash_enabled: bool,
-    pub slash_brightness: u8,
-    pub slash_interval: u8,
-    pub slash_mode: SlashMode,
+    pub enabled: bool,
+    pub brightness: u8,
+    pub display_interval: u8,
+    pub display_mode: SlashMode,
+    pub show_on_boot: bool,
+    pub show_on_shutdown: bool,
+    pub show_on_sleep: bool,
+    pub show_on_battery: bool,
+    pub show_battery_warning: bool,
+    pub show_on_lid_closed: bool,
 }
 
 impl Default for SlashConfig {
     fn default() -> Self {
         SlashConfig {
-            slash_enabled: true,
-            slash_brightness: 255,
-            slash_interval: 0,
-            slash_mode: SlashMode::Bounce,
+            enabled: true,
+            brightness: 255,
+            display_interval: 0,
+            display_mode: SlashMode::Bounce,
             slash_type: SlashType::Unsupported,
+            show_on_boot: true,
+            show_on_shutdown: true,
+            show_on_sleep: true,
+            show_on_battery: true,
+            show_battery_warning: true,
+            show_on_lid_closed: true,
         }
     }
 }
@@ -45,10 +57,10 @@ impl StdConfigLoad for SlashConfig {}
 impl From<&SlashConfig> for DeviceState {
     fn from(config: &SlashConfig) -> Self {
         DeviceState {
-            slash_enabled: config.slash_enabled,
-            slash_brightness: config.slash_brightness,
-            slash_interval: config.slash_interval,
-            slash_mode: config.slash_mode,
+            slash_enabled: config.enabled,
+            slash_brightness: config.brightness,
+            slash_interval: config.display_interval,
+            slash_mode: config.display_mode,
         }
     }
 }

asusd/src/aura_slash/mod.rs

@@ -3,8 +3,7 @@ use std::sync::Arc;
 use config::SlashConfig;
 use rog_platform::hid_raw::HidRaw;
 use rog_platform::usb_raw::USBRaw;
-use rog_slash::usb::{pkt_set_mode, pkt_set_options, pkts_for_init};
-use rog_slash::SlashType;
+use rog_slash::usb::{slash_pkt_enable, slash_pkt_init, slash_pkt_options, slash_pkt_set_mode};
 use tokio::sync::{Mutex, MutexGuard};
 
 use crate::error::RogError;
@@ -28,7 +27,7 @@ impl Slash {
         Self { hid, usb, config }
     }
 
-    pub async fn lock_config(&self) -> MutexGuard<SlashConfig> {
+    pub async fn lock_config(&self) -> MutexGuard<'_, SlashConfig> {
         self.config.lock().await
     }
 
@@ -46,22 +45,22 @@ impl Slash {
     pub async fn do_initialization(&self) -> Result<(), RogError> {
         // Don't try to initialise these models as the asus drivers already did
         let config = self.config.lock().await;
-        if !matches!(config.slash_type, SlashType::GA605 | SlashType::GU605) {
-            for pkt in &pkts_for_init(config.slash_type) {
-                self.write_bytes(pkt).await?;
-            }
+        for pkt in &slash_pkt_init(config.slash_type) {
+            self.write_bytes(pkt).await?;
         }
+        self.write_bytes(&slash_pkt_enable(config.slash_type, config.enabled))
+            .await?;
 
         // Apply config upon initialization
-        let option_packets = pkt_set_options(
+        let option_packets = slash_pkt_options(
             config.slash_type,
-            config.slash_enabled,
-            config.slash_brightness,
-            config.slash_interval,
+            config.enabled,
+            config.brightness,
+            config.display_interval,
         );
         self.write_bytes(&option_packets).await?;
 
-        let mode_packets = pkt_set_mode(config.slash_type, config.slash_mode);
+        let mode_packets = slash_pkt_set_mode(config.slash_type, config.display_mode);
         // self.node.write_bytes(&mode_packets[0])?;
         self.write_bytes(&mode_packets[1]).await?;
 

asusd/src/aura_slash/trait_impls.rs

@@ -1,6 +1,10 @@
 use config_traits::StdConfig;
 use log::{debug, error, warn};
-use rog_slash::usb::{pkt_save, pkt_set_mode, pkt_set_options};
+use rog_slash::usb::{
+    slash_pkt_battery_saver, slash_pkt_boot, slash_pkt_enable, slash_pkt_lid_closed,
+    slash_pkt_low_battery, slash_pkt_options, slash_pkt_save, slash_pkt_set_mode,
+    slash_pkt_shutdown, slash_pkt_sleep,
+};
 use rog_slash::{DeviceState, SlashMode};
 use zbus::zvariant::OwnedObjectPath;
 use zbus::{interface, Connection};
@@ -36,30 +40,37 @@ impl SlashZbus {
     }
 }
 
-#[interface(name = "org.asuslinux.Slash")]
+#[interface(name = "xyz.ljones.Slash")]
 impl SlashZbus {
     /// Get enabled or not
     #[zbus(property)]
     async fn enabled(&self) -> bool {
         let lock = self.0.lock_config().await;
-        lock.slash_enabled
+        lock.enabled
     }
 
     /// Set enabled true or false
     #[zbus(property)]
     async fn set_enabled(&self, enabled: bool) {
         let mut config = self.0.lock_config().await;
-        let brightness = if enabled && config.slash_brightness == 0 {
+        let brightness = if enabled && config.brightness == 0 {
             0x88
         } else {
-            config.slash_brightness
+            config.brightness
         };
         self.0
-            .write_bytes(&pkt_set_options(
+            .write_bytes(&slash_pkt_enable(config.slash_type, enabled))
+            .await
+            .map_err(|err| {
+                warn!("ctrl_slash::enable {}", err);
+            })
+            .ok();
+        self.0
+            .write_bytes(&slash_pkt_options(
                 config.slash_type,
                 enabled,
                 brightness,
-                config.slash_interval,
+                config.display_interval,
             ))
             .await
             .map_err(|err| {
@@ -67,8 +78,8 @@ impl SlashZbus {
             })
             .ok();
 
-        config.slash_enabled = enabled;
-        config.slash_brightness = brightness;
+        config.enabled = enabled;
+        config.brightness = brightness;
         config.write();
     }
 
@@ -76,7 +87,7 @@ impl SlashZbus {
     #[zbus(property)]
     async fn brightness(&self) -> u8 {
         let config = self.0.lock_config().await;
-        config.slash_brightness
+        config.brightness
     }
 
     /// Set brightness level
@@ -85,11 +96,11 @@ impl SlashZbus {
         let mut config = self.0.lock_config().await;
         let enabled = brightness > 0;
         self.0
-            .write_bytes(&pkt_set_options(
+            .write_bytes(&slash_pkt_options(
                 config.slash_type,
                 enabled,
                 brightness,
-                config.slash_interval,
+                config.display_interval,
             ))
             .await
             .map_err(|err| {
@@ -97,15 +108,15 @@ impl SlashZbus {
             })
             .ok();
 
-        config.slash_enabled = enabled;
-        config.slash_brightness = brightness;
+        config.enabled = enabled;
+        config.brightness = brightness;
         config.write();
     }
 
     #[zbus(property)]
     async fn interval(&self) -> u8 {
         let config = self.0.lock_config().await;
-        config.slash_interval
+        config.display_interval
     }
 
     /// Set interval between slash animations (0-255)
@@ -113,11 +124,8 @@ impl SlashZbus {
     async fn set_interval(&self, interval: u8) {
         let mut config = self.0.lock_config().await;
         self.0
-            .write_bytes(&pkt_set_options(
-                config.slash_type,
-                config.slash_enabled,
-                config.slash_brightness,
-                interval,
+            .write_bytes(&slash_pkt_options(
+                config.slash_type, config.enabled, config.brightness, interval,
             ))
             .await
             .map_err(|err| {
@@ -125,40 +133,31 @@ impl SlashZbus {
             })
             .ok();
 
-        config.slash_interval = interval;
+        config.display_interval = interval;
         config.write();
     }
 
     #[zbus(property)]
-    async fn slash_mode(&self) -> u8 {
+    async fn mode(&self) -> zbus::fdo::Result<u8> {
         let config = self.0.lock_config().await;
-        config.slash_interval
+        Ok(config.display_interval)
     }
 
     /// Set interval between slash animations (0-255)
     #[zbus(property)]
-    async fn set_slash_mode(&self, slash_mode: SlashMode) {
+    async fn set_mode(&self, mode: SlashMode) -> zbus::Result<()> {
         let mut config = self.0.lock_config().await;
 
-        let command_packets = pkt_set_mode(config.slash_type, slash_mode);
+        let command_packets = slash_pkt_set_mode(config.slash_type, mode);
         // self.node.write_bytes(&command_packets[0])?;
+        self.0.write_bytes(&command_packets[1]).await?;
         self.0
-            .write_bytes(&command_packets[1])
-            .await
-            .map_err(|err| {
-                warn!("ctrl_slash::set_options {}", err);
-            })
-            .ok();
-        self.0
-            .write_bytes(&pkt_save(config.slash_type))
-            .await
-            .map_err(|err| {
-                warn!("ctrl_slash::set_options {}", err);
-            })
-            .ok();
+            .write_bytes(&slash_pkt_save(config.slash_type))
+            .await?;
 
-        config.slash_mode = slash_mode;
+        config.display_mode = mode;
         config.write();
+        Ok(())
     }
 
     /// Get the device state as stored by asusd
@@ -167,6 +166,111 @@ impl SlashZbus {
         let config = self.0.lock_config().await;
         DeviceState::from(&*config)
     }
+
+    #[zbus(property)]
+    async fn show_on_boot(&self) -> zbus::fdo::Result<bool> {
+        let config = self.0.lock_config().await;
+        Ok(config.show_on_boot)
+    }
+
+    #[zbus(property)]
+    async fn set_show_on_boot(&self, enable: bool) -> zbus::Result<()> {
+        let mut config = self.0.lock_config().await;
+        self.0
+            .write_bytes(&slash_pkt_boot(config.slash_type, enable))
+            .await?;
+        config.show_on_boot = enable;
+        config.write();
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn show_on_sleep(&self) -> zbus::fdo::Result<bool> {
+        let config = self.0.lock_config().await;
+        Ok(config.show_on_sleep)
+    }
+
+    #[zbus(property)]
+    async fn set_show_on_sleep(&self, enable: bool) -> zbus::Result<()> {
+        let mut config = self.0.lock_config().await;
+        self.0
+            .write_bytes(&slash_pkt_sleep(config.slash_type, enable))
+            .await?;
+        config.show_on_sleep = enable;
+        config.write();
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn show_on_shutdown(&self) -> zbus::fdo::Result<bool> {
+        let config = self.0.lock_config().await;
+        Ok(config.show_on_shutdown)
+    }
+
+    #[zbus(property)]
+    async fn set_show_on_shutdown(&self, enable: bool) -> zbus::Result<()> {
+        let mut config = self.0.lock_config().await;
+        self.0
+            .write_bytes(&slash_pkt_shutdown(config.slash_type, enable))
+            .await?;
+        config.show_on_shutdown = enable;
+        config.write();
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn show_on_battery(&self) -> zbus::fdo::Result<bool> {
+        let config = self.0.lock_config().await;
+        Ok(config.show_on_battery)
+    }
+
+    #[zbus(property)]
+    async fn set_show_on_battery(&self, enable: bool) -> zbus::Result<()> {
+        let mut config = self.0.lock_config().await;
+        self.0
+            .write_bytes(&slash_pkt_battery_saver(config.slash_type, enable))
+            .await?;
+        config.show_on_battery = enable;
+        config.write();
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn show_battery_warning(&self) -> zbus::fdo::Result<bool> {
+        let config = self.0.lock_config().await;
+        Ok(config.show_battery_warning)
+    }
+
+    #[zbus(property)]
+    async fn set_show_battery_warning(&self, enable: bool) -> zbus::Result<()> {
+        let mut config = self.0.lock_config().await;
+        self.0
+            .write_bytes(&slash_pkt_low_battery(config.slash_type, enable))
+            .await?;
+        config.show_battery_warning = enable;
+        config.write();
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn show_on_lid_closed(&self) -> zbus::fdo::Result<bool> {
+        let config = self.0.lock_config().await;
+        Ok(config.show_on_lid_closed)
+    }
+
+    #[zbus(property)]
+    async fn set_show_on_lid_closed(&self, enable: bool) -> zbus::Result<()> {
+        let mut config = self.0.lock_config().await;
+        self.0
+            .write_bytes(&slash_pkt_lid_closed(config.slash_type, enable))
+            .await?;
+        self.0
+            .write_bytes(&slash_pkt_save(config.slash_type))
+            .await?;
+        config.show_on_lid_closed = enable;
+        config.write();
+        Ok(())
+    }
 }
 
 impl Reloadable for SlashZbus {
@@ -174,17 +278,40 @@ impl Reloadable for SlashZbus {
         debug!("reloading slash settings");
         let config = self.0.lock_config().await;
         self.0
-            .write_bytes(&pkt_set_options(
+            .write_bytes(&slash_pkt_options(
                 config.slash_type,
-                config.slash_enabled,
-                config.slash_brightness,
-                config.slash_interval,
+                config.enabled,
+                config.brightness,
+                config.display_interval,
             ))
             .await
             .map_err(|err| {
-                warn!("ctrl_slash::set_options {}", err);
+                warn!("set_options {}", err);
             })
             .ok();
+
+        macro_rules! write_bytes_with_warning {
+            ($packet_fn:expr, $cfg:ident, $warn_msg:expr) => {
+                self.0
+                    .write_bytes(&$packet_fn(config.slash_type, config.$cfg))
+                    .await
+                    .map_err(|err| {
+                        warn!("{} {}", $warn_msg, err);
+                    })
+                    .ok();
+            };
+        }
+
+        write_bytes_with_warning!(slash_pkt_boot, show_on_boot, "show_on_boot");
+        write_bytes_with_warning!(slash_pkt_sleep, show_on_sleep, "show_on_sleep");
+        write_bytes_with_warning!(slash_pkt_shutdown, show_on_shutdown, "show_on_shutdown");
+        write_bytes_with_warning!(slash_pkt_battery_saver, show_on_battery, "show_on_battery");
+        write_bytes_with_warning!(
+            slash_pkt_low_battery,
+            show_battery_warning,
+            "show_battery_warning"
+        );
+
         Ok(())
     }
 }

asusd/src/aura_types.rs

@@ -104,23 +104,28 @@ impl DeviceHandle {
 
     /// Try AniMe Matrix HID. If one exists it is initialsed and returned.
     pub async fn maybe_anime_hid(
-        device: Arc<Mutex<HidRaw>>,
-        prod_id: &str,
+        _device: Arc<Mutex<HidRaw>>,
+        _prod_id: &str,
     ) -> Result<Self, RogError> {
-        debug!("Testing for HIDRAW AniMe");
-        let anime_type = AnimeType::from_dmi();
-        dbg!(prod_id);
-        if matches!(anime_type, AnimeType::Unsupported) || prod_id != "193b" {
-            log::info!("Unknown or invalid AniMe: {prod_id:?}, skipping");
-            return Err(RogError::NotFound("No anime-matrix device".to_string()));
-        }
-        info!("Found AniMe Matrix HIDRAW {anime_type:?}: {prod_id}");
+        // TODO: can't use HIDRAW for anime at the moment
+        Err(RogError::NotFound(
+            "Can't use anime over hidraw yet. Skip.".to_string(),
+        ))
 
-        let mut config = AniMeConfig::new().load();
-        config.anime_type = anime_type;
-        let mut anime = AniMe::new(Some(device), None, Arc::new(Mutex::new(config)));
-        anime.do_initialization().await?;
-        Ok(Self::AniMe(anime))
+        // debug!("Testing for HIDRAW AniMe");
+        // let anime_type = AnimeType::from_dmi();
+        // dbg!(prod_id);
+        // if matches!(anime_type, AnimeType::Unsupported) || prod_id != "193b"
+        // {     log::info!("Unknown or invalid AniMe: {prod_id:?},
+        // skipping");     return Err(RogError::NotFound("No
+        // anime-matrix device".to_string())); }
+        // info!("Found AniMe Matrix HIDRAW {anime_type:?}: {prod_id}");
+
+        // let mut config = AniMeConfig::new().load();
+        // config.anime_type = anime_type;
+        // let mut anime = AniMe::new(Some(device), None,
+        // Arc::new(Mutex::new(config))); anime.do_initialization().
+        // await?; Ok(Self::AniMe(anime))
     }
 
     pub async fn maybe_anime_usb() -> Result<Self, RogError> {

asusd/src/config.rs

@@ -1,95 +1,119 @@
-use config_traits::{StdConfig, StdConfigLoad1};
+use std::collections::HashMap;
+
+use config_traits::{StdConfig, StdConfigLoad2};
+use rog_platform::asus_armoury::FirmwareAttribute;
 use rog_platform::cpu::CPUEPP;
-use rog_platform::platform::ThrottlePolicy;
+use rog_platform::platform::PlatformProfile;
 use serde::{Deserialize, Serialize};
 
 const CONFIG_FILE: &str = "asusd.ron";
 
-#[derive(Deserialize, Serialize, Debug, PartialEq, PartialOrd)]
+/// Default value for base_charge_control_end_threshold when not present in config.
+/// Returns 0 so restore_charge_limit() skips restoration for upgraded configs.
+fn default_base_charge_limit() -> u8 {
+    0
+}
+
+#[derive(Default, Clone, Deserialize, Serialize, PartialEq)]
+pub struct Tuning {
+    pub enabled: bool,
+    pub group: HashMap<FirmwareAttribute, i32>,
+}
+type Tunings = HashMap<PlatformProfile, Tuning>;
+
+#[derive(Deserialize, Serialize, PartialEq)]
 pub struct Config {
     // The current charge limit applied
     pub charge_control_end_threshold: u8,
-    /// Save charge limit for restoring
-    #[serde(skip)]
+    /// Save charge limit for restoring after one-shot full charge
+    #[serde(default = "default_base_charge_limit")]
     pub base_charge_control_end_threshold: u8,
-    pub panel_od: bool,
-    pub boot_sound: bool,
-    pub mini_led_mode: bool,
     pub disable_nvidia_powerd_on_battery: bool,
     /// An optional command/script to run when power is changed to AC
     pub ac_command: String,
     /// An optional command/script to run when power is changed to battery
     pub bat_command: String,
     /// Set true if energy_performance_preference should be set if the
-    /// throttle/platform profile is changed
-    pub throttle_policy_linked_epp: bool,
-    /// Which throttle/profile to use on battery power
-    pub throttle_policy_on_battery: ThrottlePolicy,
+    /// platform profile is changed
+    pub platform_profile_linked_epp: bool,
+    /// Which platform profile to use on battery power
+    pub platform_profile_on_battery: PlatformProfile,
     /// Should the throttle policy be set on bat/ac change?
-    pub change_throttle_policy_on_battery: bool,
-    /// Which throttle/profile to use on AC power
-    pub throttle_policy_on_ac: ThrottlePolicy,
-    /// Should the throttle policy be set on bat/ac change?
-    pub change_throttle_policy_on_ac: bool,
-    /// The energy_performance_preference for this throttle/platform profile
-    pub throttle_quiet_epp: CPUEPP,
-    /// The energy_performance_preference for this throttle/platform profile
-    pub throttle_balanced_epp: CPUEPP,
-    /// The energy_performance_preference for this throttle/platform profile
-    pub throttle_performance_epp: CPUEPP,
-    /// Defaults to `None` if not supported
+    pub change_platform_profile_on_battery: bool,
+    /// Which platform profile to use on AC power
+    pub platform_profile_on_ac: PlatformProfile,
+    /// Should the platform profile be set on bat/ac change?
+    pub change_platform_profile_on_ac: bool,
+    /// The energy_performance_preference for this platform profile
+    pub profile_quiet_epp: CPUEPP,
+    /// The energy_performance_preference for this platform profile
+    pub profile_balanced_epp: CPUEPP,
+    /// The energy_performance_preference for this platform profile
+    pub profile_custom_epp: CPUEPP,
+    /// The energy_performance_preference for this platform profile
+    pub profile_performance_epp: CPUEPP,
+    pub ac_profile_tunings: Tunings,
+    pub dc_profile_tunings: Tunings,
+    pub armoury_settings: HashMap<FirmwareAttribute, i32>,
     #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub ppt_pl1_spl: Option<u8>,
-    /// Defaults to `None` if not supported
+    pub screenpad_gamma: Option<f32>,
     #[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>,
+    pub screenpad_sync_primary: Option<bool>,
     /// Temporary state for AC/Batt
     #[serde(skip)]
     pub last_power_plugged: u8,
 }
 
+impl Config {
+    pub fn select_tunings(&mut self, power_plugged: bool, profile: PlatformProfile) -> &mut Tuning {
+        let config = if power_plugged {
+            &mut self.ac_profile_tunings
+        } else {
+            &mut self.dc_profile_tunings
+        };
+        config.entry(profile).or_insert_with(Tuning::default)
+    }
+
+    pub fn select_tunings_ref(
+        &self,
+        power_plugged: bool,
+        profile: PlatformProfile,
+    ) -> Option<&Tuning> {
+        let config = if power_plugged {
+            &self.ac_profile_tunings
+        } else {
+            &self.dc_profile_tunings
+        };
+        config.get(&profile)
+    }
+}
+
 impl Default for Config {
     fn default() -> Self {
         Self {
             charge_control_end_threshold: 100,
+            // NOTE: This is intentionally 100 (not 0 like the serde default).
+            // New installs get 100 (no limit). Upgraded configs missing this
+            // field get 0 via serde, which skips restore_charge_limit().
             base_charge_control_end_threshold: 100,
-            panel_od: false,
-            boot_sound: false,
-            mini_led_mode: false,
             disable_nvidia_powerd_on_battery: true,
             ac_command: Default::default(),
             bat_command: Default::default(),
-            throttle_policy_linked_epp: true,
-            throttle_policy_on_battery: ThrottlePolicy::Quiet,
-            change_throttle_policy_on_battery: true,
-            throttle_policy_on_ac: ThrottlePolicy::Performance,
-            change_throttle_policy_on_ac: true,
-            throttle_quiet_epp: CPUEPP::Power,
-            throttle_balanced_epp: CPUEPP::BalancePower,
-            throttle_performance_epp: CPUEPP::Performance,
-            ppt_pl1_spl: Default::default(),
-            ppt_pl2_sppt: Default::default(),
-            ppt_fppt: Default::default(),
-            ppt_apu_sppt: Default::default(),
-            ppt_platform_sppt: Default::default(),
-            nv_dynamic_boost: Default::default(),
-            nv_temp_target: Default::default(),
+            platform_profile_linked_epp: true,
+            platform_profile_on_battery: PlatformProfile::Quiet,
+            change_platform_profile_on_battery: true,
+            platform_profile_on_ac: PlatformProfile::Performance,
+            change_platform_profile_on_ac: true,
+            profile_quiet_epp: CPUEPP::Power,
+            profile_balanced_epp: CPUEPP::BalancePower,
+            profile_performance_epp: CPUEPP::Performance,
+            profile_custom_epp: CPUEPP::Performance,
+            ac_profile_tunings: HashMap::default(),
+            dc_profile_tunings: HashMap::default(),
+            armoury_settings: HashMap::default(),
             last_power_plugged: Default::default(),
+            screenpad_gamma: Default::default(),
+            screenpad_sync_primary: Default::default(),
         }
     }
 }
@@ -99,8 +123,8 @@ impl StdConfig for Config {
         Config {
             charge_control_end_threshold: 100,
             disable_nvidia_powerd_on_battery: true,
-            throttle_policy_on_battery: ThrottlePolicy::Quiet,
-            throttle_policy_on_ac: ThrottlePolicy::Performance,
+            platform_profile_on_battery: PlatformProfile::Quiet,
+            platform_profile_on_ac: PlatformProfile::Performance,
             ac_command: String::new(),
             bat_command: String::new(),
             ..Default::default()
@@ -116,58 +140,128 @@ impl StdConfig for Config {
     }
 }
 
-impl StdConfigLoad1<Config507> for Config {}
+impl StdConfigLoad2<Config611, Config601> for Config {}
 
 #[derive(Deserialize, Serialize)]
-pub struct Config507 {
-    // The current charge limit applied
+pub struct Config611 {
     pub charge_control_end_threshold: u8,
+    #[serde(skip)]
+    pub base_charge_control_end_threshold: u8,
+    pub disable_nvidia_powerd_on_battery: bool,
+    pub ac_command: String,
+    pub bat_command: String,
+    pub platform_profile_linked_epp: bool,
+    pub platform_profile_on_battery: PlatformProfile,
+    pub change_platform_profile_on_battery: bool,
+    pub platform_profile_on_ac: PlatformProfile,
+    pub change_platform_profile_on_ac: bool,
+    pub profile_quiet_epp: CPUEPP,
+    pub profile_balanced_epp: CPUEPP,
+    pub profile_custom_epp: CPUEPP,
+    pub profile_performance_epp: CPUEPP,
+    pub ac_profile_tunings: Tunings,
+    pub dc_profile_tunings: Tunings,
+    pub armoury_settings: HashMap<FirmwareAttribute, i32>,
+    #[serde(skip)]
+    pub last_power_plugged: u8,
+}
+
+impl From<Config611> for Config {
+    fn from(c: Config611) -> Self {
+        let mut config = Self {
+            // Restore the base charge limit
+            charge_control_end_threshold: c.charge_control_end_threshold,
+            base_charge_control_end_threshold: c.charge_control_end_threshold,
+            disable_nvidia_powerd_on_battery: c.disable_nvidia_powerd_on_battery,
+            ac_command: c.ac_command,
+            bat_command: c.bat_command,
+            platform_profile_linked_epp: c.platform_profile_linked_epp,
+            platform_profile_on_battery: c.platform_profile_on_battery,
+            change_platform_profile_on_battery: c.change_platform_profile_on_battery,
+            platform_profile_on_ac: c.platform_profile_on_ac,
+            change_platform_profile_on_ac: c.change_platform_profile_on_ac,
+            profile_quiet_epp: c.profile_quiet_epp,
+            profile_balanced_epp: c.profile_balanced_epp,
+            profile_performance_epp: c.profile_performance_epp,
+            profile_custom_epp: c.profile_performance_epp,
+            last_power_plugged: c.last_power_plugged,
+            ac_profile_tunings: HashMap::default(),
+            dc_profile_tunings: HashMap::default(),
+            armoury_settings: HashMap::default(),
+            screenpad_gamma: None,
+            screenpad_sync_primary: Default::default(),
+        };
+
+        config.ac_profile_tunings = c.ac_profile_tunings;
+        config.dc_profile_tunings = c.dc_profile_tunings;
+        config.armoury_settings = c.armoury_settings;
+        config
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct Config601 {
+    pub charge_control_end_threshold: u8,
+    #[serde(skip)]
+    pub base_charge_control_end_threshold: u8,
     pub panel_od: bool,
+    pub boot_sound: bool,
     pub mini_led_mode: bool,
     pub disable_nvidia_powerd_on_battery: bool,
     pub ac_command: String,
     pub bat_command: String,
-    pub platform_policy_linked_epp: bool,
-    pub platform_policy_on_battery: ThrottlePolicy,
-    pub platform_policy_on_ac: ThrottlePolicy,
-    //
+    pub platform_profile_linked_epp: bool,
+    pub platform_profile_on_battery: PlatformProfile,
+    pub change_platform_profile_on_battery: bool,
+    pub platform_profile_on_ac: PlatformProfile,
+    pub change_platform_profile_on_ac: bool,
+    pub profile_quiet_epp: CPUEPP,
+    pub profile_balanced_epp: CPUEPP,
+    pub profile_performance_epp: CPUEPP,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_pl1_spl: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_pl2_sppt: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub ppt_pl3_fppt: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_fppt: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_apu_sppt: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub ppt_platform_sppt: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub nv_dynamic_boost: Option<u8>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
     pub nv_temp_target: Option<u8>,
+    #[serde(skip)]
+    pub last_power_plugged: u8,
 }
 
-impl From<Config507> for Config {
-    fn from(c: Config507) -> Self {
+impl From<Config601> for Config {
+    fn from(c: Config601) -> Self {
         Self {
             // Restore the base charge limit
             charge_control_end_threshold: c.charge_control_end_threshold,
             base_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,
-            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,
-            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,
+            platform_profile_linked_epp: c.platform_profile_linked_epp,
+            platform_profile_on_battery: c.platform_profile_on_battery,
+            change_platform_profile_on_battery: c.change_platform_profile_on_battery,
+            platform_profile_on_ac: c.platform_profile_on_ac,
+            change_platform_profile_on_ac: c.change_platform_profile_on_ac,
+            profile_quiet_epp: c.profile_quiet_epp,
+            profile_balanced_epp: c.profile_balanced_epp,
+            profile_performance_epp: c.profile_performance_epp,
+            profile_custom_epp: c.profile_performance_epp,
+            last_power_plugged: c.last_power_plugged,
+            ac_profile_tunings: HashMap::default(),
+            dc_profile_tunings: HashMap::default(),
+            armoury_settings: HashMap::default(),
+            screenpad_gamma: None,
+            screenpad_sync_primary: Default::default(),
         }
     }
 }

asusd/src/ctrl_backlight.rs

@@ -0,0 +1,348 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use config_traits::StdConfig;
+use log::{info, warn};
+use rog_platform::backlight::{Backlight, BacklightType};
+use tokio::sync::Mutex;
+use zbus::fdo::Error as FdoErr;
+use zbus::object_server::SignalEmitter;
+use zbus::{interface, Connection};
+
+use crate::config::Config;
+use crate::error::RogError;
+use crate::ASUS_ZBUS_PATH;
+
+#[derive(Clone)]
+pub struct CtrlBacklight {
+    backlights: Vec<Backlight>,
+    config: Arc<Mutex<Config>>,
+}
+
+impl CtrlBacklight {
+    pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> {
+        let mut backlights = Vec::new();
+
+        if let Ok(primary) = Backlight::new(BacklightType::Primary) {
+            info!("Found primary display backlight");
+            backlights.push(primary);
+        }
+
+        if let Ok(screenpad) = Backlight::new(BacklightType::Screenpad) {
+            info!("Found screenpad backlight");
+            backlights.push(screenpad);
+        }
+
+        if backlights.is_empty() {
+            return Err(RogError::MissingFunction("No backlights found".into()));
+        }
+
+        Ok(Self { backlights, config })
+    }
+
+    fn get_backlight(&self, device_type: &BacklightType) -> Option<&Backlight> {
+        self.backlights
+            .iter()
+            .find(|b| b.device_type() == device_type)
+    }
+
+    async fn set_brightness_with_sync(
+        &self,
+        device_type: &BacklightType,
+        level: i32,
+    ) -> Result<(), FdoErr> {
+        let sync = self
+            .config
+            .lock()
+            .await
+            .screenpad_sync_primary
+            .unwrap_or_default();
+
+        // If sync is enabled and we're setting screenpad brightness, set primary first
+        if sync && *device_type == BacklightType::Screenpad {
+            if let Some(primary) = self.get_backlight(&BacklightType::Primary) {
+                if let Ok(primary_max) = primary.get_max_brightness() {
+                    let primary_scaled = level * primary_max / 100;
+                    let _ = primary.set_brightness(primary_scaled);
+                }
+            }
+        }
+
+        if let Some(backlight) = self.get_backlight(device_type) {
+            let max = backlight.get_max_brightness().map_err(|e| {
+                warn!("Failed to get max brightness: {}", e);
+                FdoErr::Failed(format!("Failed to get max brightness: {}", e))
+            })?;
+
+            let gamma = self.config.lock().await.screenpad_gamma.unwrap_or(1.0);
+            let scaled = if *device_type == BacklightType::Screenpad {
+                // Apply non-linear scaling with the configurable gamma value only for Screenpad
+                let normalized_level = level as f32 / 100.0;
+                let gamma_corrected = normalized_level.powf(gamma);
+                (gamma_corrected * max as f32) as i32
+            } else {
+                // Linear scaling for other devices
+                level * max / 100
+            };
+
+            backlight.set_brightness(scaled).map_err(|e| {
+                warn!("Failed to set brightness: {}", e);
+                FdoErr::Failed(format!("Failed to set brightness: {}", e))
+            })?;
+
+            // If sync is enabled and we're setting primary brightness, set screenpad
+            // afterward
+            if sync && *device_type == BacklightType::Primary {
+                for other in self
+                    .backlights
+                    .iter()
+                    .filter(|b| b.device_type() != device_type)
+                {
+                    if let Ok(other_max) = other.get_max_brightness() {
+                        let other_scaled = if other.device_type() == &BacklightType::Screenpad {
+                            // Apply gamma only to Screenpad
+                            let normalized_level = level as f32 / 100.0;
+                            let gamma_corrected = normalized_level.powf(gamma);
+                            (gamma_corrected * other_max as f32) as i32
+                        } else {
+                            // Linear scaling for other devices
+                            level * other_max / 100
+                        };
+                        let _ = other.set_brightness(other_scaled);
+                    }
+                }
+            }
+
+            Ok(())
+        } else {
+            Err(FdoErr::NotSupported(format!(
+                "Backlight {:?} not found",
+                device_type
+            )))
+        }
+    }
+
+    async fn get_brightness_percent(&self, device_type: &BacklightType) -> Result<i32, FdoErr> {
+        if let Some(backlight) = self.get_backlight(device_type) {
+            let brightness = backlight.get_brightness().map_err(|e| {
+                warn!("Failed to get brightness: {}", e);
+                FdoErr::Failed(format!("Failed to get brightness: {}", e))
+            })?;
+
+            let max = backlight.get_max_brightness().map_err(|e| {
+                warn!("Failed to get max brightness: {}", e);
+                FdoErr::Failed(format!("Failed to get max brightness: {}", e))
+            })?;
+
+            if *device_type == BacklightType::Screenpad {
+                let gamma = self.config.lock().await.screenpad_gamma.unwrap_or(1.0);
+                let normalized = brightness as f32 / max as f32;
+                let corrected = normalized.powf(1.0 / gamma);
+                Ok((corrected * 100.0).round() as i32)
+            } else {
+                Ok(brightness * 100 / max)
+            }
+        } else {
+            Err(FdoErr::NotSupported(format!(
+                "Backlight {:?} not found",
+                device_type
+            )))
+        }
+    }
+
+    pub async fn start_watch_primary(&self) -> Result<(), RogError> {
+        if self.get_backlight(&BacklightType::Screenpad).is_none() {
+            return Ok(());
+        }
+
+        if let Some(sync) = self.config.lock().await.screenpad_sync_primary {
+            if !sync {
+                return Ok(());
+            }
+        }
+
+        if let Some(backlight) = self.get_backlight(&BacklightType::Primary) {
+            let watch = backlight.monitor_brightness()?;
+
+            let backlights = self.clone();
+            tokio::spawn(async move {
+                let mut last_level = 0;
+                let mut buffer = [0; 32];
+                use futures_lite::StreamExt;
+                if let Ok(mut stream) = watch.into_event_stream(&mut buffer) {
+                    loop {
+                        let _ = stream.next().await;
+
+                        let sync = backlights.config.lock().await.screenpad_sync_primary;
+                        if let Some(sync) = sync {
+                            if !sync {
+                                continue;
+                            }
+                        } else if backlights
+                            .config
+                            .lock()
+                            .await
+                            .screenpad_sync_primary
+                            .is_none()
+                        {
+                            continue;
+                        }
+
+                        let level = backlights
+                            .get_brightness_percent(&BacklightType::Primary)
+                            .await
+                            .unwrap_or(60);
+                        if last_level != level {
+                            last_level = level;
+                            backlights
+                                .set_brightness_with_sync(&BacklightType::Screenpad, level)
+                                .await
+                                .ok();
+                        }
+
+                        // other processes cause "MODIFY" event and make this spin 100%, so sleep
+                        tokio::time::sleep(Duration::from_millis(300)).await;
+                    }
+                    // watch
+                    //     .into_event_stream(&mut buffer)
+                    //     .unwrap()
+                    //     .for_each(|_| async {})
+                    //     .await;
+                }
+            });
+        }
+
+        Ok(())
+    }
+}
+
+#[interface(name = "xyz.ljones.Backlight")]
+impl CtrlBacklight {
+    #[zbus(property)]
+    async fn screenpad_sync_with_primary(&self) -> bool {
+        self.config
+            .lock()
+            .await
+            .screenpad_sync_primary
+            .unwrap_or_default()
+    }
+
+    #[zbus(property)]
+    async fn set_screenpad_sync_with_primary(&self, sync: bool) -> Result<(), zbus::Error> {
+        self.config.lock().await.screenpad_sync_primary = Some(sync);
+        self.config.lock().await.write();
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn screenpad_gamma(&self) -> String {
+        (self.config.lock().await.screenpad_gamma.unwrap_or(1.0)).to_string()
+    }
+
+    #[zbus(property)]
+    async fn set_screenpad_gamma(&self, value: &str) -> Result<(), zbus::Error> {
+        let gamma: f32 = value
+            .parse()
+            .map_err(|_| FdoErr::Failed("Invalid gamma value, must be a valid number".into()))?;
+
+        if gamma < 0.1 {
+            return Err(FdoErr::Failed("Gamma value must be greater than 0".into()).into());
+        }
+        if gamma > 2.0 {
+            return Err(FdoErr::Failed("Gamma value must be 2.0 or less".into()).into());
+        }
+        self.config.lock().await.screenpad_gamma = Some(gamma);
+        self.config.lock().await.write();
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn primary_brightness(&self) -> Result<i32, FdoErr> {
+        self.get_brightness_percent(&BacklightType::Primary).await
+    }
+
+    #[zbus(property)]
+    async fn set_primary_brightness(
+        &self,
+        #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
+        level: i32,
+    ) -> Result<(), zbus::Error> {
+        if level > 100 {
+            return Err(FdoErr::Failed("Brightness level must be 0-100".into()).into());
+        }
+
+        self.set_brightness_with_sync(&BacklightType::Primary, level)
+            .await?;
+        self.primary_brightness_changed(&ctxt).await?;
+
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn screenpad_brightness(&self) -> Result<i32, FdoErr> {
+        self.get_brightness_percent(&BacklightType::Screenpad).await
+    }
+
+    #[zbus(property)]
+    async fn set_screenpad_brightness(
+        &self,
+        // #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
+        level: i32,
+    ) -> Result<(), zbus::Error> {
+        if level > 100 {
+            return Err(FdoErr::Failed("Brightness level must be 0-100".into()).into());
+        }
+
+        self.set_brightness_with_sync(&BacklightType::Screenpad, level)
+            .await?;
+        // self.screenpad_brightness_changed(&ctxt).await?;
+
+        Ok(())
+    }
+
+    #[zbus(property)]
+    async fn screenpad_power(&self) -> Result<bool, FdoErr> {
+        if let Some(backlight) = self.get_backlight(&BacklightType::Screenpad) {
+            let power = backlight.get_bl_power().map_err(|e| {
+                warn!("Failed to get backlight power: {}", e);
+                FdoErr::Failed(format!("Failed to get backlight power: {}", e))
+            })?;
+            Ok(power == 0)
+        } else {
+            Err(FdoErr::NotSupported("Screenpad backlight not found".into()))
+        }
+    }
+
+    #[zbus(property)]
+    async fn set_screenpad_power(
+        &self,
+        #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
+        power: bool,
+    ) -> Result<(), zbus::Error> {
+        if let Some(backlight) = self.get_backlight(&BacklightType::Screenpad) {
+            backlight
+                .set_bl_power(if power { 0 } else { 1 })
+                .map_err(|e| {
+                    warn!("Failed to set backlight power: {}", e);
+                    FdoErr::Failed(format!("Failed to set backlight power: {}", e))
+                })?;
+            self.screenpad_power_changed(&ctxt).await?;
+            Ok(())
+        } else {
+            Err(FdoErr::NotSupported("Screenpad backlight not found".into()).into())
+        }
+    }
+}
+
+impl crate::ZbusRun for CtrlBacklight {
+    async fn add_to_server(self, server: &mut Connection) {
+        Self::add_to_server_helper(self, ASUS_ZBUS_PATH, server).await;
+    }
+}
+
+impl crate::Reloadable for CtrlBacklight {
+    async fn reload(&mut self) -> Result<(), RogError> {
+        info!("Reloading backlight settings");
+        Ok(())
+    }
+}

asusd/src/ctrl_fancurves.rs

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

asusd/src/daemon.rs

@@ -2,19 +2,26 @@ use std::env;
 use std::error::Error;
 use std::sync::Arc;
 
-use ::zbus::export::futures_util::lock::Mutex;
 use ::zbus::Connection;
+use asusd::asus_armoury::{start_attributes_zbus, ArmouryAttributeRegistry};
 use asusd::aura_manager::DeviceManager;
 use asusd::config::Config;
+use asusd::ctrl_backlight::CtrlBacklight;
 use asusd::ctrl_fancurves::CtrlFanCurveZbus;
 use asusd::ctrl_platform::CtrlPlatform;
-use asusd::{print_board_info, start_tasks, CtrlTask, DBUS_NAME};
-use config_traits::{StdConfig, StdConfigLoad1};
+use asusd::{print_board_info, start_tasks, CtrlTask, ZbusRun, DBUS_NAME};
+use config_traits::{StdConfig, StdConfigLoad2};
 use log::{error, info};
+use rog_platform::asus_armoury::FirmwareAttributes;
+use rog_platform::platform::RogPlatform;
+use rog_platform::power::AsusPower;
+use tokio::sync::Mutex;
 use zbus::fdo::ObjectManager;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Starting asusd daemon...");
+
     // console_subscriber::init();
     let mut logger = env_logger::Builder::new();
     logger
@@ -56,50 +63,93 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
     // println!("{:?}", supported.supported_functions());
 
     // Start zbus server
-    let mut connection = Connection::system().await?;
-    connection
-        .object_server()
-        .at("/", ObjectManager)
-        .await
-        .unwrap();
+    let mut server = Connection::system().await?;
+    if let Err(e) = server.object_server().at("/", ObjectManager).await {
+        error!("Failed to register ObjectManager at root '/': {e:?}");
+    }
 
     let config = Config::new().load();
     let cfg_path = config.file_path();
     let config = Arc::new(Mutex::new(config));
 
     // supported.add_to_server(&mut connection).await;
+    let platform = RogPlatform::new()?; // TODO: maybe needs async mutex?
+    let power = AsusPower::new()?; // TODO: maybe needs async mutex?
+    let attributes = FirmwareAttributes::new();
+    let armoury_registry = match start_attributes_zbus(
+        &server,
+        platform.clone(),
+        power.clone(),
+        attributes.clone(),
+        config.clone(),
+    )
+    .await
+    {
+        Ok(registry) => {
+            info!("attribute on zbus initialized");
+            registry
+        }
+        Err(e) => {
+            error!("Failed to initialize firmware attributes over zbus: {e:?}");
+            ArmouryAttributeRegistry::default()
+        }
+    };
 
     match CtrlFanCurveZbus::new() {
         Ok(ctrl) => {
-            let sig_ctx = CtrlFanCurveZbus::signal_context(&connection)?;
-            start_tasks(ctrl, &mut connection, sig_ctx).await?;
+            info!("FanCurves: found supported fancurves");
+            let sig_ctx = CtrlFanCurveZbus::signal_context(&server)?;
+            start_tasks(ctrl, &mut server, sig_ctx).await?;
+            info!("FanCurves: initialized");
         }
         Err(err) => {
             error!("FanCurves: {}", err);
         }
     }
 
+    match CtrlBacklight::new(config.clone()) {
+        Ok(backlight) => {
+            info!("Backlight: found supported backlight");
+            backlight.start_watch_primary().await?;
+            backlight.add_to_server(&mut server).await;
+            info!("Backlight: initialized");
+        }
+        Err(err) => {
+            error!("Backlight: {}", err);
+        }
+    }
+
     match CtrlPlatform::new(
+        platform,
+        power,
+        attributes,
         config.clone(),
         &cfg_path,
-        CtrlPlatform::signal_context(&connection)?,
+        CtrlPlatform::signal_context(&server)?,
+        server.clone(),
+        armoury_registry,
     ) {
         Ok(ctrl) => {
-            let sig_ctx = CtrlPlatform::signal_context(&connection)?;
-            start_tasks(ctrl, &mut connection, sig_ctx).await?;
+            info!("CtrlPlatform: initialized");
+            let sig_ctx = CtrlPlatform::signal_context(&server)?;
+            start_tasks(ctrl, &mut server, sig_ctx).await?;
+            info!("CtrlPlatform: tasks started");
         }
         Err(err) => {
             error!("CtrlPlatform: {}", err);
         }
     }
 
-    let _ = DeviceManager::new(connection.clone()).await?;
+    let _ = DeviceManager::new(server.clone()).await?;
+
+    info!("DeviceManager initialized");
 
     // Request dbus name after finishing initalizing all functions
-    connection.request_name(DBUS_NAME).await?;
+    server.request_name(DBUS_NAME).await?;
 
+    info!("Startup success on dbus name {DBUS_NAME}: begining dbus server loop");
     loop {
         // This is just a blocker to idle and ensure the reator reacts
-        connection.executor().tick().await;
+        server.executor().tick().await;
     }
 }

asusd/src/error.rs

@@ -142,3 +142,10 @@ impl From<RogError> for zbus::fdo::Error {
         zbus::fdo::Error::Failed(format!("{}", err))
     }
 }
+
+impl From<RogError> for zbus::Error {
+    #[inline]
+    fn from(err: RogError) -> Self {
+        zbus::Error::Failure(format!("{}", err))
+    }
+}

asusd/src/lib.rs

@@ -1,11 +1,13 @@
 #![deny(unused_must_use)]
 /// Configuration loading, saving
 pub mod config;
+pub mod ctrl_backlight;
 /// Control platform profiles + fan-curves if available
 pub mod ctrl_fancurves;
 /// Control ASUS bios function such as boot sound, Optimus/Dedicated gfx mode
 pub mod ctrl_platform;
 
+pub mod asus_armoury;
 pub mod aura_anime;
 pub mod aura_laptop;
 pub mod aura_manager;
@@ -30,9 +32,11 @@ use zbus::Connection;
 use crate::error::RogError;
 
 const CONFIG_PATH_BASE: &str = "/etc/asusd/";
-pub static DBUS_NAME: &str = "org.asuslinux.Daemon";
-pub static DBUS_PATH: &str = "/org/asuslinux/Daemon";
-pub static DBUS_IFACE: &str = "org.asuslinux.Daemon";
+pub const ASUS_ZBUS_PATH: &str = "/xyz/ljones";
+
+pub static DBUS_NAME: &str = "xyz.ljones.Asusd";
+pub static DBUS_PATH: &str = "/xyz/ljones/Daemon";
+pub static DBUS_IFACE: &str = "xyz.ljones.Asusd";
 
 /// This macro adds a function which spawns an `inotify` task on the passed in
 /// `Executor`.
@@ -64,7 +68,7 @@ macro_rules! task_watch_item {
             &self,
             signal_ctxt: SignalEmitter<'static>,
         ) -> Result<(), RogError> {
-            use zbus::export::futures_util::StreamExt;
+            use futures_util::StreamExt;
 
             let ctrl = self.clone();
             concat_idents::concat_idents!(watch_fn = monitor_, $name {
@@ -104,7 +108,7 @@ macro_rules! task_watch_item_notify {
             &self,
             signal_ctxt: SignalEmitter<'static>,
         ) -> Result<(), RogError> {
-            use zbus::export::futures_util::StreamExt;
+            use futures_util::StreamExt;
 
             let ctrl = self.clone();
             concat_idents::concat_idents!(watch_fn = monitor_, $name {

config-traits/src/lib.rs

@@ -203,7 +203,7 @@ macro_rules! std_config_load {
         /// new one created
         pub trait $trait_name<$($generic),*>
         where
-            Self: $crate::StdConfig +std::fmt::Debug + DeserializeOwned + Serialize,
+            Self: $crate::StdConfig + DeserializeOwned + Serialize,
             $($generic: DeserializeOwned + Into<Self>),*
         {
             fn load(mut self) -> Self {

cpuctl/Cargo.toml

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

cpuctl/src/lib.rs

@@ -1,14 +0,0 @@
-pub fn add(left: usize, right: usize) -> usize {
-    left + right
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}

data/asusd.conf

@@ -3,24 +3,24 @@
           "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
     <policy group="adm">
-        <allow send_destination="org.asuslinux.Daemon"/>
-        <allow receive_sender="org.asuslinux.Daemon"/>
+        <allow send_destination="xyz.ljones.Asusd"/>
+        <allow receive_sender="xyz.ljones.Asusd"/>
     </policy>
     <policy group="sudo">
-        <allow send_destination="org.asuslinux.Daemon"/>
-        <allow receive_sender="org.asuslinux.Daemon"/>
+        <allow send_destination="xyz.ljones.Asusd"/>
+        <allow receive_sender="xyz.ljones.Asusd"/>
     </policy>
     <policy group="users">
-        <allow send_destination="org.asuslinux.Daemon"/>
-        <allow receive_sender="org.asuslinux.Daemon"/>
+        <allow send_destination="xyz.ljones.Asusd"/>
+        <allow receive_sender="xyz.ljones.Asusd"/>
     </policy>
     <policy group="wheel">
-        <allow send_destination="org.asuslinux.Daemon"/>
-        <allow receive_sender="org.asuslinux.Daemon"/>
+        <allow send_destination="xyz.ljones.Asusd"/>
+        <allow receive_sender="xyz.ljones.Asusd"/>
     </policy>
     <policy user="root">
-        <allow own="org.asuslinux.Daemon"/>
-        <allow send_destination="org.asuslinux.Daemon"/>
-        <allow receive_sender="org.asuslinux.Daemon"/>
+        <allow own="xyz.ljones.Asusd"/>
+        <allow send_destination="xyz.ljones.Asusd"/>
+        <allow receive_sender="xyz.ljones.Asusd"/>
     </policy>
 </busconfig>

data/asusd.rules

@@ -9,11 +9,14 @@ ENV{DMI_FAMILY}=="*Strix*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Vivo*ook*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*Zenbook*", GOTO="asusd_start"
 ENV{DMI_FAMILY}=="*ProArt*", GOTO="asusd_start"
+ENV{DMI_FAMILY}=="*TX Air*", GOTO="asusd_start"
+ENV{DMI_FAMILY}=="*TX Gaming*", GOTO="asusd_start"
+ENV{DMI_FAMILY}=="*EXPERTBOOK*", GOTO="asusd_start"
 # No match so
 GOTO="asusd_end"
 
 LABEL="asusd_start"
-ACTION=="add|change", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}="asusd.service"
-ACTION=="add|remove", DRIVER=="asus-nb-wmi", TAG+="systemd", RUN+="systemctl restart asusd.service"
+ACTION=="add|change", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}+="asusd.service"
+ACTION=="add|remove", DRIVER=="asus-nb-wmi", TAG+="systemd", ENV{SYSTEMD_WANTS}+="asusd.service"
 
 LABEL="asusd_end"

data/asusd.service

@@ -6,13 +6,17 @@ After=nvidia-powerd.service systemd-udevd.service
 
 [Service]
 Environment=IS_SERVICE=1
-Environment=RUST_LOG="info"
+# Reduce noisy span logs while keeping useful debug info for asusd and related crates.
+# Keep global level at info but allow debug for our crates; silence tracing::span (very noisy)
+# RUST_LOG format: <module>=<level>,...  (levels: error,warn,info,debug,trace)
+Environment=RUST_LOG="info,asusd=debug,rog_platform=debug,tracing::span=error,zbus::object_server=error,zbus::connection::handshake::common=error,zbus::connection::handshake::client=error"
 # required to prevent init issues with hid_asus and MCU
 ExecStartPre=/bin/sleep 1
 ExecStart=/usr/bin/asusd
 Restart=on-failure
 RestartSec=1
 Type=dbus
-BusName=org.asuslinux.Daemon
+BusName=xyz.ljones.Asusd
 SELinuxContext=system_u:system_r:unconfined_t:s0
 #SELinuxContext=system_u:object_r:modules_object_t:s0
+TimeoutSec=10

design-patterns.md

@@ -135,7 +135,7 @@ impl crate::ZbusAdd for CtrlAnimeZbus {
     }
 }
 
-#[dbus_interface(name = "org.asuslinux.Daemon")]
+#[dbus_interface(name = "xyz.ljones.Asusd")]
 impl CtrlAnimeZbus {
     async fn <zbus method>() {
        let lock = self.inner.lock().await;

distro-packaging/asusctl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package asus-nb-ctrl
 #
-# Copyright (c) 2020-2021 Luke Jones <luke@ljones.dev>
+# Copyright (c) 2020-2025 Luke Jones <luke@ljones.dev>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,42 +20,44 @@
 %global debug_package %{nil}
 %endif
 
+%define version 6.3.1
 %define specrelease %{?dist}
-%define pkg_release 3%{specrelease}
+%define pkg_release 1%{specrelease}
 
 # Use hardening ldflags.
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
-Name:           asusctl
-Version:        6.0.7
+Name:    asusctl
+Version: %{version}
 Release: %{pkg_release}
-Summary:        Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
-License:        MPLv2
+Summary: Control fan speeds, LEDs, graphics modes, and charge levels for ASUS notebooks
+License: MPLv2
 
-Group:          System Environment/Kernel
+Group:   System Environment/Kernel
 
-URL:            https://gitlab.com/asus-linux/asusctl
-Source:         %{name}-%{version}.tar.gz
-Source1:        vendor_%{name}_%{version}.tar.xz
-Source2:        cargo-config
+URL:     https://gitlab.com/asus-linux/asusctl
+Source:  https://gitlab.com/asus-linux/asusctl/-/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  cargo
+%if %{defined fedora}
 BuildRequires:  rust-packaging
 BuildRequires:  systemd-rpm-macros
+%else
+BuildRequires:  cargo-packaging
+%endif
+BuildRequires:  git
 BuildRequires:  clang-devel
+BuildRequires:  cargo
 BuildRequires:  cmake
 BuildRequires:  rust
 BuildRequires:  rust-std-static
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(gbm)
+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:  pkgconfig(fontconfig)
 BuildRequires:  desktop-file-utils
 
-# expat-devel pcre2-devel
-
 %description
 asus-nb-ctrl is a utility for Linux to control many aspects of various
 ASUS laptops but can also be used with non-Asus laptops with reduced features.
@@ -66,38 +68,93 @@ asus-nb-ctrl enables third-party apps to use the above with dbus methods.
 
 %package rog-gui
 Summary: An experimental GUI for %{name}
+Requires: %{name} = %{version}-%{release}
 
 %description rog-gui
 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
-
-mv Cargo.lock{,.bak}
-%cargo_prep
-mv Cargo.lock{.bak,}
-sed -i 's|replace-with = "local-registry"|replace-with = "vendored-sources"|' .cargo/config
-cat %{SOURCE2} >> .cargo/config
+mkdir -p .cargo
+cat > .cargo/config.toml << 'EOF'
+[term]
+verbose = true
+[net]
+offline = false
+EOF
 
 %build
 export RUSTFLAGS="%{rustflags}"
-%cargo_build
-#cargo build --release --frozen --offline --config .cargo/config.toml
+%if %{defined fedora}
+/usr/bin/cargo build --release --locked
+%else
+/usr/bin/cargo auditable build --release --locked
+%endif
 
 %install
 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
+%define _target_dir target/release
 
-desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.desktop
+# Install binaries
+install -D -m 0755 %{_target_dir}/asusd %{buildroot}%{_bindir}/asusd
+install -D -m 0755 %{_target_dir}/asusd-user %{buildroot}%{_bindir}/asusd-user
+install -D -m 0755 %{_target_dir}/asusctl %{buildroot}%{_bindir}/asusctl
+install -D -m 0755 %{_target_dir}/rog-control-center %{buildroot}%{_bindir}/rog-control-center
+
+# Install systemd units
+install -D -m 0644 data/asusd.service %{buildroot}%{_unitdir}/asusd.service
+install -D -m 0644 data/asusd-user.service %{buildroot}%{_userunitdir}/asusd-user.service
+
+# Install udev rules
+install -D -m 0644 data/asusd.rules %{buildroot}%{_udevrulesdir}/99-asusd.rules
+
+# Install dbus config
+install -D -m 0644 data/asusd.conf %{buildroot}%{_datadir}/dbus-1/system.d/asusd.conf
+
+# Install asusd data
+install -D -m 0644 rog-aura/data/aura_support.ron %{buildroot}%{_datadir}/asusd/aura_support.ron
+cp -r rog-anime/data/anime %{buildroot}%{_datadir}/asusd/
+
+# Install rog-gui data
+install -D -m 0644 rog-control-center/data/rog-control-center.desktop %{buildroot}%{_datadir}/applications/rog-control-center.desktop
+install -D -m 0644 rog-control-center/data/rog-control-center.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/rog-control-center.png
+mkdir -p %{buildroot}%{_datadir}/rog-gui/layouts
+cp -r rog-aura/data/layouts/*.ron %{buildroot}%{_datadir}/rog-gui/layouts/
+
+# Install icons
+install -D -m 0644 data/icons/asus_notif_yellow.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_yellow.png
+install -D -m 0644 data/icons/asus_notif_green.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_green.png
+install -D -m 0644 data/icons/asus_notif_blue.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_blue.png
+install -D -m 0644 data/icons/asus_notif_red.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_red.png
+install -D -m 0644 data/icons/asus_notif_orange.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_orange.png
+install -D -m 0644 data/icons/asus_notif_white.png %{buildroot}%{_datadir}/icons/hicolor/512x512/apps/asus_notif_white.png
+install -D -m 0644 data/icons/scalable/gpu-compute.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-compute.svg
+install -D -m 0644 data/icons/scalable/gpu-hybrid.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-hybrid.svg
+install -D -m 0644 data/icons/scalable/gpu-integrated.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-integrated.svg
+install -D -m 0644 data/icons/scalable/gpu-nvidia.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-nvidia.svg
+install -D -m 0644 data/icons/scalable/gpu-vfio.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/gpu-vfio.svg
+install -D -m 0644 data/icons/scalable/notification-reboot.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/status/notification-reboot.svg
+
+# Install docs
+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
+
+# Install LICENSE to asusctl datadir
+install -D -m 0644 LICENSE %{buildroot}%{_datadir}/asusctl/LICENSE
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/rog-control-center.desktop
+
+%post
+%systemd_post asusd.service
+
+%preun
+%systemd_preun asusd.service
+
+%postun
+%systemd_postun_with_restart asusd.service
 
 %files
 %license LICENSE
@@ -107,8 +164,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.d
 %{_unitdir}/asusd.service
 %{_userunitdir}/asusd-user.service
 %{_udevrulesdir}/99-asusd.rules
-#%dir %{_sysconfdir}/asusd/
-%{_datadir}/asusd/aura_support.ron
 %{_datadir}/dbus-1/system.d/asusd.conf
 %{_datadir}/icons/hicolor/512x512/apps/asus_notif_yellow.png
 %{_datadir}/icons/hicolor/512x512/apps/asus_notif_green.png
@@ -123,6 +178,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/rog-control-center.d
 %{_datadir}/icons/hicolor/scalable/status/gpu-vfio.svg
 %{_datadir}/icons/hicolor/scalable/status/notification-reboot.svg
 %{_docdir}/%{name}/
+%{_datadir}/asusctl/
 %{_datadir}/asusd/
 
 %files rog-gui

extra/index.html

@@ -0,0 +1,23 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <title>asusctl docs</title>
+  <!-- Redirect to the generated crate docs -->
+  <meta http-equiv="refresh" content="0;url=asusctl/index.html">
+  <link rel="canonical" href="asusctl/index.html">
+  <style>
+    body { font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial; color:#222; display:flex; align-items:center; justify-content:center; height:100vh; margin:0 }
+    .box { text-align:center }
+    a { color: #0366d6 }
+  </style>
+</head>
+<body>
+  <div class="box">
+    <h1>asusctl documentation</h1>
+    <p>Redirecting to the generated docs — if your browser doesn't redirect automatically, <a href="asusctl/index.html">click here</a>.</p>
+    <p>If you expected a different landing page, update <code>extra/index.html</code> accordingly.</p>
+  </div>
+</body>
+</html>

rog-anime/Cargo.toml

@@ -30,7 +30,6 @@ log.workspace = true
 serde.workspace = true
 
 glam.workspace = true
-typeshare.workspace = true
 
 zbus = { workspace = true, optional = true }
 

rog-anime/src/data.rs

@@ -6,7 +6,6 @@ use std::time::{Duration, Instant};
 use dmi_id::DMIID;
 use log::info;
 use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};
 
@@ -23,15 +22,19 @@ const BLOCK_END: usize = 634;
 const PANE_LEN: usize = BLOCK_END - BLOCK_START;
 
 /// First packet is for GA401 + GA402
-pub const USB_PREFIX1: [u8; 7] = [0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02];
+pub const USB_PREFIX1: [u8; 7] = [
+    0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02,
+];
 /// Second packet is for GA401 + GA402
-pub const USB_PREFIX2: [u8; 7] = [0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02];
+pub const USB_PREFIX2: [u8; 7] = [
+    0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02,
+];
 /// Third packet is for GA402 matrix
-pub const USB_PREFIX3: [u8; 7] = [0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02];
+pub const USB_PREFIX3: [u8; 7] = [
+    0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02,
+];
 
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
-#[typeshare]
 #[derive(Default, Deserialize, PartialEq, Eq, Clone, Copy, Serialize, Debug)]
 pub struct Animations {
     pub boot: AnimBooting,
@@ -41,9 +44,7 @@ pub struct Animations {
 }
 
 // TODO: move this out
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[typeshare]
 #[derive(Debug, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub struct DeviceState {
     pub display_enabled: bool,
@@ -56,13 +57,14 @@ pub struct DeviceState {
     pub brightness_on_battery: Brightness,
 }
 
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize, Default)]
 pub enum AnimeType {
     GA401,
     GA402,
     GU604,
+    G635L,
+    G835L,
     #[default]
     Unsupported,
 }
@@ -71,12 +73,21 @@ impl FromStr for AnimeType {
     type Err = AnimeError;
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        Ok(match s {
-            "ga401" | "GA401" => Self::GA401,
-            "ga402" | "GA402" => Self::GA402,
-            "gu604" | "GU604" => Self::GU604,
-            _ => Self::Unsupported,
-        })
+        let dmi = s.to_uppercase();
+
+        if dmi.contains("GA401") {
+            return Ok(Self::GA401);
+        } else if dmi.contains("GA402") {
+            return Ok(Self::GA402);
+        } else if dmi.contains("GU604") {
+            return Ok(Self::GU604);
+        } else if dmi.contains("G635L") {
+            return Ok(Self::G635L);
+        } else if dmi.contains("G835L") {
+            return Ok(Self::G835L);
+        }
+
+        Ok(Self::Unsupported)
     }
 }
 
@@ -89,6 +100,8 @@ impl AnimeType {
             AnimeType::GA402
         } else if board_name.contains("GU604V") {
             AnimeType::GU604
+        } else if board_name.contains("G635L") || board_name.contains("G635L") {
+            AnimeType::G635L
         } else {
             AnimeType::Unsupported
         }
@@ -98,6 +111,7 @@ impl AnimeType {
     pub fn width(&self) -> usize {
         match self {
             AnimeType::GU604 => 70,
+            AnimeType::G835L => 74,
             _ => 74,
         }
     }
@@ -107,6 +121,7 @@ impl AnimeType {
         match self {
             AnimeType::GA401 => 36,
             AnimeType::GU604 => 43,
+            AnimeType::G835L => 39,
             _ => 39,
         }
     }
@@ -116,6 +131,7 @@ impl AnimeType {
         match self {
             AnimeType::GA401 => PANE_LEN * 2,
             AnimeType::GU604 => PANE_LEN * 3,
+            AnimeType::G835L => PANE_LEN * 3,
             _ => PANE_LEN * 3,
         }
     }
@@ -180,7 +196,13 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
 
         let mut buffers = match anime.anime {
             AnimeType::GA401 => vec![[0; 640]; 2],
-            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported => vec![[0; 640]; 3],
+            AnimeType::GA402
+            | AnimeType::GU604
+            | AnimeType::G635L
+            | AnimeType::G835L
+            | AnimeType::Unsupported => {
+                vec![[0; 640]; 3]
+            }
         };
 
         for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() {
@@ -191,7 +213,11 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
 
         if matches!(
             anime.anime,
-            AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported
+            AnimeType::GA402
+                | AnimeType::GU604
+                | AnimeType::G635L
+                | AnimeType::G835L
+                | AnimeType::Unsupported
         ) {
             buffers[2][..7].copy_from_slice(&USB_PREFIX3);
         }

rog-anime/src/image.rs

@@ -169,7 +169,7 @@ impl AnimeImage {
                     // first 5 rows for GA401 are always at X = 0
                     return 0;
                 }
-                (y + 1) / 2 - 3
+                y.div_ceil(2) - 3
             }
             AnimeType::GU604 => {
                 // first 9 rows start at zero
@@ -185,7 +185,7 @@ impl AnimeImage {
                     return 0;
                 }
                 // and then their offset grows by one every two rows
-                (y + 1) / 2 - 5
+                y.div_ceil(2) - 5
             }
         }
     }
@@ -213,7 +213,7 @@ impl AnimeImage {
                     // First 5 rows for GA401 are always 33 physical LEDs long
                     return 33;
                 }
-                36 - (y + 1) / 2
+                36 - y.div_ceil(2)
             }
             AnimeType::GU604 => {
                 if y <= 9 {
@@ -321,7 +321,9 @@ impl AnimeImage {
             let pos = Vec3::new(led.x(), led.y(), 1.0);
             let x0 = led_from_px.mul_vec3(pos + Vec3::new(0.0, -0.5, 0.0));
 
-            const GROUP: [f32; 4] = [0.0, 0.5, 1.0, 1.5];
+            const GROUP: [f32; 4] = [
+                0.0, 0.5, 1.0, 1.5,
+            ];
             for u in &GROUP {
                 for v in &GROUP {
                     let sample = x0 + *u * du + *v * dv;

rog-anime/src/sequencer.rs

@@ -75,10 +75,7 @@ impl ActionData {
                 time,
                 brightness,
             } => ActionData::Animation(AnimeGif::from_diagonal_gif(
-                file,
-                *time,
-                *brightness,
-                anime_type,
+                file, *time, *brightness, anime_type,
             )?),
             ActionLoader::AsusImage {
                 file,
@@ -91,10 +88,7 @@ impl ActionData {
                     ActionData::Image(Box::new(data))
                 }
                 _ => ActionData::Animation(AnimeGif::from_diagonal_png(
-                    file,
-                    anime_type,
-                    *time,
-                    *brightness,
+                    file, anime_type, *time, *brightness,
                 )?),
             },
             ActionLoader::ImageAnimation {
@@ -108,24 +102,12 @@ impl ActionData {
                 if let Some(ext) = file.extension() {
                     if ext.to_string_lossy().to_lowercase() == "png" {
                         return Ok(ActionData::Animation(AnimeGif::from_png(
-                            file,
-                            *scale,
-                            *angle,
-                            *translation,
-                            *time,
-                            *brightness,
-                            anime_type,
+                            file, *scale, *angle, *translation, *time, *brightness, anime_type,
                         )?));
                     }
                 }
                 ActionData::Animation(AnimeGif::from_gif(
-                    file,
-                    *scale,
-                    *angle,
-                    *translation,
-                    *time,
-                    *brightness,
-                    anime_type,
+                    file, *scale, *angle, *translation, *time, *brightness, anime_type,
                 )?)
             }
             ActionLoader::Image {
@@ -140,24 +122,13 @@ impl ActionData {
                     AnimTime::Infinite => {
                         // If no time then create a plain static image
                         let image = AnimeImage::from_png(
-                            file,
-                            *scale,
-                            *angle,
-                            *translation,
-                            *brightness,
-                            anime_type,
+                            file, *scale, *angle, *translation, *brightness, anime_type,
                         )?;
                         let data = <AnimeDataBuffer>::try_from(&image)?;
                         ActionData::Image(Box::new(data))
                     }
                     _ => ActionData::Animation(AnimeGif::from_png(
-                        file,
-                        *scale,
-                        *angle,
-                        *translation,
-                        *time,
-                        *brightness,
-                        anime_type,
+                        file, *scale, *angle, *translation, *time, *brightness, anime_type,
                     )?),
                 }
             }

rog-anime/src/usb.rs

@@ -12,7 +12,6 @@ use std::str::FromStr;
 
 use dmi_id::DMIID;
 use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};
 
@@ -29,7 +28,6 @@ pub const PROD_ID: u16 = 0x193b;
     derive(Type, Value, OwnedValue),
     zvariant(signature = "u")
 )]
-#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 /// Base LED brightness of the display
 pub enum Brightness {
@@ -82,7 +80,6 @@ impl From<Brightness> for i32 {
     derive(Type, Value, OwnedValue),
     zvariant(signature = "s")
 )]
-#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimBooting {
     #[default]
@@ -123,7 +120,6 @@ impl From<AnimBooting> for i32 {
     derive(Type, Value, OwnedValue),
     zvariant(signature = "s")
 )]
-#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimAwake {
     #[default]
@@ -164,7 +160,6 @@ impl From<AnimAwake> for i32 {
     derive(Type, Value, OwnedValue),
     zvariant(signature = "s")
 )]
-#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimSleeping {
     #[default]
@@ -205,7 +200,6 @@ impl From<AnimSleeping> for i32 {
     derive(Type, Value, OwnedValue),
     zvariant(signature = "s")
 )]
-#[typeshare]
 #[derive(Debug, Default, PartialEq, Eq, Copy, Clone, Deserialize, Serialize)]
 pub enum AnimShutdown {
     #[default]
@@ -249,7 +243,7 @@ impl From<AnimShutdown> for i32 {
 #[inline]
 pub fn get_anime_type() -> AnimeType {
     let dmi = DMIID::new().unwrap_or_default();
-    let board_name = dmi.board_name;
+    let board_name = dmi.board_name.to_uppercase();
 
     if board_name.contains("GA401I") || board_name.contains("GA401Q") {
         AnimeType::GA401
@@ -257,6 +251,10 @@ pub fn get_anime_type() -> AnimeType {
         AnimeType::GA402
     } else if board_name.contains("GU604V") {
         AnimeType::GU604
+    } else if board_name.contains("G635L") {
+        AnimeType::G635L
+    } else if board_name.contains("G835L") {
+        AnimeType::G835L
     } else {
         AnimeType::Unsupported
     }

rog-aura/Cargo.toml

@@ -23,6 +23,5 @@ dmi_id = { path = "../dmi-id" }
 
 # cli and logging
 log.workspace = true
-typeshare.workspace = true
 
 ron = { version = "*", optional = true }

rog-aura/data/aura_support.ron

@@ -5,7 +5,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -14,7 +14,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -23,7 +23,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -32,7 +32,43 @@
         layout_name: "fa507",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FA617NS",
+        product_id: "",
+        layout_name: "fa507",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FA617NT",
+        product_id: "",
+        layout_name: "fa507",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FA617XS",
+        product_id: "",
+        layout_name: "fa507",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FA617XT",
+        product_id: "",
+        layout_name: "fa507",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -41,7 +77,7 @@
         layout_name: "fx505d",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -50,7 +86,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -59,7 +95,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -68,7 +104,7 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -77,7 +113,34 @@
         layout_name: "fa506i",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FX607J",
+        product_id: "",
+        layout_name: "fa506i",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    ( 
+        device_name: "FX607V",
+        product_id: "",
+        layout_name: "fa506i",
+        basic_modes: [Static, Breathe, RainbowCycle, Pulse],
+        basic_zones: [],
+        advanced_type: Zoned([SingleZone]),
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FX617X",
+        product_id: "",
+        layout_name: "fa506i",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -86,7 +149,16 @@
         layout_name: "fx505d",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
+    (
+        device_name: "FX706H",
+        product_id: "",
+        layout_name: "fx505d",
+        basic_modes: [Static, Breathe, RainbowCycle],
+        basic_zones: [],
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -95,7 +167,7 @@
         layout_name: "g512",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -113,7 +185,7 @@
         layout_name: "g513i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -139,17 +211,26 @@
         product_id: "",
         layout_name: "g513i",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
-        basic_zones: [],
+        basic_zones: [Key1, Key2, Key3, Key4],
         advanced_type: Zoned([ZonedKbLeft, ZonedKbLeftMid, ZonedKbRightMid, ZonedKbRight, LightbarRight, LightbarRightCorner, LightbarRightBottom, LightbarLeftBottom, LightbarLeftCorner, LightbarLeft]),
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G513RW",
+        product_id: "",
+        layout_name: "g513i-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar],
+    ),
     (
         device_name: "G531G",
         product_id: "",
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -158,7 +239,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -179,6 +260,15 @@
         advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G533QS",
+        product_id: "18c6",
+        layout_name: "g533q-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar],
+    ),
     (
         device_name: "G533Z",
         product_id: "",
@@ -188,13 +278,31 @@
         advanced_type: PerKey,
         power_zones: [Keyboard],
     ),
+    (
+        device_name: "G614FR",
+        product_id: "",
+        layout_name: "g634j-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "G614J",
         product_id: "",
         layout_name: "g634j-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard, Lightbar],
+    ),
+    (
+        device_name: "G614JIR",
+        product_id: "",
+        layout_name: "g513i-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -203,16 +311,34 @@
         layout_name: "g634j-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G614JU",
+        product_id: "",
+        layout_name: "g634j-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "G614JZ",
         product_id: "",
         layout_name: "g634j-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
+        power_zones: [Keyboard, Lightbar],
+    ),
+    (
+        device_name: "G615LR",
+        product_id: "",
+        layout_name: "g634j-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave],
+        basic_zones: [Key1, Key2, Key3, Key4],
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -224,13 +350,22 @@
         advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar, Logo, RearGlow],
     ),
+    (
+            device_name: "G635L",
+            product_id: "",
+            layout_name: "g635l-per-key",
+            basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+            basic_zones: [],
+            advanced_type: PerKey,
+            power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "G712LI",
         product_id: "",
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -239,7 +374,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -248,7 +383,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -257,7 +392,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -266,7 +401,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -275,7 +410,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -284,7 +419,7 @@
         layout_name: "gx502",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -320,7 +455,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -338,7 +473,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4, BarLeft, BarRight],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard, Lightbar],
     ),
     (
@@ -356,7 +491,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -365,7 +500,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -374,7 +509,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -422,6 +557,15 @@
         advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar],
     ),
+    (
+        device_name: "G815L",
+        product_id: "",
+        layout_name: "g814ji-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar],
+    ),
     (
         device_name: "G834J",
         product_id: "",
@@ -431,13 +575,22 @@
         advanced_type: PerKey,
         power_zones: [Keyboard, Lightbar, Logo, RearGlow],
     ),
+    (
+        device_name: "G835L",
+        product_id: "",
+        layout_name: "g814ji-per-key",
+        basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Comet, Flash],
+        basic_zones: [],
+        advanced_type: PerKey,
+        power_zones: [Keyboard, Lightbar, Logo],
+    ),
     (
         device_name: "GA401I",
         product_id: "",
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -446,7 +599,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -455,7 +608,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -464,7 +617,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -473,7 +626,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -482,7 +635,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -491,7 +644,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -500,7 +653,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -509,7 +662,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -518,7 +671,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -527,7 +680,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -545,7 +698,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -554,7 +707,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -563,7 +716,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4, Logo, BarLeft, BarRight],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -581,7 +734,7 @@
         layout_name: "g533q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -590,7 +743,7 @@
         layout_name: "gl503",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -599,7 +752,7 @@
         layout_name: "fa507",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -648,7 +801,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "GU605M",
+        device_name: "GU605C",
         product_id: "",
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
@@ -657,7 +810,7 @@
         power_zones: [Keyboard],
     ),
     (
-        device_name: "GA605W",
+        device_name: "GU605M",
         product_id: "",
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
@@ -671,7 +824,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -680,7 +833,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -689,7 +842,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -698,7 +851,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -716,7 +869,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -734,7 +887,7 @@
         layout_name: "gx531-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [Key1, Key2, Key3, Key4],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -788,7 +941,7 @@
         layout_name: "gx531-per-key",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Star, Rain, Highlight, Laser, Ripple, Pulse, Comet, Flash],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -797,7 +950,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -806,7 +959,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -815,8 +968,8 @@
         layout_name: "",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
-        power_zones: [None],
+        advanced_type: r#None,
+        power_zones: [r#None],
     ),
     (
         device_name: "GZ301Z",
@@ -824,7 +977,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Keyboard],
     ),
     (
@@ -833,7 +986,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Ally],
     ),
     (
@@ -842,7 +995,7 @@
         layout_name: "ga401q",
         basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
         basic_zones: [],
-        advanced_type: None,
+        advanced_type: r#None,
         power_zones: [Ally],
     ),
 ])

rog-aura/data/layouts/g635l-per-key_US.ron

@@ -0,0 +1,375 @@
+(
+    locale: "US",
+    key_shapes: {
+        "regular": Led(
+            width: 1.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "regular_spacing": Blank(
+            width: 1.2,
+            height: 0.0,
+        ),
+        "rog_row": Led(
+            width: 1.0,
+            height: 0.7,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.6,
+        ),
+        "rog_row_blocking": Blank(
+            width: 1.2,
+            height: 0.0,
+        ),
+        "func_space": Blank(
+            width: 0.6,
+            height: 0.0,
+        ),
+        "backspace": Led(
+            width: 2.2,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "tab": Led(
+            width: 1.6,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "backslash": Led(
+            width: 1.6,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "capsplonk": Led(
+            width: 2.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "return": Led(
+            width: 2.4,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "lshift": Led(
+            width: 2.6,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "rshift": Led(
+            width: 3.0,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "lctrl": Led(
+            width: 1.4,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "spacebar": Led(
+            width: 5.8,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "rctrl": Led(
+            width: 1.2,
+            height: 1.0,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "up_arrow": Led(
+            width: 0.8,
+            height: 0.8,
+            pad_left: 1.1,
+            pad_right: 1.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+        ),
+        "arrows_spacer": Blank(
+            width: 15.0,
+            height: 0.0,
+        ),
+        "arrows": Led(
+            width: 0.8,
+            height: 0.8,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: -0.1,
+            pad_bottom: 0.1,
+        ),
+        "row_end_spacing": Blank(
+            width: 0.4,
+            height: 0.0,
+        ),
+        "lid_logo": Led(
+            width: 2.6,
+            height: 1.2,
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_left": Led(
+            width: 0.6,
+            height: 3.6,
+            pad_left: -1.2,
+            pad_right: 0.2,
+            pad_top: -3.0,
+            pad_bottom: 0.3,
+        ),
+        "lightbar_corner_left": Led(
+            width: 0.8,
+            height: 0.6,
+            pad_left: -0.6,
+            pad_right: 0.2,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_bottom": Led(
+            width: 12.6,
+            height: 0.5,
+            pad_left: -0.1,
+            pad_right: -0.1,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_corner_right": Led(
+            width: 0.8,
+            height: 0.6,
+            pad_left: 0.0,
+            pad_right: 0.2,
+            pad_top: 0.8,
+            pad_bottom: 0.0,
+        ),
+        "lightbar_right": Led(
+            width: 0.6,
+            height: 3.6,
+            pad_left: -0.8,
+            pad_right: 0.2,
+            pad_top: -3.0,
+            pad_bottom: 0.3,
+        ),
+    },
+    key_rows: [
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Blocking, "rog_row_blocking"),
+                (Blocking, "rog_row_blocking"),
+                (VolDown, "rog_row"),
+                (VolUp, "rog_row"),
+                (MicMute, "rog_row"),
+                (RogFan, "rog_row"),
+                (RogApp, "rog_row"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Esc, "regular"),
+                (Spacing, "regular_spacing"),
+                (F1, "regular"),
+                (F2, "regular"),
+                (F3, "regular"),
+                (F4, "regular"),
+                (Spacing, "func_space"),
+                (F5, "regular"),
+                (F6, "regular"),
+                (F7, "regular"),
+                (F8, "regular"),
+                (Spacing, "func_space"),
+                (F9, "regular"),
+                (F10, "regular"),
+                (F11, "regular"),
+                (F12, "regular"),
+                (Spacing, "row_end_spacing"),
+                (Del, "regular"), // Should be super/insert
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Tilde, "regular"),
+                (N1, "regular"),
+                (N2, "regular"),
+                (N3, "regular"),
+                (N4, "regular"),
+                (N5, "regular"),
+                (N6, "regular"),
+                (N7, "regular"),
+                (N8, "regular"),
+                (N9, "regular"),
+                (N0, "regular"),
+                (Hyphen, "regular"),
+                (Equals, "regular"),
+                (Backspace, "backspace"),
+                (Spacing, "row_end_spacing"),
+                (MediaPlay, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Tab, "tab"),
+                (Q, "regular"),
+                (W, "regular"),
+                (E, "regular"),
+                (R, "regular"),
+                (T, "regular"),
+                (Y, "regular"),
+                (U, "regular"),
+                (I, "regular"),
+                (O, "regular"),
+                (P, "regular"),
+                (LBracket, "regular"),
+                (RBracket, "regular"),
+                (BackSlash, "backslash"),
+                (Spacing, "row_end_spacing"),
+                (MediaStop, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Caps, "capsplonk"),
+                (A, "regular"),
+                (S, "regular"),
+                (D, "regular"),
+                (F, "regular"),
+                (G, "regular"),
+                (H, "regular"),
+                (J, "regular"),
+                (K, "regular"),
+                (L, "regular"),
+                (SemiColon, "regular"),
+                (Quote, "regular"),
+                (Return, "return"),
+                (Spacing, "row_end_spacing"),
+                (MediaNext, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LShift, "lshift"),
+                (Z, "regular"),
+                (X, "regular"),
+                (C, "regular"),
+                (V, "regular"),
+                (B, "regular"),
+                (N, "regular"),
+                (M, "regular"),
+                (Comma, "regular"),
+                (Period, "regular"),
+                (FwdSlash, "regular"),
+                (Rshift, "rshift"),
+                (Spacing, "row_end_spacing"),
+                (MediaPrev, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LCtrl, "lctrl"),
+                (LFn, "regular"),
+                (Meta, "regular"),
+                (LAlt, "regular"),
+                (Spacebar, "spacebar"),
+                (RAlt, "regular"),
+                (PrtSc, "regular"),
+                (RCtrl, "rctrl"),
+                (Up, "up_arrow"),
+                (Spacing, "row_end_spacing"),
+                (PrtSc, "regular"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (Spacing, "arrows_spacer"),
+                (Left, "arrows"),
+                (Down, "arrows"),
+                (Right, "arrows"),
+            ],
+        ),
+        (
+            pad_left: 6.5,
+            pad_right: 6.5,
+            pad_top: 0.2,
+            pad_bottom: 0.1,
+            row: [
+                (LidLogo, "lid_logo"),
+            ],
+        ),
+        (
+            pad_left: 0.1,
+            pad_right: 0.1,
+            pad_top: 0.1,
+            pad_bottom: 0.1,
+            row: [
+                (LightbarLeft, "lightbar_left"),
+                (LightbarLeftCorner, "lightbar_corner_left"),
+                (LightbarLeftBottom, "lightbar_bottom"),
+                (LightbarRightBottom, "lightbar_bottom"),
+                (LightbarRightCorner, "lightbar_corner_right"),
+                (LightbarRight, "lightbar_right"),
+            ],
+        ),
+    ],
+)

rog-aura/src/aura_detection.rs

@@ -164,6 +164,25 @@ impl LedSupportFile {
             return Some(data);
         }
 
+        // If the system-wide files were not found (typical in CI or
+        // development environments), attempt to load the bundled
+        // `data/aura_support.ron` from the crate so tests and local runs
+        // behave the same as when the package is installed.
+        // Attempt to load a bundled `aura_support.ron` included at compile time.
+        // Using `include_str!` ensures the data is available regardless of
+        // runtime `CARGO_MANIFEST_DIR` or CI environment differences.
+        let bundled_buf = include_str!("../data/aura_support.ron");
+        if !bundled_buf.is_empty() {
+            if let Ok(tmp) = ron::from_str::<LedSupportFile>(bundled_buf) {
+                data.0.append(&mut tmp.0.clone());
+                data.0.sort_by(|a, b| a.device_name.cmp(&b.device_name));
+                info!("Loaded bundled LED support data (embedded)");
+                return Some(data);
+            } else {
+                warn!("Could not parse embedded bundled data file");
+            }
+        }
+
         warn!("Does {} exist?", ASUS_LED_MODE_USER_CONF);
         None
     }
@@ -191,9 +210,16 @@ mod tests {
             product_id: String::new(),
             layout_name: "ga401".to_owned(),
             basic_modes: vec![AuraModeNum::Static],
-            basic_zones: vec![AuraZone::Key1, AuraZone::Logo, AuraZone::BarLeft],
+            basic_zones: vec![
+                AuraZone::Key1,
+                AuraZone::Logo,
+                AuraZone::BarLeft,
+            ],
             advanced_type: AdvancedAuraType::Zoned(vec![LedCode::LightbarRight]),
-            power_zones: vec![PowerZones::Keyboard, PowerZones::RearGlow],
+            power_zones: vec![
+                PowerZones::Keyboard,
+                PowerZones::RearGlow,
+            ],
         };
 
         assert!(ron::to_string(&led).is_ok());
@@ -214,9 +240,7 @@ mod tests {
         tmp_sort.0.sort_by(|a, b| a.product_id.cmp(&b.product_id));
         tmp_sort.0.sort_by(|a, b| a.device_name.cmp(&b.device_name));
         for model in tmp_sort.0.iter_mut() {
-            model
-                .basic_modes
-                .sort_by(|a, b| (*a as u8).cmp(&(*b as u8)));
+            model.basic_modes.sort_by_key(|a| *a as u8);
         }
         if tmp != tmp_sort {
             let sorted =

rog-aura/src/builtin_modes.rs

@@ -2,14 +2,12 @@ use std::fmt::Display;
 use std::str::FromStr;
 
 use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};
 
 use crate::error::Error;
 use crate::AURA_LAPTOP_LED_MSG_LEN;
 
-#[typeshare]
 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
 #[cfg_attr(
     feature = "dbus",
@@ -79,7 +77,6 @@ impl From<i32> for LedBrightness {
     }
 }
 
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Debug, Clone, PartialEq, Eq, Copy, Deserialize, Serialize)]
 pub struct Colour {
@@ -120,7 +117,11 @@ impl From<&[f32; 3]> for Colour {
 
 impl From<Colour> for [f32; 3] {
     fn from(c: Colour) -> Self {
-        [c.r as f32 / 255.0, c.g as f32 / 255.0, c.b as f32 / 255.0]
+        [
+            c.r as f32 / 255.0,
+            c.g as f32 / 255.0,
+            c.b as f32 / 255.0,
+        ]
     }
 }
 
@@ -136,11 +137,12 @@ impl From<&[u8; 3]> for Colour {
 
 impl From<Colour> for [u8; 3] {
     fn from(c: Colour) -> Self {
-        [c.r, c.g, c.b]
+        [
+            c.r, c.g, c.b,
+        ]
     }
 }
 
-#[typeshare]
 #[cfg_attr(
     feature = "dbus",
     derive(Type, Value, OwnedValue),
@@ -200,7 +202,6 @@ impl From<Speed> for u8 {
 /// Used for Rainbow mode.
 ///
 /// Enum corresponds to the required integer value
-#[typeshare]
 #[cfg_attr(
     feature = "dbus",
     derive(Type, Value, OwnedValue),
@@ -248,7 +249,6 @@ impl From<Direction> for i32 {
 }
 
 /// Enum of modes that convert to the actual number required by a USB HID packet
-#[typeshare]
 #[cfg_attr(
     feature = "dbus",
     derive(Type, Value, OwnedValue),
@@ -359,8 +359,13 @@ impl From<AuraEffect> for AuraModeNum {
     }
 }
 
+#[cfg(feature = "dbus")]
+impl zbus::zvariant::Basic for AuraModeNum {
+    const SIGNATURE_CHAR: char = 'u';
+    const SIGNATURE_STR: &'static str = "u";
+}
+
 /// Base effects have no zoning, while multizone is 1-4
-#[typeshare]
 #[cfg_attr(
     feature = "dbus",
     derive(Type, Value, OwnedValue),
@@ -432,7 +437,6 @@ impl From<AuraZone> for i32 {
 /// ```rust
 /// // let bytes: [u8; LED_MSG_LEN] = mode.into();
 /// ```
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct AuraEffect {

rog-aura/src/keyboard/advanced.rs

@@ -1,6 +1,5 @@
 use log::warn;
 use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::Type;
 
@@ -194,7 +193,6 @@ impl LedCode {
 }
 
 /// Represents the per-key raw USB packets
-#[typeshare]
 pub type AuraLaptopUsbPackets = Vec<Vec<u8>>;
 
 /// A `UsbPackets` contains all data to change the full set of keyboard
@@ -204,7 +202,6 @@ pub type AuraLaptopUsbPackets = Vec<Vec<u8>>;
 /// to the keyboard EC. One row controls one group of keys, these keys are not
 /// necessarily all on the same row of the keyboard, with some splitting between
 /// two rows.
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type))]
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct LedUsbPackets {

rog-aura/src/keyboard/power.rs

@@ -5,7 +5,6 @@ use std::ops::{BitAnd, BitOr};
 
 use log::warn;
 use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};
 
@@ -16,7 +15,6 @@ use crate::{AuraDeviceType, PowerZones};
 /// - 2021+, the struct is a single zone with 4 states
 /// - pre-2021, the struct is 1 or 2 zones and 3 states
 /// - Tuf, the struct is 1 zone and 3 states
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct AuraPowerState {
@@ -54,7 +52,9 @@ impl AuraPowerState {
 
     fn tuf_to_bytes(&self) -> Vec<u8> {
         // &cmd, &boot, &awake, &sleep, &keyboard
-        vec![1, self.boot as u8, self.awake as u8, self.sleep as u8, 1]
+        vec![
+            1, self.boot as u8, self.awake as u8, self.sleep as u8, 1,
+        ]
     }
 
     /// # Bits for older 0x1866 keyboard model
@@ -106,46 +106,45 @@ impl AuraPowerState {
         match self.zone {
             PowerZones::Logo => {
                 self.boot as u32
-                    | (self.awake as u32) << 2
-                    | (self.sleep as u32) << 4
-                    | (self.shutdown as u32) << 6
+                    | ((self.awake as u32) << 2)
+                    | ((self.sleep as u32) << 4)
+                    | ((self.shutdown as u32) << 6)
             }
             PowerZones::Ally => {
                 (self.boot as u32)
-                    | (self.awake as u32) << 1
-                    | (self.sleep as u32) << 2
-                    | (self.shutdown as u32) << 3
+                    | ((self.awake as u32) << 1)
+                    | ((self.sleep as u32) << 2)
+                    | ((self.shutdown as u32) << 3)
             }
             PowerZones::Keyboard => {
-                (self.boot as u32) << 1
-                    | (self.awake as u32) << 3
-                    | (self.sleep as u32) << 5
-                    | (self.shutdown as u32) << 7
+                ((self.boot as u32) << 1)
+                    | ((self.awake as u32) << 3)
+                    | ((self.sleep as u32) << 5)
+                    | ((self.shutdown as u32) << 7)
             }
             PowerZones::Lightbar => {
-                (self.boot as u32) << (7 + 2)
-                    | (self.awake as u32) << (7 + 3)
-                    | (self.sleep as u32) << (7 + 4)
-                    | (self.shutdown as u32) << (7 + 5)
+                ((self.boot as u32) << (7 + 2))
+                    | ((self.awake as u32) << (7 + 3))
+                    | ((self.sleep as u32) << (7 + 4))
+                    | ((self.shutdown as u32) << (7 + 5))
             }
             PowerZones::Lid => {
-                (self.boot as u32) << (15 + 1)
-                    | (self.awake as u32) << (15 + 2)
-                    | (self.sleep as u32) << (15 + 3)
-                    | (self.shutdown as u32) << (15 + 4)
+                ((self.boot as u32) << (15 + 1))
+                    | ((self.awake as u32) << (15 + 2))
+                    | ((self.sleep as u32) << (15 + 3))
+                    | ((self.shutdown as u32) << (15 + 4))
             }
             PowerZones::RearGlow => {
-                (self.boot as u32) << (23 + 1)
-                    | (self.awake as u32) << (23 + 2)
-                    | (self.sleep as u32) << (23 + 3)
-                    | (self.shutdown as u32) << (23 + 4)
+                ((self.boot as u32) << (23 + 1))
+                    | ((self.awake as u32) << (23 + 2))
+                    | ((self.sleep as u32) << (23 + 3))
+                    | ((self.shutdown as u32) << (23 + 4))
             }
             PowerZones::None | PowerZones::KeyboardAndLightbar => 0,
         }
     }
 }
 
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct LaptopAuraPower {
@@ -226,7 +225,13 @@ impl LaptopAuraPower {
     pub fn to_bytes(&self, aura_type: AuraDeviceType) -> Vec<u8> {
         if let Some(stuff) = self.states.first() {
             if stuff.zone == PowerZones::Ally {
-                return vec![0x5d, 0xd1, 0x09, 0x01, stuff.new_to_byte() as u8];
+                return vec![
+                    0x5d,
+                    0xd1,
+                    0x09,
+                    0x01,
+                    stuff.new_to_byte() as u8,
+                ];
             }
         }
         match aura_type {
@@ -321,26 +326,30 @@ mod test {
     #[test]
     fn check_0x1866_control_bytes() {
         let power = LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Keyboard,
-                boot: false,
-                awake: true,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Keyboard,
+                    boot: false,
+                    awake: true,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         };
         let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
         println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
         assert_eq!(bytes, [0x08, 0x00, 0x02, 0x00]);
 
         let power = LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lightbar,
-                boot: false,
-                awake: true,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lightbar,
+                    boot: false,
+                    awake: true,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         };
         let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
         println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
@@ -379,184 +388,224 @@ mod test {
     #[test]
     fn check_0x19b6_control_bytes_binary_rep() {
         let boot_logo_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Logo,
-                boot: true,
-                awake: false,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Logo,
+                    boot: true,
+                    awake: false,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let boot_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Keyboard,
-                boot: true,
-                awake: false,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Keyboard,
+                    boot: true,
+                    awake: false,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let sleep_logo = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Logo,
-                boot: false,
-                awake: false,
-                sleep: true,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Logo,
+                    boot: false,
+                    awake: false,
+                    sleep: true,
+                    shutdown: false,
+                },
+            ],
         });
         let sleep_keyb = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Keyboard,
-                boot: false,
-                awake: false,
-                sleep: true,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Keyboard,
+                    boot: false,
+                    awake: false,
+                    sleep: true,
+                    shutdown: false,
+                },
+            ],
         });
         let awake_logo = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Logo,
-                boot: false,
-                awake: true,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Logo,
+                    boot: false,
+                    awake: true,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let awake_keyb = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Keyboard,
-                boot: false,
-                awake: true,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Keyboard,
+                    boot: false,
+                    awake: true,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let shut_logo_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Logo,
-                boot: false,
-                awake: false,
-                sleep: false,
-                shutdown: true,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Logo,
+                    boot: false,
+                    awake: false,
+                    sleep: false,
+                    shutdown: true,
+                },
+            ],
         });
         let shut_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Keyboard,
-                boot: false,
-                awake: false,
-                sleep: false,
-                shutdown: true,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Keyboard,
+                    boot: false,
+                    awake: false,
+                    sleep: false,
+                    shutdown: true,
+                },
+            ],
         });
         let boot_bar__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lightbar,
-                boot: true,
-                awake: false,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lightbar,
+                    boot: true,
+                    awake: false,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let awake_bar_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lightbar,
-                boot: false,
-                awake: true,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lightbar,
+                    boot: false,
+                    awake: true,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let sleep_bar_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lightbar,
-                boot: false,
-                awake: false,
-                sleep: true,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lightbar,
+                    boot: false,
+                    awake: false,
+                    sleep: true,
+                    shutdown: false,
+                },
+            ],
         });
         let shut_bar__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lightbar,
-                boot: false,
-                awake: false,
-                sleep: false,
-                shutdown: true,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lightbar,
+                    boot: false,
+                    awake: false,
+                    sleep: false,
+                    shutdown: true,
+                },
+            ],
         });
         let boot_lid__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lid,
-                boot: true,
-                awake: false,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lid,
+                    boot: true,
+                    awake: false,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let awake_lid_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lid,
-                boot: false,
-                awake: true,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lid,
+                    boot: false,
+                    awake: true,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let sleep_lid_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lid,
-                boot: false,
-                awake: false,
-                sleep: true,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lid,
+                    boot: false,
+                    awake: false,
+                    sleep: true,
+                    shutdown: false,
+                },
+            ],
         });
         let shut_lid__ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::Lid,
-                boot: false,
-                awake: false,
-                sleep: false,
-                shutdown: true,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::Lid,
+                    boot: false,
+                    awake: false,
+                    sleep: false,
+                    shutdown: true,
+                },
+            ],
         });
         let boot_rear_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::RearGlow,
-                boot: true,
-                awake: false,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::RearGlow,
+                    boot: true,
+                    awake: false,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let awake_rear = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::RearGlow,
-                boot: false,
-                awake: true,
-                sleep: false,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::RearGlow,
+                    boot: false,
+                    awake: true,
+                    sleep: false,
+                    shutdown: false,
+                },
+            ],
         });
         let sleep_rear = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::RearGlow,
-                boot: false,
-                awake: false,
-                sleep: true,
-                shutdown: false,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::RearGlow,
+                    boot: false,
+                    awake: false,
+                    sleep: true,
+                    shutdown: false,
+                },
+            ],
         });
         let shut_rear_ = to_binary_string_post2021(&LaptopAuraPower {
-            states: vec![AuraPowerState {
-                zone: PowerZones::RearGlow,
-                boot: false,
-                awake: false,
-                sleep: false,
-                shutdown: true,
-            }],
+            states: vec![
+                AuraPowerState {
+                    zone: PowerZones::RearGlow,
+                    boot: false,
+                    awake: false,
+                    sleep: false,
+                    shutdown: true,
+                },
+            ],
         });
 
         assert_eq!(boot_logo_, "00000001, 00000000, 00000000, 00000000");

rog-aura/src/lib.rs

@@ -6,7 +6,6 @@
 use std::fmt::Debug;
 
 use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
 #[cfg(feature = "dbus")]
 use zbus::zvariant::{OwnedValue, Type, Value};
 
@@ -62,9 +61,10 @@ pub const ORANGE: Colour = Colour {
     g: 0xa4,
     b: 0x00,
 };
-pub const GRADIENT: [Colour; 7] = [RED, VIOLET, BLUE, TEAL, GREEN, YELLOW, ORANGE];
+pub const GRADIENT: [Colour; 7] = [
+    RED, VIOLET, BLUE, TEAL, GREEN, YELLOW, ORANGE,
+];
 
-#[typeshare]
 #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum AuraDeviceType {
@@ -116,7 +116,6 @@ impl From<&str> for AuraDeviceType {
 }
 
 /// The powerr zones this laptop supports
-#[typeshare]
 #[cfg_attr(
     feature = "dbus",
     derive(Type, Value, OwnedValue),

rog-aura/src/usb.rs

@@ -1,4 +1,7 @@
 // Only these two packets must be 17 bytes
-pub const AURA_LAPTOP_LED_APPLY: [u8; 17] =
-    [0x5d, 0xb4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-pub const AURA_LAPTOP_LED_SET: [u8; 17] = [0x5d, 0xb5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+pub const AURA_LAPTOP_LED_APPLY: [u8; 17] = [
+    0x5d, 0xb4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];
+pub const AURA_LAPTOP_LED_SET: [u8; 17] = [
+    0x5d, 0xb5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+];

rog-control-center/Cargo.toml

@@ -12,8 +12,9 @@ edition.workspace = true
 default = []
 mocking = []
 x11 = ["slint/backend-winit-x11"]
-# Requires RUSTFLAGS="--cfg tokio_unstable"
+# Optional tokio debug feature does not require nightly; remove RUSTFLAGS note.
 tokio-debug = ["console-subscriber"]
+rog_ally = []
 
 [dependencies]
 console-subscriber = { version = "^0.4", optional = true }
@@ -41,6 +42,7 @@ zbus.workspace = true
 dirs.workspace = true
 notify-rust.workspace = true
 concat-idents.workspace = true
+futures-util.workspace = true
 
 versions.workspace = true
 
@@ -48,12 +50,26 @@ versions.workspace = true
 git = "https://github.com/slint-ui/slint.git"
 default-features = false
 features = [
-    "gettext",
     "compat-1-2",
+    "gettext",
     "backend-winit-wayland",
-    "renderer-winit-femtovg",
+    "renderer-femtovg",
     # "renderer-skia-opengl",
 ]
 
 [build-dependencies.slint-build]
 git = "https://github.com/slint-ui/slint.git"
+
+[package.metadata.deb]
+license-file = ["../LICENSE", "4"]
+extended-description = """\
+The dbus server for asusctl and rog-control-center applications."""
+depends = "$auto"
+section = "utility"
+priority = "optional"
+assets = [
+  ["target/release/rog-control-center", "usr/bin/", "755"],
+  ["../rog_gui-fakeinstall/usr/share/applications/*", "usr/share/share/applications/", "644"],
+  ["../rog_gui-fakeinstall/usr/share/icons/hicolor/512x512/apps/*", "usr/share/icons/hicolor/512x512/apps", "644"],
+  ["../rog_gui-fakeinstall/usr/share/icons/hicolor/scalable/status/*", "usr/share/icons/hicolor/scalable/status", "644"],
+]

rog-control-center/build.rs

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

rog-control-center/data/rog-control-center.desktop

@@ -1,7 +1,6 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-
 Name=ROG Control Center
 Comment=Make your ASUS ROG Laptop go Brrrrr!
 Categories=Settings

rog-control-center/src/error.rs

@@ -9,6 +9,7 @@ pub enum Error {
     ConfigLockFail,
     XdgVars,
     Zbus(zbus::Error),
+    ZbusFdo(zbus::fdo::Error),
     Notification(notify_rust::error::Error),
 }
 
@@ -21,6 +22,7 @@ impl fmt::Display for Error {
             Error::ConfigLockFail => write!(f, "Failed to lock user config"),
             Error::XdgVars => write!(f, "XDG environment vars appear unset"),
             Error::Zbus(err) => write!(f, "Error: {}", err),
+            Error::ZbusFdo(err) => write!(f, "Error: {}", err),
             Error::Notification(err) => write!(f, "Notification Error: {}", err),
         }
     }
@@ -40,6 +42,12 @@ impl From<zbus::Error> for Error {
     }
 }
 
+impl From<zbus::fdo::Error> for Error {
+    fn from(err: zbus::fdo::Error) -> Self {
+        Error::ZbusFdo(err)
+    }
+}
+
 impl From<notify_rust::error::Error> for Error {
     fn from(err: notify_rust::error::Error) -> Self {
         Error::Notification(err)

rog-control-center/src/lib.rs

@@ -15,7 +15,7 @@ pub mod notify;
 pub mod tray;
 pub mod types;
 pub mod ui;
-pub mod zbus;
+pub mod zbus_proxies;
 
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 pub const APP_ICON_PATH: &str = "/usr/share/icons/hicolor/512x512/apps/rog-control-center.png";

rog-control-center/src/main.rs

@@ -1,5 +1,4 @@
-use std::borrow::BorrowMut;
-use std::env::args;
+use std::env::{self, args};
 use std::path::{Path, PathBuf};
 use std::process::exit;
 use std::sync::{Arc, Mutex};
@@ -9,7 +8,7 @@ use std::time::Duration;
 use config_traits::{StdConfig, StdConfigLoad1};
 use dmi_id::DMIID;
 use gumdrop::Options;
-use log::{info, warn, LevelFilter};
+use log::{debug, info, warn, LevelFilter};
 use rog_control_center::cli_options::CliStart;
 use rog_control_center::config::Config;
 use rog_control_center::error::Result;
@@ -17,7 +16,7 @@ use rog_control_center::notify::start_notifications;
 use rog_control_center::slint::ComponentHandle;
 use rog_control_center::tray::init_tray;
 use rog_control_center::ui::setup_window;
-use rog_control_center::zbus::{
+use rog_control_center::zbus_proxies::{
     AppState, ROGCCZbus, ROGCCZbusProxyBlocking, ZBUS_IFACE, ZBUS_PATH,
 };
 use rog_control_center::{print_versions, MainWindow};
@@ -25,14 +24,37 @@ use tokio::runtime::Runtime;
 
 #[tokio::main]
 async fn main() -> Result<()> {
+    // Ensure tracing spans are quiet by default unless user overrides
+    if std::env::var_os("RUST_LOG").is_none() {
+        std::env::set_var("RUST_LOG", "warn,tracing=error,zbus=error");
+    }
     let mut logger = env_logger::Builder::new();
     logger
-        .filter_level(LevelFilter::Warn)
         .parse_default_env()
-        .target(env_logger::Target::Stdout)
+        .filter_level(LevelFilter::Info)
+        .parse_default_env()
+        .target(env_logger::Target::Stderr)
         .format_timestamp(None)
         .init();
 
+    // If we're running under gamescope we have to set WAYLAND_DISPLAY for winit to
+    // use
+    if let Ok(gamescope) = env::var("GAMESCOPE_WAYLAND_DISPLAY") {
+        debug!("Gamescope detected");
+        if !gamescope.is_empty() {
+            debug!("Setting WAYLAND_DISPLAY to {}", gamescope);
+            env::set_var("WAYLAND_DISPLAY", gamescope);
+        }
+        // gamescope-0
+        else if let Ok(wayland) = env::var("WAYLAND_DISPLAY") {
+            debug!("Wayland display detected");
+            if wayland.is_empty() {
+                debug!("Setting WAYLAND_DISPLAY to gamescope-0");
+                env::set_var("WAYLAND_DISPLAY", "gamescope-0");
+            }
+        }
+    }
+
     // Try to open a proxy and check for app state first
     {
         let user_con = zbus::blocking::Connection::session()?;
@@ -50,10 +72,15 @@ async fn main() -> Result<()> {
     let self_version = env!("CARGO_PKG_VERSION");
     let zbus_con = zbus::blocking::Connection::system()?;
     let platform_proxy = rog_dbus::zbus_platform::PlatformProxyBlocking::new(&zbus_con)?;
-    let asusd_version = platform_proxy.version().unwrap();
+    let asusd_version = platform_proxy
+        .version()
+        .map_err(|e| {
+            println!("Could not get asusd version: {e:?}\nIs asusd.service running?");
+        })
+        .unwrap();
     if asusd_version != self_version {
         println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}");
-        return Ok(());
+        // return Ok(());
     }
 
     // start tokio
@@ -80,7 +107,6 @@ async fn main() -> Result<()> {
     let board_name = dmi.board_name;
     let prod_family = dmi.product_family;
     info!("Running on {board_name}, product: {prod_family}");
-    let is_rog_ally = prod_family == "RC71L";
 
     let args: Vec<String> = args().skip(1).collect();
 
@@ -111,16 +137,26 @@ async fn main() -> Result<()> {
         config.start_fullscreen = false;
     }
 
+    let is_rog_ally = {
+        #[cfg(feature = "rog_ally")]
+        {
+            board_name == "RC71L" || board_name == "RC72L" || prod_family == "ROG Ally"
+        }
+        #[cfg(not(feature = "rog_ally"))]
+        {
+            false
+        }
+    };
+
+    #[cfg(feature = "rog_ally")]
     if is_rog_ally {
         config.notifications.enabled = false;
         config.enable_tray_icon = false;
         config.run_in_background = false;
         config.startup_in_background = false;
+        config.start_fullscreen = true;
     }
 
-    if config.startup_in_background {
-        config.run_in_background = true;
-    }
     config.write();
 
     let enable_tray_icon = config.enable_tray_icon;
@@ -137,8 +173,8 @@ async fn main() -> Result<()> {
     // i_slint_backend_selector::with_platform(|_| Ok(())).unwrap();
 
     if !startup_in_background {
-        if let Ok(mut lock) = app_state.lock() {
-            *lock = AppState::MainWindowShouldOpen;
+        if let Ok(mut app_state) = app_state.lock() {
+            *app_state = AppState::MainWindowShouldOpen;
         }
     }
 
@@ -154,16 +190,46 @@ async fn main() -> Result<()> {
     thread::spawn(move || {
         let mut state = AppState::StartingUp;
         loop {
-            // save as a var, don't hold the lock the entire time or deadlocks happen
-            if let Ok(lock) = app_state.lock() {
-                state = *lock;
+            if is_rog_ally {
+                let config_copy_2 = config.clone();
+                let newui = setup_window(config.clone());
+                newui.window().on_close_requested(move || {
+                    exit(0);
+                });
+
+                let ui_copy = newui.as_weak();
+                newui
+                    .window()
+                    .set_rendering_notifier(move |s, _| {
+                        if let slint::RenderingState::BeforeRendering = s {
+                            let config = config_copy_2.clone();
+                            ui_copy
+                                .upgrade_in_event_loop(move |w| {
+                                    let fullscreen =
+                                        config.lock().is_ok_and(|c| c.start_fullscreen);
+                                    if fullscreen && !w.window().is_fullscreen() {
+                                        w.window().set_fullscreen(fullscreen);
+                                    }
+                                })
+                                .ok();
+                        }
+                    })
+                    .ok();
+
+                continue;
             }
 
+            // save as a var, don't hold the lock the entire time or deadlocks happen
+            if let Ok(app_state) = app_state.lock() {
+                state = *app_state;
+            }
+
+            // This sleep is required to give the event loop time to react
+            sleep(Duration::from_millis(300));
             if state == AppState::MainWindowShouldOpen {
-                if let Ok(mut lock) = app_state.lock() {
-                    *lock = AppState::MainWindowOpen;
+                if let Ok(mut app_state) = app_state.lock() {
+                    *app_state = AppState::MainWindowOpen;
                 }
-                sleep(Duration::from_millis(50));
 
                 let config_copy = config.clone();
                 let app_state_copy = app_state.clone();
@@ -174,20 +240,39 @@ async fn main() -> Result<()> {
                         if let Some(ui) = ui.as_mut() {
                             ui.window().show().unwrap();
                             ui.window().on_close_requested(move || {
-                                if let Ok(mut lock) = app_state_copy.lock() {
-                                    *lock = AppState::MainWindowClosed;
+                                if let Ok(mut app_state) = app_state_copy.lock() {
+                                    *app_state = AppState::MainWindowClosed;
                                 }
                                 slint::CloseRequestResponse::HideWindow
                             });
                         } else {
+                            let config_copy_2 = config_copy.clone();
                             let newui = setup_window(config_copy);
-                            newui.window().show().unwrap();
                             newui.window().on_close_requested(move || {
-                                if let Ok(mut lock) = app_state_copy.lock() {
-                                    *lock = AppState::MainWindowClosed;
+                                if let Ok(mut app_state) = app_state_copy.lock() {
+                                    *app_state = AppState::MainWindowClosed;
                                 }
                                 slint::CloseRequestResponse::HideWindow
                             });
+
+                            let ui_copy = newui.as_weak();
+                            newui
+                                .window()
+                                .set_rendering_notifier(move |s, _| {
+                                    if let slint::RenderingState::RenderingSetup = s {
+                                        let config = config_copy_2.clone();
+                                        ui_copy
+                                            .upgrade_in_event_loop(move |w| {
+                                                let fullscreen =
+                                                    config.lock().is_ok_and(|c| c.start_fullscreen);
+                                                if fullscreen && !w.window().is_fullscreen() {
+                                                    w.window().set_fullscreen(fullscreen);
+                                                }
+                                            })
+                                            .ok();
+                                    }
+                                })
+                                .ok();
                             ui.replace(newui);
                         }
                     });
@@ -197,24 +282,13 @@ async fn main() -> Result<()> {
                 slint::quit_event_loop().unwrap();
                 exit(0);
             } else if state != AppState::MainWindowOpen {
-                if let Ok(lock) = config.lock() {
-                    if !lock.run_in_background {
+                if let Ok(config) = config.lock() {
+                    if !config.run_in_background {
                         slint::quit_event_loop().unwrap();
                         exit(0);
                     }
                 }
-
-                slint::invoke_from_event_loop(move || {
-                    UI.with(|ui| {
-                        let mut ui = ui.take();
-                        if let Some(ui) = ui.borrow_mut() {
-                            ui.window().hide().unwrap();
-                        }
-                    });
-                })
-                .unwrap();
             }
-            sleep(Duration::from_millis(300));
         }
     });
 
@@ -223,42 +297,6 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
-// /// Bah.. the icon dosn't work on wayland anyway, but we'll leave it in for
-// now. fn load_icon() -> IconData {
-//     let path = PathBuf::from(APP_ICON_PATH);
-//     let mut rgba = Vec::new();
-//     let mut height = 512;
-//     let mut width = 512;
-//     if path.exists() {
-//         if let Ok(data) = std::fs::read(path)
-//             .map_err(|e| error!("Error reading app icon: {e:?}"))
-//             .map_err(|e| error!("Error opening app icon: {e:?}"))
-//         {
-//             let data = std::io::Cursor::new(data);
-//             let decoder = png_pong::Decoder::new(data).unwrap().into_steps();
-//             let png_pong::Step { raster, delay: _ } =
-// decoder.last().unwrap().unwrap();
-
-//             if let png_pong::PngRaster::Rgba8(ras) = raster {
-//                 rgba = ras.as_u8_slice().to_vec();
-//                 width = ras.width();
-//                 height = ras.height();
-//                 info!("Loaded app icon. Not actually supported in Wayland
-// yet");             }
-//         }
-//     } else {
-//         error!("Missing {APP_ICON_PATH}");
-//     }
-
-//     IconData {
-//         height,
-//         width,
-//         rgba
-//
-//
-// /     }
-// }
-
 fn do_cli_help(parsed: &CliStart) -> bool {
     if parsed.help {
         println!("{}", CliStart::usage());

rog-control-center/src/mocking.rs

@@ -125,10 +125,18 @@ impl Profile {
 
     pub fn fan_curve_data(&self, _p: rog_profiles::Profile) -> Result<FanCurveSet> {
         let mut curve = FanCurveSet::default();
-        curve.cpu.pwm = [30, 40, 60, 100, 140, 180, 200, 250];
-        curve.cpu.temp = [20, 30, 40, 50, 70, 80, 90, 100];
-        curve.gpu.pwm = [40, 80, 100, 140, 170, 200, 230, 250];
-        curve.gpu.temp = [20, 30, 40, 50, 70, 80, 90, 100];
+        curve.cpu.pwm = [
+            30, 40, 60, 100, 140, 180, 200, 250,
+        ];
+        curve.cpu.temp = [
+            20, 30, 40, 50, 70, 80, 90, 100,
+        ];
+        curve.gpu.pwm = [
+            40, 80, 100, 140, 170, 200, 230, 250,
+        ];
+        curve.gpu.temp = [
+            20, 30, 40, 50, 70, 80, 90, 100,
+        ];
         Ok(curve)
     }
 

rog-control-center/src/notify.rs

@@ -10,17 +10,12 @@ use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
 use log::{debug, error, info, warn};
-use notify_rust::{Hint, Notification, Timeout, Urgency};
-use rog_dbus::zbus_platform::PlatformProxy;
-use rog_platform::platform::GpuMode;
+use notify_rust::{Hint, Notification, Timeout};
 use rog_platform::power::AsusPower;
 use serde::{Deserialize, Serialize};
-use supergfxctl::actions::UserActionRequired as GfxUserAction;
-use supergfxctl::pci_device::{GfxMode, GfxPower};
-use supergfxctl::zbus_proxy::DaemonProxy as SuperProxy;
+use supergfxctl::pci_device::GfxPower;
 use tokio::runtime::Runtime;
 use tokio::task::JoinHandle;
-use zbus::export::futures_util::StreamExt;
 
 use crate::config::Config;
 use crate::error::Result;
@@ -117,26 +112,26 @@ pub fn start_notifications(
 
                 if p == 0 && p != last_state {
                     let prog: Vec<&str> = bat.split_whitespace().collect();
-                    if prog.len() > 1 {
+                    if (!prog.is_empty()) && (!prog[0].is_empty()) {
                         let mut cmd = Command::new(prog[0]);
 
                         for arg in prog.iter().skip(1) {
                             cmd.arg(*arg);
                         }
                         cmd.spawn()
-                            .map_err(|e| error!("AC command error: {e:?}"))
+                            .map_err(|e| error!("Battery power command error: {e:?}"))
                             .ok();
                     }
                 } else if p != last_state {
                     let prog: Vec<&str> = ac.split_whitespace().collect();
-                    if prog.len() > 1 {
+                    if (!prog.is_empty()) && (!prog[0].is_empty()) {
                         let mut cmd = Command::new(prog[0]);
 
                         for arg in prog.iter().skip(1) {
                             cmd.arg(*arg);
                         }
                         cmd.spawn()
-                            .map_err(|e| error!("AC command error: {e:?}"))
+                            .map_err(|e| error!("AC power command error: {e:?}"))
                             .ok();
                     }
                 }
@@ -146,129 +141,49 @@ pub fn start_notifications(
         }
     });
 
-    let enabled_notifications_copy = config.clone();
-    let no_supergfx = move |e: &zbus::Error| {
-        error!("zbus signal: receive_notify_gfx_status: {e}");
-        warn!("Attempting to start plain dgpu status monitor");
-        start_dpu_status_mon(enabled_notifications_copy.clone());
-    };
+    info!("Attempting to start plain dgpu status monitor");
+    start_dpu_status_mon(config.clone());
 
     // 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
-        })?;
-        let proxy = PlatformProxy::new(&conn).await.map_err(|e| {
-            error!("zbus signal: receive_notify_gpu_mux_mode: {e}");
-            e
-        })?;
+    // TODO: need to get armoury attrs and iter to find
+    // 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
+    //     })?;
+    //     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 {
-            actual_mux_mode = GpuMode::from(mode);
-        }
+    //     let mut actual_mux_mode = GpuMode::Error;
+    //     if let Ok(mode) = proxy.gpu_mux_mode().await {
+    //         actual_mux_mode = GpuMode::from(mode);
+    //     }
 
-        info!("Started zbus signal thread: receive_notify_gpu_mux_mode");
-        while let Some(e) = proxy.receive_gpu_mux_mode_changed().await.next().await {
-            if let Ok(config) = enabled_notifications_copy.lock() {
-                if !config.notifications.enabled || !config.notifications.receive_notify_gfx {
-                    continue;
-                }
-            }
-            if let Ok(out) = e.get().await {
-                let mode = GpuMode::from(out);
-                if mode == actual_mux_mode {
-                    continue;
-                }
-                do_mux_notification("Reboot required. BIOS GPU MUX mode set to", &mode).ok();
-            }
-        }
-        Ok::<(), zbus::Error>(())
-    });
-
-    let enabled_notifications_copy = config.clone();
-    // GPU Mode change/action notif
-    tokio::spawn(async move {
-        let conn = zbus::Connection::system().await.inspect_err(|e| {
-            no_supergfx(e);
-        })?;
-        let proxy = SuperProxy::builder(&conn).build().await.inspect_err(|e| {
-            no_supergfx(e);
-        })?;
-        let _ = proxy.mode().await.inspect_err(|e| {
-            no_supergfx(e);
-        })?;
-
-        let proxy_copy = proxy.clone();
-        let 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();
-                }
-            }
-        });
-
-        let 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)
-                            .show_async()
-                            .await
-                            .unwrap()
-                            .on_close(|_| ());
-                    }
-                    last_status = status;
-                }
-            }
-        });
-        Ok::<(), zbus::Error>(())
-    });
+    //     info!("Started zbus signal thread: receive_notify_gpu_mux_mode");
+    //     while let Some(e) =
+    // proxy.receive_gpu_mux_mode_changed().await.next().await {         if let
+    // Ok(config) = enabled_notifications_copy.lock() {             if
+    // !config.notifications.enabled || !config.notifications.receive_notify_gfx {
+    //                 continue;
+    //             }
+    //         }
+    //         if let Ok(out) = e.get().await {
+    //             let mode = GpuMode::from(out);
+    //             if mode == actual_mux_mode {
+    //                 continue;
+    //             }
+    //             do_mux_notification("Reboot required. BIOS GPU MUX mode set to",
+    // &mode).ok();         }
+    //     }
+    //     Ok::<(), zbus::Error>(())
+    // });
 
     Ok(vec![blocking])
 }
 
-fn convert_gfx_mode(gfx: GfxMode) -> GpuMode {
-    match gfx {
-        GfxMode::Hybrid => GpuMode::Optimus,
-        GfxMode::Integrated => GpuMode::Integrated,
-        GfxMode::NvidiaNoModeset => GpuMode::Optimus,
-        GfxMode::Vfio => GpuMode::Vfio,
-        GfxMode::AsusEgpu => GpuMode::Egpu,
-        GfxMode::AsusMuxDgpu => GpuMode::Ultimate,
-        GfxMode::None => GpuMode::Error,
-    }
-}
-
 fn base_notification<T>(message: &str, data: &T) -> Notification
 where
     T: Display,
@@ -294,91 +209,3 @@ fn do_gpu_status_notif(message: &str, data: &GfxPower) -> Notification {
     notif.icon(icon);
     notif
 }
-
-fn do_gfx_action_notif(message: &str, action: GfxUserAction, mode: GpuMode) -> Result<()> {
-    if matches!(action, GfxUserAction::Reboot) {
-        do_mux_notification("Graphics mode change requires reboot", &mode).ok();
-        return Ok(());
-    }
-
-    let mut notif = Notification::new();
-    notif
-        .appname(NOTIF_HEADER)
-        .summary(&format!("Changing to {mode}. {message}"))
-        //.hint(Hint::Resident(true))
-        .hint(Hint::Category("device".into()))
-        .urgency(Urgency::Critical)
-        .timeout(Timeout::Never)
-        .icon("dialog-warning")
-        .hint(Hint::Transient(true));
-
-    if matches!(action, GfxUserAction::Logout) {
-        notif.action("gfx-mode-session-action", "Logout");
-        let handle = notif.show()?;
-        if let Ok(desktop) = std::env::var("XDG_CURRENT_DESKTOP") {
-            if desktop.to_lowercase() == "gnome" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("gnome-session-quit");
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            } else if desktop.to_lowercase() == "kde" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("qdbus");
-                        cmd.args(["org.kde.ksmserver", "/KSMServer", "logout", "1", "0", "0"]);
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            } else {
-                // todo: handle alternatives
-            }
-        }
-    } else {
-        notif.show()?;
-    }
-    Ok(())
-}
-
-/// Actual `GpuMode` unused as data is never correct until switched by reboot
-fn do_mux_notification(message: &str, m: &GpuMode) -> Result<()> {
-    let mut notif = base_notification(message, &m.to_string());
-    notif
-        .action("gfx-mode-session-action", "Reboot")
-        .urgency(Urgency::Critical)
-        .icon("system-reboot-symbolic")
-        .hint(Hint::Transient(true));
-    let handle = notif.show()?;
-
-    std::thread::spawn(|| {
-        if let Ok(desktop) = std::env::var("XDG_CURRENT_DESKTOP") {
-            if desktop.to_lowercase() == "gnome" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("gnome-session-quit");
-                        cmd.arg("--reboot");
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            } else if desktop.to_lowercase() == "kde" {
-                handle.wait_for_action(|id| {
-                    if id == "gfx-mode-session-action" {
-                        let mut cmd = Command::new("qdbus");
-                        cmd.args(["org.kde.ksmserver", "/KSMServer", "logout", "1", "1", "0"]);
-                        cmd.spawn().ok();
-                    } else if id == "__closed" {
-                        // TODO: cancel the switching
-                    }
-                });
-            }
-        }
-    });
-    Ok(())
-}

rog-control-center/src/tray.rs

@@ -14,7 +14,7 @@ use supergfxctl::zbus_proxy::DaemonProxy as GfxProxy;
 use versions::Versioning;
 
 use crate::config::Config;
-use crate::zbus::{AppState, ROGCCZbusProxyBlocking};
+use crate::zbus_proxies::{AppState, ROGCCZbusProxyBlocking};
 
 const TRAY_LABEL: &str = "ROG Control Center";
 const TRAY_ICON_PATH: &str = "/usr/share/icons/hicolor/512x512/apps/";
@@ -32,7 +32,10 @@ static ICONS: OnceLock<Icons> = OnceLock::new();
 fn read_icon(file: &Path) -> Icon {
     let mut path = PathBuf::from(TRAY_ICON_PATH);
     path.push(file);
-    let mut file = OpenOptions::new().read(true).open(path).unwrap();
+    let mut file = OpenOptions::new()
+        .read(true)
+        .open(&path)
+        .unwrap_or_else(|_| panic!("Missing icon: {:?}", path));
     let mut bytes = Vec::new();
     file.read_to_end(&mut bytes).unwrap();
 
@@ -127,7 +130,6 @@ async fn set_tray_icon_and_tip(
         };
 
         tray.update(|tray: &mut AsusTray| {
-            dbg!(power);
             tray.current_icon = icon;
             tray.current_title = format!(
                 "ROG: gpu mode = {mode:?}, gpu power =
@@ -160,21 +162,23 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
 
         let rog_red = read_icon(&PathBuf::from("asus_notif_red.png"));
 
-        let tray = AsusTray {
+        let tray_init = AsusTray {
             current_title: TRAY_LABEL.to_string(),
             current_icon: rog_red.clone(),
             proxy,
         };
 
-        let mut tray = tray
-            .spawn_without_dbus_name()
-            .await
-            .map_err(|e| {
+        // TODO: return an error to the UI
+        let mut tray;
+        match tray_init.disable_dbus_name(true).spawn().await {
+            Ok(t) => tray = t,
+            Err(e) => {
                 log::error!(
                     "Tray unable to be initialised: {e:?}. Do you have a system tray enabled?"
-                )
-            })
-            .unwrap();
+                );
+                return;
+            }
+        }
 
         info!("Tray started");
         let rog_blue = read_icon(&PathBuf::from("asus_notif_blue.png"));
@@ -207,7 +211,15 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
                         }
                     }
                 }
-                Err(e) => warn!("Couldn't get mode form supergfxd: {e:?}"),
+                Err(e) => match e {
+                    zbus::Error::MethodError(_, _, message) => {
+                        warn!(
+                            "Couldn't get mode from supergfxd: {message:?}, the supergfxd service \
+                             may not be running or installed"
+                        )
+                    }
+                    _ => warn!("Couldn't get mode from supergfxd: {e:?}"),
+                },
             }
 
             info!("Started ROGTray");

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

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

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

@@ -6,8 +6,9 @@ pub mod setup_system;
 use std::sync::{Arc, Mutex};
 
 use config_traits::StdConfig;
+use log::warn;
 use rog_dbus::list_iface_blocking;
-use slint::{ComponentHandle, PhysicalSize, SharedString, Weak};
+use slint::{ComponentHandle, SharedString, Weak};
 
 use crate::config::Config;
 use crate::ui::setup_anime::setup_anime_page;
@@ -16,21 +17,6 @@ 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};
 
-// This macro expects are consistent naming between proxy calls and slint
-// globals
-#[macro_export]
-macro_rules! set_ui_props_async {
-    ($ui:ident, $proxy:ident, $global:ident, $proxy_fn:ident) => {
-        if let Ok(value) = $proxy.$proxy_fn().await {
-            $ui.upgrade_in_event_loop(move |handle| {
-                concat_idents::concat_idents!(set = set_, $proxy_fn {
-                    handle.global::<$global>().set(value.into());
-                });
-            }).ok();
-        }
-    };
-}
-
 // this macro sets up:
 // - a link from UI callback -> dbus proxy property
 // - a link from dbus property signal -> UI state
@@ -41,7 +27,7 @@ macro_rules! set_ui_callbacks {
         let handle_copy = $handle.as_weak();
         let proxy_copy = $proxy.clone();
         let data = $handle.global::<$data>();
-        concat_idents::concat_idents!(on_set = on_set_, $proxy_fn {
+        concat_idents::concat_idents!(on_set = on_cb_, $proxy_fn {
         data.on_set(move |value| {
             let proxy_copy = proxy_copy.clone();
             let handle_copy = handle_copy.clone();
@@ -64,7 +50,7 @@ macro_rules! set_ui_callbacks {
         tokio::spawn(async move {
             let mut x = proxy_copy.receive().await;
             concat_idents::concat_idents!(set = set_, $proxy_fn {
-            use zbus::export::futures_util::StreamExt;
+            use futures_util::StreamExt;
             while let Some(e) = x.next().await {
                 if let Ok(out) = e.get().await {
                     handle_copy.upgrade_in_event_loop(move |handle| {
@@ -97,25 +83,25 @@ pub fn show_toast(
 }
 
 pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
-    let ui = MainWindow::new().unwrap();
-    if let Ok(lock) = config.try_lock() {
-        let fullscreen = lock.start_fullscreen;
-        let width = lock.fullscreen_width;
-        let height = lock.fullscreen_height;
-        if fullscreen {
-            ui.window().set_fullscreen(fullscreen);
-            ui.window().set_size(PhysicalSize { width, height });
-        }
-    };
+    slint::set_xdg_app_id("rog-control-center")
+        .map_err(|e| warn!("Couldn't set application ID: {e:?}"))
+        .ok();
+    let ui = MainWindow::new()
+        .map_err(|e| warn!("Couldn't create main window: {e:?}"))
+        .unwrap();
+    ui.window()
+        .show()
+        .map_err(|e| warn!("Couldn't show main window: {e:?}"))
+        .unwrap();
 
     let available = list_iface_blocking().unwrap_or_default();
     ui.set_sidebar_items_avilable(
         [
             // Needs to match the order of slint sidebar items
-            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()),
+            available.contains(&"xyz.ljones.Platform".to_string()),
+            available.contains(&"xyz.ljones.Aura".to_string()),
+            available.contains(&"xyz.ljones.Anime".to_string()),
+            available.contains(&"xyz.ljones.FanCurves".to_string()),
             true,
             true,
         ]
@@ -127,19 +113,20 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
     });
 
     setup_app_settings_page(&ui, config.clone());
-    if available.contains(&"org.asuslinux.Platform".to_string()) {
+    if available.contains(&"xyz.ljones.Platform".to_string()) {
         setup_system_page(&ui, config.clone());
         setup_system_page_callbacks(&ui, config.clone());
     }
-    if available.contains(&"org.asuslinux.Aura".to_string()) {
+    if available.contains(&"xyz.ljones.Aura".to_string()) {
         setup_aura_page(&ui, config.clone());
     }
-    if available.contains(&"org.asuslinux.Anime".to_string()) {
+    if available.contains(&"xyz.ljones.Anime".to_string()) {
         setup_anime_page(&ui, config.clone());
     }
-    if available.contains(&"org.asuslinux.FanCurves".to_string()) {
+    if available.contains(&"xyz.ljones.FanCurves".to_string()) {
         setup_fan_curve_page(&ui, config);
     }
+
     ui
 }
 

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

@@ -1,7 +1,8 @@
 use std::sync::{Arc, Mutex};
 
-use log::{error, info, warn};
+use log::{error, info};
 use rog_anime::Animations;
+use rog_dbus::find_iface_async;
 use rog_dbus::zbus_anime::AnimeProxy;
 use slint::ComponentHandle;
 
@@ -12,124 +13,123 @@ 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 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");
+        let Ok(animes) = find_iface_async::<AnimeProxy>("xyz.ljones.Anime").await else {
+            info!("This device appears to have no aura interfaces");
             return;
         };
 
-        set_ui_props_async!(handle, anime, AnimePageData, brightness);
-        set_ui_props_async!(handle, anime, AnimePageData, builtins_enabled);
-        set_ui_props_async!(handle, anime, AnimePageData, enable_display);
-        set_ui_props_async!(handle, anime, AnimePageData, off_when_lid_closed);
-        set_ui_props_async!(handle, anime, AnimePageData, off_when_suspended);
-        set_ui_props_async!(handle, anime, AnimePageData, off_when_unplugged);
+        for anime in animes {
+            set_ui_props_async!(handle, anime, AnimePageData, brightness);
+            set_ui_props_async!(handle, anime, AnimePageData, builtins_enabled);
+            set_ui_props_async!(handle, anime, AnimePageData, enable_display);
+            set_ui_props_async!(handle, anime, AnimePageData, off_when_lid_closed);
+            set_ui_props_async!(handle, anime, AnimePageData, off_when_suspended);
+            set_ui_props_async!(handle, anime, AnimePageData, off_when_unplugged);
 
-        let builtins = anime.builtin_animations().await.unwrap_or_default();
-        handle
-            .upgrade_in_event_loop(move |handle| {
-                {
-                    let global = handle.global::<AnimePageData>();
-                    global.set_boot_anim(builtins.boot as i32);
-                    global.set_awake_anim(builtins.awake as i32);
-                    global.set_sleep_anim(builtins.sleep as i32);
-                    global.set_shutdown_anim(builtins.shutdown as i32);
+            let builtins = anime.builtin_animations().await.unwrap_or_default();
+            handle
+                .upgrade_in_event_loop(move |handle| {
+                    {
+                        let global = handle.global::<AnimePageData>();
+                        global.set_boot_anim(builtins.boot as i32);
+                        global.set_awake_anim(builtins.awake as i32);
+                        global.set_sleep_anim(builtins.sleep as i32);
+                        global.set_shutdown_anim(builtins.shutdown as i32);
 
-                    let handle_copy = handle.as_weak();
-                    let anime_copy = anime.clone();
-                    global.on_set_builtin_animations(move |boot, awake, sleep, shutdown| {
-                        let handle_copy = handle_copy.clone();
-                        let anime_copy = anime_copy.clone();
-                        tokio::spawn(async move {
-                            show_toast(
-                                "Anime builtin animations changed".into(),
-                                "Failed to set Anime builtin animations".into(),
-                                handle_copy,
-                                anime_copy
-                                    .set_builtin_animations(Animations {
-                                        boot: boot.into(),
-                                        awake: awake.into(),
-                                        sleep: sleep.into(),
-                                        shutdown: shutdown.into(),
-                                    })
-                                    .await,
-                            );
+                        let handle_copy = handle.as_weak();
+                        let anime_copy = anime.clone();
+                        global.on_cb_builtin_animations(move |boot, awake, sleep, shutdown| {
+                            let handle_copy = handle_copy.clone();
+                            let anime_copy = anime_copy.clone();
+                            tokio::spawn(async move {
+                                show_toast(
+                                    "Anime builtin animations changed".into(),
+                                    "Failed to set Anime builtin animations".into(),
+                                    handle_copy,
+                                    anime_copy
+                                        .set_builtin_animations(Animations {
+                                            boot: boot.into(),
+                                            awake: awake.into(),
+                                            sleep: sleep.into(),
+                                            shutdown: shutdown.into(),
+                                        })
+                                        .await,
+                                );
+                            });
                         });
-                    });
 
-                    let handle_copy = handle.as_weak();
-                    let anime_copy = anime.clone();
-                    tokio::spawn(async move {
-                        let mut x = anime_copy.receive_builtin_animations_changed().await;
-                        use zbus::export::futures_util::StreamExt;
-                        while let Some(e) = x.next().await {
-                            if let Ok(out) = e.get().await {
-                                handle_copy
-                                    .upgrade_in_event_loop(move |handle| {
-                                        handle
-                                            .global::<AnimePageData>()
-                                            .set_boot_anim(out.boot.into());
-                                        handle
-                                            .global::<AnimePageData>()
-                                            .set_awake_anim(out.awake.into());
-                                        handle
-                                            .global::<AnimePageData>()
-                                            .set_sleep_anim(out.sleep.into());
-                                        handle
-                                            .global::<AnimePageData>()
-                                            .set_shutdown_anim(out.shutdown.into());
-                                    })
-                                    .ok();
+                        let handle_copy = handle.as_weak();
+                        let anime_copy = anime.clone();
+                        tokio::spawn(async move {
+                            let mut x = anime_copy.receive_builtin_animations_changed().await;
+                            use futures_util::StreamExt;
+                            while let Some(e) = x.next().await {
+                                if let Ok(out) = e.get().await {
+                                    handle_copy
+                                        .upgrade_in_event_loop(move |handle| {
+                                            handle
+                                                .global::<AnimePageData>()
+                                                .set_boot_anim(out.boot.into());
+                                            handle
+                                                .global::<AnimePageData>()
+                                                .set_awake_anim(out.awake.into());
+                                            handle
+                                                .global::<AnimePageData>()
+                                                .set_sleep_anim(out.sleep.into());
+                                            handle
+                                                .global::<AnimePageData>()
+                                                .set_shutdown_anim(out.shutdown.into());
+                                        })
+                                        .ok();
+                                }
                             }
-                        }
-                    });
-                }
+                        });
+                    }
 
-                set_ui_callbacks!(handle,
-                    AnimePageData(.into()),
-                    anime.brightness(.into()),
-                    "Anime LED brightness successfully set to {}",
-                    "Setting Anime LED brightness failed"
-                );
-                set_ui_callbacks!(
-                    handle,
-                    AnimePageData(),
-                    anime.builtins_enabled(),
-                    "Keyboard LED mode successfully set to {}",
-                    "Setting keyboard LEDmode failed"
-                );
-                set_ui_callbacks!(
-                    handle,
-                    AnimePageData(),
-                    anime.enable_display(),
-                    "Anime display successfully set to {}",
-                    "Setting Anime display failed"
-                );
-                set_ui_callbacks!(
-                    handle,
-                    AnimePageData(),
-                    anime.off_when_lid_closed(),
-                    "Anime off_when_lid_closed successfully set to {}",
-                    "Setting Anime off_when_lid_closed failed"
-                );
-                set_ui_callbacks!(
-                    handle,
-                    AnimePageData(),
-                    anime.off_when_suspended(),
-                    "Anime off_when_suspended successfully set to {}",
-                    "Setting Anime off_when_suspended failed"
-                );
-                set_ui_callbacks!(
-                    handle,
-                    AnimePageData(),
-                    anime.off_when_unplugged(),
-                    "Anime off_when_unplugged successfully set to {}",
-                    "Setting Anime off_when_unplugged failed"
-                );
-            })
-            .map_err(|e| error!("setup_anime_page: upgrade_in_event_loop: {e:?}"))
-            .ok();
+                    set_ui_callbacks!(handle,
+                        AnimePageData(.into()),
+                        anime.brightness(.into()),
+                        "Anime LED brightness successfully set to {}",
+                        "Setting Anime LED brightness failed"
+                    );
+                    set_ui_callbacks!(
+                        handle,
+                        AnimePageData(),
+                        anime.builtins_enabled(),
+                        "Keyboard LED mode successfully set to {}",
+                        "Setting keyboard LEDmode failed"
+                    );
+                    set_ui_callbacks!(
+                        handle,
+                        AnimePageData(),
+                        anime.enable_display(),
+                        "Anime display successfully set to {}",
+                        "Setting Anime display failed"
+                    );
+                    set_ui_callbacks!(
+                        handle,
+                        AnimePageData(),
+                        anime.off_when_lid_closed(),
+                        "Anime off_when_lid_closed successfully set to {}",
+                        "Setting Anime off_when_lid_closed failed"
+                    );
+                    set_ui_callbacks!(
+                        handle,
+                        AnimePageData(),
+                        anime.off_when_suspended(),
+                        "Anime off_when_suspended successfully set to {}",
+                        "Setting Anime off_when_suspended failed"
+                    );
+                    set_ui_callbacks!(
+                        handle,
+                        AnimePageData(),
+                        anime.off_when_unplugged(),
+                        "Anime off_when_unplugged successfully set to {}",
+                        "Setting Anime off_when_unplugged failed"
+                    );
+                })
+                .map_err(|e| error!("setup_anime_page: upgrade_in_event_loop: {e:?}"))
+                .ok();
+        }
     });
 }

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

@@ -38,12 +38,12 @@ fn decode_hex(s: &str) -> RgbaColor<u8> {
 // 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", "/").await?;
+    let f = zbus::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").await?;
     let interfaces = f.get_managed_objects().await?;
     let mut aura_paths = Vec::new();
     for v in interfaces.iter() {
         for k in v.1.keys() {
-            if k.as_str() == "org.asuslinux.Aura" {
+            if k.as_str() == "xyz.ljones.Aura" {
                 println!("Found aura device at {}, {}", v.0, k);
                 aura_paths.push(v.0.clone());
             }
@@ -56,7 +56,7 @@ async fn find_aura_iface() -> Result<AuraProxy<'static>, Box<dyn std::error::Err
     if let Some(path) = aura_paths.first() {
         return Ok(AuraProxy::builder(&conn)
             .path(path.clone())?
-            .destination("org.asuslinux.Daemon")?
+            .destination("xyz.ljones.Asusd")?
             .build()
             .await?);
     }
@@ -65,12 +65,12 @@ async fn find_aura_iface() -> Result<AuraProxy<'static>, Box<dyn std::error::Err
 }
 
 pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
-    ui.global::<AuraPageData>().on_set_hex_from_colour(|c| {
+    ui.global::<AuraPageData>().on_cb_hex_from_colour(|c| {
         format!("#{:02X}{:02X}{:02X}", c.red(), c.green(), c.blue()).into()
     });
 
     ui.global::<AuraPageData>()
-        .on_set_hex_to_colour(|s| decode_hex(s.as_str()).into());
+        .on_cb_hex_to_colour(|s| decode_hex(s.as_str()).into());
 
     let handle = ui.as_weak();
     tokio::spawn(async move {
@@ -189,7 +189,7 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
             .upgrade_in_event_loop(|handle| {
                 handle
                     .global::<AuraPageData>()
-                    .on_set_led_power(move |power| {
+                    .on_cb_led_power(move |power| {
                         let handle_copy = handle_copy.clone();
                         let proxy_copy = aura.clone();
                         let power: LaptopAuraPower = power.into();
@@ -211,7 +211,7 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
         // spawn required since the while let never exits
         tokio::spawn(async move {
             let mut x = proxy_copy.receive_led_mode_data_changed().await;
-            use zbus::export::futures_util::StreamExt;
+            use futures_util::StreamExt;
             while let Some(e) = x.next().await {
                 if let Ok(out) = e.get().await {
                     handle_copy

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

@@ -1,8 +1,9 @@
 use std::sync::{Arc, Mutex};
 
-use log::{error, info};
+use log::error;
 use rog_dbus::zbus_fan_curves::FanCurvesProxy;
-use rog_platform::platform::ThrottlePolicy;
+use rog_dbus::zbus_platform::PlatformProxy;
+use rog_platform::platform::PlatformProfile;
 use rog_profiles::fan_curve_set::CurveData;
 use slint::{ComponentHandle, Model, Weak};
 
@@ -54,14 +55,17 @@ pub fn update_fan_data(
                 global.set_performance_available(true);
                 match fan.fan {
                     rog_profiles::FanCurvePU::CPU => {
+                        global.set_cpu_fan_available(true);
                         global.set_performance_cpu_enabled(fan.enabled);
                         global.set_performance_cpu(collect(&fan.temp, &fan.pwm))
                     }
                     rog_profiles::FanCurvePU::GPU => {
+                        global.set_gpu_fan_available(true);
                         global.set_performance_gpu_enabled(fan.enabled);
                         global.set_performance_gpu(collect(&fan.temp, &fan.pwm))
                     }
                     rog_profiles::FanCurvePU::MID => {
+                        global.set_mid_fan_available(true);
                         global.set_performance_mid_enabled(fan.enabled);
                         global.set_performance_mid(collect(&fan.temp, &fan.pwm))
                     }
@@ -71,12 +75,18 @@ pub fn update_fan_data(
                 global.set_quiet_available(true);
                 match fan.fan {
                     rog_profiles::FanCurvePU::CPU => {
+                        global.set_cpu_fan_available(true);
+                        global.set_quiet_cpu_enabled(fan.enabled);
                         global.set_quiet_cpu(collect(&fan.temp, &fan.pwm))
                     }
                     rog_profiles::FanCurvePU::GPU => {
+                        global.set_gpu_fan_available(true);
+                        global.set_quiet_gpu_enabled(fan.enabled);
                         global.set_quiet_gpu(collect(&fan.temp, &fan.pwm))
                     }
                     rog_profiles::FanCurvePU::MID => {
+                        global.set_mid_fan_available(true);
+                        global.set_quiet_mid_enabled(fan.enabled);
                         global.set_quiet_mid(collect(&fan.temp, &fan.pwm))
                     }
                 }
@@ -91,96 +101,131 @@ 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 = if let Ok(conn) = zbus::Connection::system().await.map_err(|e| error!("{e:}")) {
-            conn
-        } else {
-            return;
+        let conn = match zbus::Connection::system().await {
+            Ok(conn) => conn,
+            Err(e) => {
+                error!("{e:}");
+                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 fans = match FanCurvesProxy::new(&conn).await {
+            Ok(fans) => fans,
+            Err(e) => {
+                error!("{e:}");
+                return;
+            }
+        };
+
+        let platform = match PlatformProxy::new(&conn).await {
+            Ok(platform) => platform,
+            Err(e) => {
+                error!("{e:}");
+                return;
+            }
+        };
+
+        let platform_profile_choices = match platform.platform_profile_choices().await {
+            Ok(choices) => choices,
+            Err(e) => {
+                error!("{e:}");
+                return;
+            }
         };
 
         let handle_copy = handle.clone();
         // Do initial setup
-        let Ok(balanced) = fans
-            .fan_curve_data(ThrottlePolicy::Balanced)
-            .await
-            .map_err(|e| error!("{e:}"))
-        else {
-            return;
+        let balanced = match fans.fan_curve_data(PlatformProfile::Balanced).await {
+            Ok(data) => data,
+            Err(e) => {
+                error!("Couldn't get balanced data: {e:}");
+                return;
+            }
         };
-        let Ok(perf) = fans
-            .fan_curve_data(ThrottlePolicy::Performance)
-            .await
-            .map_err(|e| error!("{e:}"))
-        else {
-            return;
+
+        let perf = match fans.fan_curve_data(PlatformProfile::Performance).await {
+            Ok(data) => data,
+            Err(e) => {
+                error!("Couldn't get performance data: {e:}");
+                return;
+            }
         };
-        let Ok(quiet) = fans
-            .fan_curve_data(ThrottlePolicy::Quiet)
-            .await
-            .map_err(|e| error!("{e:}"))
-        else {
-            return;
+
+        // TODO: the fan curve stuff was written donkeys ago with the expectation that
+        // only 3 profiles existed
+        let profile = if platform_profile_choices.contains(&PlatformProfile::Quiet) {
+            PlatformProfile::Quiet
+        } else {
+            PlatformProfile::LowPower
         };
+        let quiet = match fans.fan_curve_data(profile).await {
+            Ok(data) => data,
+            Err(e) => {
+                error!("Couldn't get quiet data: {e:}");
+                return;
+            }
+        };
+
         update_fan_data(handle, balanced, perf, quiet);
 
+        let choices_for_ui = platform_profile_choices.clone();
         let handle_next1 = handle_copy.clone();
-        handle_copy
-            .upgrade_in_event_loop(move |handle| {
-                let global = handle.global::<FanPageData>();
-                let fans1 = fans.clone();
-                global.on_set_profile_default(move |profile| {
-                    let fans = fans1.clone();
-                    let handle_next = handle_next1.clone();
-                    tokio::spawn(async move {
-                        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
-                            .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);
-                    });
+        if let Err(e) = handle_copy.upgrade_in_event_loop(move |handle| {
+            let global = handle.global::<FanPageData>();
+            let fans1 = fans.clone();
+            let choices = choices_for_ui.clone();
+            global.on_set_profile_default(move |profile| {
+                let fans = fans1.clone();
+                let handle_next = handle_next1.clone();
+                let choices = choices.clone();
+                tokio::spawn(async move {
+                    let mut target: PlatformProfile = profile.into();
+                    if target == PlatformProfile::Quiet
+                        && !choices.contains(&PlatformProfile::Quiet)
+                    {
+                        target = PlatformProfile::LowPower;
+                    }
+                    if fans.set_curves_to_defaults(target).await.is_err() {
+                        return;
+                    }
+                    let Ok(balanced) = fans
+                        .fan_curve_data(PlatformProfile::Balanced)
+                        .await
+                        .map_err(|e| error!("{e:}"))
+                    else {
+                        return;
+                    };
+                    let Ok(perf) = fans
+                        .fan_curve_data(PlatformProfile::Performance)
+                        .await
+                        .map_err(|e| error!("{e:}"))
+                    else {
+                        return;
+                    };
+                    let Ok(quiet) = fans
+                        .fan_curve_data(PlatformProfile::Quiet)
+                        .await
+                        .map_err(|e| error!("{e:}"))
+                    else {
+                        return;
+                    };
+                    update_fan_data(handle_next, balanced, perf, quiet);
                 });
-                global.on_set_fan_data(move |fan, profile, enabled, data| {
-                    let fans = fans.clone();
-                    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
-                            .map_err(|e| error!("{e:}"))
-                            .ok()
-                    });
+            });
+            global.on_set_fan_data(move |fan, profile, enabled, data| {
+                let fans = fans.clone();
+                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
+                        .map_err(|e| error!("{e:}"))
+                        .ok()
                 });
-            })
-            .map_err(|e| error!("setup_fan_curve_page: upgrade_in_event_loop: {e:?}"))
-            .ok();
+            });
+        }) {
+            error!("setup_fan_curve_page: upgrade_in_event_loop: {e:?}");
+        }
     });
 }
 
@@ -195,6 +240,8 @@ fn fan_data_for(fan: FanType, enabled: bool, data: Vec<Node>) -> CurveData {
         pwm[i] = n.y as u8;
     }
 
+    dbg!(&fan, enabled);
+
     CurveData {
         fan: fan.into(),
         pwm,

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

@@ -1,40 +1,279 @@
 use std::sync::{Arc, Mutex};
 
+use concat_idents::concat_idents;
+use log::{debug, error};
+use rog_dbus::asus_armoury::AsusArmouryProxy;
+use rog_dbus::zbus_backlight::BacklightProxy;
 use rog_dbus::zbus_platform::{PlatformProxy, PlatformProxyBlocking};
+use rog_platform::asus_armoury::FirmwareAttribute;
 use rog_platform::platform::Properties;
-use slint::ComponentHandle;
+use slint::{ComponentHandle, Model, ModelRc, SharedString, VecModel};
 
 use super::show_toast;
 use crate::config::Config;
-use crate::{
-    set_ui_callbacks, set_ui_props_async, AvailableSystemProperties, MainWindow, SystemPageData,
+use crate::zbus_proxies::find_iface_async;
+use crate::{set_ui_callbacks, AttrMinMax, MainWindow, SystemPageData};
+
+const MINMAX: AttrMinMax = AttrMinMax {
+    min: 0,
+    max: 0,
+    current: -1.0,
 };
 
 pub fn setup_system_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
-    let conn = zbus::blocking::Connection::system().unwrap();
-    let platform = PlatformProxyBlocking::new(&conn).unwrap();
+    let conn = zbus::blocking::Connection::system()
+        .map_err(|e| error!("DBus system connection failed: {e:?}"))
+        .unwrap();
+    let platform = PlatformProxyBlocking::builder(&conn)
+        .build()
+        .map_err(|e| error!("PlatformProxy failed: {e:?}"))
+        .unwrap();
+    // let armoury_attrs =
+    // find_iface::<AsusArmouryProxyBlocking>("xyz.ljones.AsusArmoury").unwrap();
 
-    let sys_props = platform.supported_properties().unwrap();
-    log::debug!("Available system properties: {sys_props:?}");
-    let props = AvailableSystemProperties {
-        ac_command: true,
-        bat_command: true,
-        charge_control_end_threshold: sys_props.contains(&Properties::ChargeControlEndThreshold),
-        disable_nvidia_powerd_on_battery: true,
-        mini_led_mode: sys_props.contains(&Properties::MiniLedMode),
-        nv_dynamic_boost: sys_props.contains(&Properties::NvDynamicBoost),
-        nv_temp_target: sys_props.contains(&Properties::NvTempTarget),
-        panel_od: sys_props.contains(&Properties::PanelOd),
-        boot_sound: sys_props.contains(&Properties::PostAnimationSound),
-        ppt_apu_sppt: sys_props.contains(&Properties::PptApuSppt),
-        ppt_fppt: sys_props.contains(&Properties::PptFppt),
-        ppt_pl1_spl: sys_props.contains(&Properties::PptPl1Spl),
-        ppt_pl2_sppt: sys_props.contains(&Properties::PptPl2Sppt),
-        ppt_platform_sppt: sys_props.contains(&Properties::PptPlatformSppt),
-        throttle_thermal_policy: sys_props.contains(&Properties::ThrottlePolicy),
+    // Null everything before the setup step
+    debug!("Defaulting system page values");
+    ui.global::<SystemPageData>()
+        .set_charge_control_end_threshold(-1.0);
+    ui.global::<SystemPageData>()
+        .set_charge_control_enabled(false);
+    ui.global::<SystemPageData>().set_platform_profile(-1);
+    ui.global::<SystemPageData>().set_panel_overdrive(-1);
+    ui.global::<SystemPageData>().set_boot_sound(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_awake(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_sleep(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_boot(-1);
+    ui.global::<SystemPageData>().set_kbd_leds_shutdown(-1);
+    ui.global::<SystemPageData>().set_screen_auto_brightness(-1);
+    ui.global::<SystemPageData>().set_mcu_powersave(-1);
+    ui.global::<SystemPageData>().set_mini_led_mode(-1);
+    ui.global::<SystemPageData>().set_screenpad_brightness(-1);
+    ui.global::<SystemPageData>().set_ppt_pl1_spl(MINMAX);
+    ui.global::<SystemPageData>().set_ppt_pl2_sppt(MINMAX);
+    ui.global::<SystemPageData>().set_ppt_pl3_fppt(MINMAX);
+    ui.global::<SystemPageData>().set_ppt_fppt(MINMAX);
+    ui.global::<SystemPageData>().set_ppt_apu_sppt(MINMAX);
+    ui.global::<SystemPageData>().set_ppt_platform_sppt(MINMAX);
+    ui.global::<SystemPageData>().set_nv_dynamic_boost(MINMAX);
+    ui.global::<SystemPageData>().set_nv_temp_target(MINMAX);
+    ui.global::<SystemPageData>().set_ppt_enabled(false);
+    ui.global::<SystemPageData>()
+        .set_ppt_enabled_available(false);
+
+    if let Ok(sys_props) = platform
+        .supported_properties()
+        .map_err(|e| log::error!("Failed to get supported properties: {}", e))
+    {
+        log::debug!("Available system properties: {:?}", &sys_props);
+        if sys_props.contains(&Properties::ChargeControlEndThreshold) {
+            ui.global::<SystemPageData>()
+                .set_charge_control_end_threshold(60.0);
+            ui.global::<SystemPageData>()
+                .set_charge_control_enabled(true);
+        }
+    }
+}
+
+macro_rules! convert_value {
+    (bool, $value:expr) => {
+        $value == 1
     };
+    (i32, $value:expr) => {
+        $value as i32
+    };
+    (f32, $value:expr) => {
+        $value as f32
+    };
+}
 
-    ui.global::<SystemPageData>().set_available(props);
+macro_rules! convert_to_dbus {
+    (bool, $value:expr) => {
+        if $value {
+            1
+        } else {
+            0
+        }
+    };
+    (i32, $value:expr) => {
+        $value as i32
+    };
+    (f32, $value:expr) => {
+        $value as i32
+    };
+}
+
+macro_rules! init_property {
+    ($property:ident, $handle:expr, $value:expr, $type:tt) => {{
+        concat_idents!(setter = set_, $property {
+            $handle.global::<SystemPageData>().setter(convert_value!($type, $value));
+        });
+    }};
+}
+
+// For initial setup of min/max/val values
+macro_rules! init_minmax_property {
+    ($property:ident, $handle:expr, $attr:expr) => {
+        let proxy_copy = $attr.clone();
+        let handle_copy = $handle.as_weak();
+        tokio::spawn(async move {
+            let min = proxy_copy.min_value().await.unwrap();
+            let max = proxy_copy.max_value().await.unwrap();
+            let current = proxy_copy.current_value().await.unwrap() as f32;
+            handle_copy
+                .upgrade_in_event_loop(move |handle| {
+                    concat_idents!(setter = set_, $property {
+                        handle
+                            .global::<SystemPageData>()
+                            .setter(AttrMinMax { min, max, current });
+                    });
+                })
+                .ok();
+        });
+    };
+}
+
+// For handling callbacks from UI value changes
+macro_rules! setup_callback {
+    ($property:ident, $handle:expr, $attr:expr, $type:tt) => {
+        let handle_copy = $handle.as_weak();
+        let proxy_copy = $attr.clone();
+        concat_idents!(on_callback = on_cb_, $property {
+            $handle
+                .global::<SystemPageData>()
+                .on_callback(move |v| {
+                    let handle_copy = handle_copy.clone();
+                    let proxy_copy = proxy_copy.clone();
+                    tokio::spawn(async move {
+                        show_toast(
+                            format!("{} successfully set to {}", stringify!($property), v).into(),
+                            format!("Setting {} failed", stringify!($property)).into(),
+                            handle_copy,
+                            proxy_copy.set_current_value(convert_to_dbus!($type, v)).await,
+                        );
+                    });
+                });
+        });
+    };
+}
+
+// For handling callbacks from UI value changes
+macro_rules! setup_callback_restore_default {
+    ($property:ident, $handle:expr, $attr:expr) => {
+        let proxy_copy = $attr.clone();
+        concat_idents!(on_callback = on_cb_default_, $property {
+            $handle
+                .global::<SystemPageData>()
+                .on_callback(move || {
+                    let proxy_copy = proxy_copy.clone();
+                    tokio::spawn(async move {
+                        proxy_copy.restore_default().await.ok();
+                    });
+                });
+        });
+    };
+}
+
+macro_rules! setup_external {
+    ($property:ident, $type:tt, $handle:expr, $attr:expr, $value:expr) => {{
+        // EXTERNAL CHANGES
+        let handle_copy = $handle.as_weak();
+        let proxy_copy = $attr.clone();
+        concat_idents!(setter = set_, $property {
+            tokio::spawn(async move {
+                let mut x = proxy_copy.receive_current_value_changed().await;
+                use futures_util::StreamExt;
+                while let Some(e) = x.next().await {
+                    if let Ok(out) = e.get().await {
+                        handle_copy
+                            .upgrade_in_event_loop(move |handle| {
+                                handle
+                                    .global::<SystemPageData>()
+                                    .setter(convert_value!($type, out));
+                            })
+                            .ok();
+                    }
+                }
+            });
+        });
+    }};
+}
+
+// For handling external value changes
+macro_rules! setup_value_watch {
+    ($property:ident, $handle:expr, $proxy:expr, $value_type:ident $($conv: tt)*) => {
+        let handle_copy = $handle.as_weak();
+        let proxy_copy = $proxy.clone();
+        tokio::spawn(async move {
+            let mut x = concat_idents!(recv = receive_, $value_type, _value_changed {
+                proxy_copy.recv().await
+            });
+            use futures_util::StreamExt;
+            while let Some(e) = x.next().await {
+                if let Ok(out) = e.get().await {
+                    concat_idents!(getter = get_, $property {
+                        handle_copy
+                            .upgrade_in_event_loop(move |handle| {
+                                let mut tmp: AttrMinMax =
+                                    handle.global::<SystemPageData>().getter();
+                                tmp.$value_type = out $($conv)*;
+                                concat_idents!(setter = set_, $property {
+                                    handle.global::<SystemPageData>().setter(tmp);
+                                });
+                            })
+                            .ok();
+                    });
+                }
+            }
+        });
+    };
+}
+
+macro_rules! setup_minmax_external {
+    ($property:ident, $handle:expr, $attr:expr, $platform:expr) => {
+        setup_value_watch!($property, $handle, $attr, current as f32);
+        setup_value_watch!($property, $handle, $attr, min);
+        setup_value_watch!($property, $handle, $attr, max);
+
+        let handle_copy = $handle.as_weak();
+        let proxy_copy = $attr.clone();
+        let platform_proxy_copy = $platform.clone();
+        tokio::spawn(async move {
+            let mut x = platform_proxy_copy.receive_platform_profile_changed().await;
+            use futures_util::StreamExt;
+            while let Some(e) = x.next().await {
+                if let Ok(_) = e.get().await {
+                    debug!("receive_platform_profile_changed, getting new {}", stringify!(attr));
+                    let min = proxy_copy.min_value().await.unwrap();
+                    let max = proxy_copy.max_value().await.unwrap();
+                    let current = proxy_copy.current_value().await.unwrap() as f32;
+                    handle_copy
+                        .upgrade_in_event_loop(move |handle| {
+                            concat_idents!(setter = set_, $property {
+                                handle
+                                    .global::<SystemPageData>()
+                                    .setter(AttrMinMax { min, max, current });
+                            });
+                        })
+                        .ok();
+                }
+            }
+        });
+    };
+}
+
+// This macro expects are consistent naming between proxy calls and slint
+// globals
+#[macro_export]
+macro_rules! set_ui_props_async {
+    ($ui:ident, $proxy:ident, $global:ident, $proxy_fn:ident) => {
+        if let Ok(value) = $proxy.$proxy_fn().await {
+            $ui.upgrade_in_event_loop(move |handle| {
+                concat_idents::concat_idents!(set = set_, $proxy_fn {
+                    handle.global::<$global>().set(value.into());
+                });
+            }).ok();
+        }
+    };
 }
 
 pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
@@ -44,199 +283,461 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: 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 platform = PlatformProxy::new(&conn).await.unwrap();
+        let conn = zbus::Connection::system()
+            .await
+            .map_err(|e| {
+                log::error!("Failed to connect to system bus: {}", e);
+            })
+            .unwrap();
+        let platform = PlatformProxy::builder(&conn)
+            .build()
+            .await
+            .map_err(|e| {
+                log::error!("Failed to create platform proxy: {}", e);
+            })
+            .unwrap();
+        let backlight = BacklightProxy::builder(&conn)
+            .build()
+            .await
+            .map_err(|e| {
+                log::error!("Failed to create backlight proxy: {}", e);
+            })
+            .unwrap();
 
+        debug!("Setting up system page profile callbacks");
         set_ui_props_async!(
             handle,
             platform,
             SystemPageData,
             charge_control_end_threshold
         );
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_thermal_policy);
 
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_policy_linked_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_balanced_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_performance_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_quiet_epp);
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_policy_on_battery);
+        let platform_copy = platform.clone();
+        if let Ok(mut value) = platform.platform_profile_choices().await {
+            debug!("Available platform profile choices: {:?}", value);
+            handle
+                .upgrade_in_event_loop(move |handle| {
+                    value.sort();
+                    let translate: Vec<SharedString> = handle
+                        .global::<SystemPageData>()
+                        .get_platform_profile_choices()
+                        .iter()
+                        .collect();
+                    let mut indexes = Vec::new();
+                    let strings: Vec<SharedString> = value
+                        .iter()
+                        .filter_map(|p| {
+                            let index = i32::from(*p) as usize;
+                            if index < translate.len() {
+                                indexes.push(index as i32);
+                                Some(translate[index].clone())
+                            } else {
+                                None
+                            }
+                        })
+                        .collect();
+                    let choices = ModelRc::new(VecModel::from(strings));
+                    handle
+                        .global::<SystemPageData>()
+                        .set_platform_profile_choices(choices);
+                    handle
+                        .global::<SystemPageData>()
+                        .set_platform_profile_indexes(ModelRc::from(indexes.as_slice()));
+
+                    // Set current only after setting the choices up
+                    let handle = handle.as_weak();
+                    tokio::spawn(async move {
+                        if let Ok(value) = platform_copy.platform_profile().await {
+                            let profile_value = <i32>::from(value);
+                            handle
+                                .upgrade_in_event_loop(move |handle| {
+                                    if let Some(position) =
+                                        indexes.iter().position(|&index| index == profile_value)
+                                    {
+                                        handle
+                                            .global::<SystemPageData>()
+                                            .set_platform_profile(position as i32);
+                                    }
+                                })
+                                .ok();
+                        }
+                    });
+                })
+                .ok();
+        }
+
         set_ui_props_async!(
             handle,
             platform,
             SystemPageData,
-            change_throttle_policy_on_battery
+            platform_profile_linked_epp
         );
-        set_ui_props_async!(handle, platform, SystemPageData, throttle_policy_on_ac);
+        set_ui_props_async!(handle, platform, SystemPageData, profile_balanced_epp);
+        set_ui_props_async!(handle, platform, SystemPageData, profile_performance_epp);
+        set_ui_props_async!(handle, platform, SystemPageData, profile_quiet_epp);
         set_ui_props_async!(
             handle,
             platform,
             SystemPageData,
-            change_throttle_policy_on_ac
+            platform_profile_on_battery
+        );
+        set_ui_props_async!(
+            handle,
+            platform,
+            SystemPageData,
+            change_platform_profile_on_battery
+        );
+        set_ui_props_async!(handle, platform, SystemPageData, platform_profile_on_ac);
+        set_ui_props_async!(
+            handle,
+            platform,
+            SystemPageData,
+            change_platform_profile_on_ac
         );
 
-        set_ui_props_async!(handle, platform, SystemPageData, panel_od);
-        set_ui_props_async!(handle, platform, SystemPageData, boot_sound);
-        set_ui_props_async!(handle, platform, SystemPageData, mini_led_mode);
-        set_ui_props_async!(handle, platform, SystemPageData, ppt_pl1_spl);
-        set_ui_props_async!(handle, platform, SystemPageData, ppt_pl2_sppt);
-        set_ui_props_async!(handle, platform, SystemPageData, ppt_fppt);
-        set_ui_props_async!(handle, platform, SystemPageData, ppt_apu_sppt);
-        set_ui_props_async!(handle, platform, SystemPageData, ppt_platform_sppt);
-        set_ui_props_async!(handle, platform, SystemPageData, nv_dynamic_boost);
-        set_ui_props_async!(handle, platform, SystemPageData, nv_temp_target);
+        set_ui_props_async!(handle, platform, SystemPageData, enable_ppt_group);
 
-        let sys_props = platform.supported_properties().await.unwrap();
-        log::debug!("Available system properties: {sys_props:?}");
-        let props = AvailableSystemProperties {
-            ac_command: true,
-            bat_command: true,
-            charge_control_end_threshold: sys_props
-                .contains(&Properties::ChargeControlEndThreshold),
-            disable_nvidia_powerd_on_battery: true,
-            mini_led_mode: sys_props.contains(&Properties::MiniLedMode),
-            nv_dynamic_boost: sys_props.contains(&Properties::NvDynamicBoost),
-            nv_temp_target: sys_props.contains(&Properties::NvTempTarget),
-            panel_od: sys_props.contains(&Properties::PanelOd),
-            boot_sound: sys_props.contains(&Properties::PostAnimationSound),
-            ppt_apu_sppt: sys_props.contains(&Properties::PptApuSppt),
-            ppt_fppt: sys_props.contains(&Properties::PptFppt),
-            ppt_pl1_spl: sys_props.contains(&Properties::PptPl1Spl),
-            ppt_pl2_sppt: sys_props.contains(&Properties::PptPl2Sppt),
-            ppt_platform_sppt: sys_props.contains(&Properties::PptPlatformSppt),
-            throttle_thermal_policy: sys_props.contains(&Properties::ThrottlePolicy),
-        };
+        set_ui_props_async!(handle, backlight, SystemPageData, screenpad_brightness);
+        if let Ok(value) = backlight.screenpad_gamma().await {
+            handle
+                .upgrade_in_event_loop(move |handle| {
+                    handle
+                        .global::<SystemPageData>()
+                        .set_screenpad_gamma(value.parse().unwrap_or(1.0));
+                })
+                .ok();
+        }
 
-        // TODO: move the fail/sucess messages to slint
+        set_ui_props_async!(
+            handle,
+            backlight,
+            SystemPageData,
+            screenpad_sync_with_primary
+        );
+
+        let platform_copy = platform.clone();
         handle
             .upgrade_in_event_loop(move |handle| {
-                handle.global::<SystemPageData>().set_available(props);
+                debug!("Setting up system page standard callbacks");
+
+                let handle_copy = handle.as_weak();
+                let proxy_copy = platform_copy.clone();
+                handle
+                    .global::<SystemPageData>()
+                    .on_cb_platform_profile(move |value| {
+                        let proxy_copy = proxy_copy.clone();
+                        let handle_copy = handle_copy.clone();
+                        tokio::spawn(async move {
+                            show_toast(
+                                format!("Throttle policy set to {}", value).into(),
+                                "Setting Throttle policy failed".into(),
+                                handle_copy,
+                                proxy_copy.set_platform_profile(value.into()).await,
+                            );
+                        });
+                    });
+
+                let handle_copy = handle.as_weak();
+                let proxy_copy = platform_copy.clone();
+                // spawn required since the while let never exits
+                tokio::spawn(async move {
+                    let mut x = proxy_copy.receive_platform_profile_changed().await;
+                    use futures_util::StreamExt;
+                    while let Some(e) = x.next().await {
+                        if let Ok(out) = e.get().await {
+                            handle_copy
+                                .upgrade_in_event_loop(move |handle| {
+                                    let indexes = handle
+                                        .global::<SystemPageData>()
+                                        .get_platform_profile_indexes();
+                                    handle
+                                        .global::<SystemPageData>()
+                                        .set_platform_profile(out as i32);
+                                    let profile_value = <i32>::from(out);
+                                    if let Some(position) =
+                                        indexes.iter().position(|index| index == profile_value)
+                                    {
+                                        handle
+                                            .global::<SystemPageData>()
+                                            .set_platform_profile(position as i32);
+                                    }
+                                })
+                                .ok();
+                        }
+                    }
+                });
+
+                set_ui_callbacks!(handle,
+                    SystemPageData(as bool),
+                    platform_copy.enable_ppt_group(as bool),
+                    "Applied PPT group settings {}",
+                    "Setting PPT group settings failed"
+                );
 
                 set_ui_callbacks!(handle,
                     SystemPageData(as f32),
-                    platform.charge_control_end_threshold(as u8),
+                    platform_copy.charge_control_end_threshold(as u8),
                     "Charge limit successfully set to {}",
                     "Setting Charge limit failed"
                 );
-                set_ui_callbacks!(
-                    handle,
-                    SystemPageData(),
-                    platform.panel_od(),
-                    "Panel OverDrive successfully set to {}",
-                    "Setting Panel OverDrive failed"
-                );
-                set_ui_callbacks!(
-                    handle,
-                    SystemPageData(),
-                    platform.boot_sound(),
-                    "POST Animation sound successfully set to {}",
-                    "Setting POST Animation sound failed"
-                );
-                set_ui_callbacks!(
-                    handle,
-                    SystemPageData(),
-                    platform.mini_led_mode(),
-                    "MiniLED mode successfully set to {}",
-                    "Setting MiniLED mode failed"
-                );
+                // set_ui_callbacks!(handle,
+                //     SystemPageData(as i32),
+                //     platform_copy.platform_profile(.into()),
+                //     "Throttle policy set to {}",
+                //     "Setting Throttle policy failed"
+                // );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform.throttle_thermal_policy(.into()),
-                    "Throttle policy set to {}",
-                    "Setting Throttle policy failed"
-                );
-
-                set_ui_callbacks!(handle,
-                    SystemPageData(as i32),
-                    platform.throttle_balanced_epp(.into()),
+                    platform_copy.profile_balanced_epp(.into()),
                     "Throttle policy EPP set to {}",
                     "Setting Throttle policy EPP failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform.throttle_performance_epp(.into()),
+                    platform_copy.profile_performance_epp(.into()),
                     "Throttle policy EPP set to {}",
                     "Setting Throttle policy EPP failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform.throttle_quiet_epp(.into()),
+                    platform_copy.profile_quiet_epp(.into()),
                     "Throttle policy EPP set to {}",
                     "Setting Throttle policy EPP failed"
                 );
                 set_ui_callbacks!(
                     handle,
                     SystemPageData(),
-                    platform.throttle_policy_linked_epp(),
+                    platform_copy.platform_profile_linked_epp(),
                     "Throttle policy linked to EPP: {}",
                     "Setting Throttle policy linked to EPP failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform.throttle_policy_on_ac(.into()),
+                    platform_copy.platform_profile_on_ac(.into()),
                     "Throttle policy on AC set to {}",
                     "Setting Throttle policy on AC failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as bool),
-                    platform.change_throttle_policy_on_ac(.into()),
+                    platform_copy.change_platform_profile_on_ac(.into()),
                     "Throttle policy on AC enabled: {}",
                     "Setting Throttle policy on AC failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as i32),
-                    platform.throttle_policy_on_battery(.into()),
-                    "Throttle policy on abttery set to {}",
+                    platform_copy.platform_profile_on_battery(.into()),
+                    "Throttle policy on battery set to {}",
                     "Setting Throttle policy on battery failed"
                 );
                 set_ui_callbacks!(handle,
                     SystemPageData(as bool),
-                    platform.change_throttle_policy_on_battery(.into()),
+                    platform_copy.change_platform_profile_on_battery(.into()),
                     "Throttle policy on battery enabled: {}",
                     "Setting Throttle policy on AC failed"
                 );
+
                 set_ui_callbacks!(handle,
-                    SystemPageData(as f32),
-                    platform.ppt_pl1_spl(as u8),
-                    "ppt_pl1_spl successfully set to {}",
-                    "Setting ppt_pl1_spl failed"
+                    SystemPageData(as i32),
+                    backlight.screenpad_brightness(as i32),
+                    "Screenpad successfully set to {}",
+                    "Setting screenpad brightness failed"
                 );
+
                 set_ui_callbacks!(handle,
-                    SystemPageData(as f32),
-                    platform.ppt_pl2_sppt(as u8),
-                    "ppt_pl2_sppt successfully set to {}",
-                    "Setting ppt_pl2_sppt failed"
+                    SystemPageData(as bool),
+                    backlight.screenpad_sync_with_primary(as bool),
+                    "Screenpad successfully set to {}",
+                    "Setting screenpad brightness failed"
                 );
+
                 set_ui_callbacks!(handle,
-                    SystemPageData(as f32),
-                    platform.ppt_fppt(as u8),
-                    "ppt_fppt successfully set to {}",
-                    "Setting ppt_fppt failed"
-                );
-                set_ui_callbacks!(handle,
-                    SystemPageData(as f32),
-                    platform.ppt_apu_sppt(as u8),
-                    "ppt_apu_sppt successfully set to {}",
-                    "Setting ppt_apu_sppt failed"
-                );
-                set_ui_callbacks!(handle,
-                    SystemPageData(as f32),
-                    platform.ppt_platform_sppt(as u8),
-                    "ppt_platform_sppt successfully set to {}",
-                    "Setting ppt_platform_sppt failed"
-                );
-                set_ui_callbacks!(handle,
-                    SystemPageData(as f32),
-                    platform.nv_temp_target(as u8),
-                    "nv_temp_target successfully set to {}",
-                    "Setting nv_temp_target failed"
-                );
-                set_ui_callbacks!(handle,
-                    SystemPageData(as f32),
-                    platform.nv_dynamic_boost(as u8),
-                    "nv_dynamic_boost successfully set to {}",
-                    "Setting nv_dynamic_boost failed"
+                    SystemPageData(.parse().unwrap_or(1.0)),
+                    backlight.screenpad_gamma(.to_string().as_str()),
+                    "Screenpad successfully set to {}",
+                    "Setting screenpad brightness failed"
                 );
             })
-            .unwrap();
+            .ok();
+
+        let armoury_attrs;
+        if let Ok(attrs) = find_iface_async::<AsusArmouryProxy>("xyz.ljones.AsusArmoury").await {
+            debug!("Found AsusArmoury interfaces");
+            armoury_attrs = attrs;
+            handle
+                .upgrade_in_event_loop(|ui| {
+                    ui.global::<SystemPageData>().set_asus_armoury_loaded(true)
+                })
+                .ok();
+        } else {
+            error!(
+                "The kernel module asus-armoury is required, if you do not have this you will \
+                 need to either build or install a kernel which includes the patchwork. This \
+                 driver is in process of being upstreamed"
+            );
+            return;
+        }
+
+        for attr in armoury_attrs {
+            if let Ok(value) = attr.current_value().await {
+                if let Ok(name) = attr.name().await {
+                    debug!("Setting up {} = {value}", <&str>::from(name));
+                    let platform = platform.clone();
+                    handle
+                        .upgrade_in_event_loop(move |handle| match name {
+                            FirmwareAttribute::ApuMem => {}
+                            FirmwareAttribute::CoresPerformance => {}
+                            FirmwareAttribute::CoresEfficiency => {}
+                            FirmwareAttribute::PptEnabled => {
+                                init_property!(ppt_enabled, handle, value, bool);
+                                setup_callback!(ppt_enabled, handle, attr, bool);
+                                let handle_copy = handle.as_weak();
+                                let proxy_copy = attr.clone();
+                                tokio::spawn(async move {
+                                    let mut x = proxy_copy.receive_current_value_changed().await;
+                                    use futures_util::StreamExt;
+                                    while let Some(e) = x.next().await {
+                                        if let Ok(out) = e.get().await {
+                                            handle_copy
+                                                .upgrade_in_event_loop(move |handle| {
+                                                    handle
+                                                        .global::<SystemPageData>()
+                                                        .set_enable_ppt_group(out == 1);
+                                                    handle
+                                                        .global::<SystemPageData>()
+                                                        .set_ppt_enabled(out == 1);
+                                                })
+                                                .ok();
+                                        }
+                                    }
+                                });
+                                handle
+                                    .global::<SystemPageData>()
+                                    .set_ppt_enabled_available(true);
+                                handle
+                                    .global::<SystemPageData>()
+                                    .set_enable_ppt_group(value == 1);
+                            }
+                            FirmwareAttribute::PptPl1Spl => {
+                                init_minmax_property!(ppt_pl1_spl, handle, attr);
+                                setup_callback!(ppt_pl1_spl, handle, attr, i32);
+                                setup_callback_restore_default!(ppt_pl1_spl, handle, attr);
+                                setup_minmax_external!(ppt_pl1_spl, handle, attr, platform);
+                            }
+                            FirmwareAttribute::PptPl2Sppt => {
+                                init_minmax_property!(ppt_pl2_sppt, handle, attr);
+                                setup_callback!(ppt_pl2_sppt, handle, attr, i32);
+                                setup_callback_restore_default!(ppt_pl2_sppt, handle, attr);
+                                setup_minmax_external!(ppt_pl2_sppt, handle, attr, platform);
+                            }
+                            FirmwareAttribute::PptPl3Fppt => {
+                                init_minmax_property!(ppt_pl3_fppt, handle, attr);
+                                setup_callback!(ppt_pl3_fppt, handle, attr, i32);
+                                setup_callback_restore_default!(ppt_pl3_fppt, handle, attr);
+                                setup_minmax_external!(ppt_pl3_fppt, handle, attr, platform);
+                            }
+                            FirmwareAttribute::PptFppt => {
+                                init_minmax_property!(ppt_fppt, handle, attr);
+                                setup_callback!(ppt_fppt, handle, attr, i32);
+                                setup_callback_restore_default!(ppt_fppt, handle, attr);
+                                setup_minmax_external!(ppt_fppt, handle, attr, platform);
+                            }
+                            FirmwareAttribute::PptApuSppt => {
+                                init_minmax_property!(ppt_apu_sppt, handle, attr);
+                                setup_callback!(ppt_apu_sppt, handle, attr, i32);
+                                setup_callback_restore_default!(ppt_apu_sppt, handle, attr);
+                                setup_minmax_external!(ppt_apu_sppt, handle, attr, platform);
+                            }
+                            FirmwareAttribute::PptPlatformSppt => {
+                                init_minmax_property!(ppt_platform_sppt, handle, attr);
+                                setup_callback!(ppt_platform_sppt, handle, attr, i32);
+                                setup_callback_restore_default!(ppt_platform_sppt, handle, attr);
+                                setup_minmax_external!(ppt_platform_sppt, handle, attr, platform);
+                            }
+                            FirmwareAttribute::NvDynamicBoost => {
+                                init_minmax_property!(nv_dynamic_boost, handle, attr);
+                                setup_callback!(nv_dynamic_boost, handle, attr, i32);
+                                setup_callback_restore_default!(nv_dynamic_boost, handle, attr);
+                                setup_minmax_external!(nv_dynamic_boost, handle, attr, platform);
+                            }
+                            FirmwareAttribute::NvTempTarget => {
+                                init_minmax_property!(nv_temp_target, handle, attr);
+                                setup_callback!(nv_temp_target, handle, attr, i32);
+                                setup_callback_restore_default!(nv_temp_target, handle, attr);
+                                setup_minmax_external!(nv_temp_target, handle, attr, platform);
+                            }
+                            FirmwareAttribute::DgpuBaseTgp => {}
+                            FirmwareAttribute::DgpuTgp => {}
+                            FirmwareAttribute::ChargeMode => {}
+                            FirmwareAttribute::BootSound => {
+                                init_property!(boot_sound, handle, value, i32);
+                                setup_callback!(boot_sound, handle, attr, i32);
+                                setup_external!(boot_sound, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::KbdLedsAwake => {
+                                init_property!(kbd_leds_awake, handle, value, i32);
+                                setup_callback!(kbd_leds_awake, handle, attr, i32);
+                                setup_external!(kbd_leds_awake, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::KbdLedsSleep => {
+                                init_property!(kbd_leds_sleep, handle, value, i32);
+                                setup_callback!(kbd_leds_sleep, handle, attr, i32);
+                                setup_external!(kbd_leds_sleep, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::KbdLedsBoot => {
+                                init_property!(kbd_leds_boot, handle, value, i32);
+                                setup_callback!(kbd_leds_boot, handle, attr, i32);
+                                setup_external!(kbd_leds_boot, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::KbdLedsShutdown => {
+                                init_property!(kbd_leds_shutdown, handle, value, i32);
+                                setup_callback!(kbd_leds_shutdown, handle, attr, i32);
+                                setup_external!(kbd_leds_shutdown, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::ScreenAutoBrightness => {
+                                init_property!(screen_auto_brightness, handle, value, i32);
+                                setup_callback!(screen_auto_brightness, handle, attr, i32);
+                                setup_external!(screen_auto_brightness, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::McuPowersave => {
+                                init_property!(mcu_powersave, handle, value, i32);
+                                setup_callback!(mcu_powersave, handle, attr, i32);
+                                setup_external!(mcu_powersave, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::PanelOverdrive => {
+                                init_property!(panel_overdrive, handle, value, i32);
+                                setup_callback!(panel_overdrive, handle, attr, i32);
+                                setup_external!(panel_overdrive, i32, handle, attr, value)
+                            }
+                            FirmwareAttribute::PanelHdMode => {}
+                            FirmwareAttribute::EgpuConnected => {}
+                            FirmwareAttribute::EgpuEnable => {}
+                            FirmwareAttribute::DgpuDisable => {}
+                            FirmwareAttribute::GpuMuxMode => {}
+                            FirmwareAttribute::MiniLedMode => {
+                                init_property!(mini_led_mode, handle, value, i32);
+                                setup_callback!(mini_led_mode, handle, attr, i32);
+                                setup_external!(mini_led_mode, i32, handle, attr, value);
+                            }
+                            FirmwareAttribute::PendingReboot => {}
+                            FirmwareAttribute::None => {}
+                        })
+                        .ok();
+                } else {
+                    error!("Attribute with no name, skipping");
+                }
+            }
+        }
+        handle
+            .upgrade_in_event_loop(|ui| {
+                debug!(
+                    "get_asus_armoury_loaded: {:?}",
+                    ui.global::<SystemPageData>().get_asus_armoury_loaded()
+                );
+                debug!(
+                    "get_ppt_enabled_available: {:?}",
+                    ui.global::<SystemPageData>().get_ppt_enabled_available()
+                );
+            })
+            .ok();
     });
 }

rog-control-center/src/zbus.rs

@@ -1,68 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use zbus::zvariant::{OwnedValue, Type, Value};
-use zbus::{interface, proxy};
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Type, Value, OwnedValue)]
-#[zvariant(signature = "u")]
-pub enum AppState {
-    MainWindowOpen = 0,
-    /// If the app is running, open the main window
-    MainWindowShouldOpen = 1,
-    MainWindowClosed = 2,
-    StartingUp = 3,
-    QuitApp = 4,
-    LockFailed = 5,
-}
-
-pub struct ROGCCZbus {
-    state: Arc<Mutex<AppState>>,
-}
-
-impl ROGCCZbus {
-    pub fn new() -> Self {
-        Self {
-            state: Arc::new(Mutex::new(AppState::StartingUp)),
-        }
-    }
-
-    pub fn clone_state(&self) -> Arc<Mutex<AppState>> {
-        self.state.clone()
-    }
-}
-
-pub const ZBUS_PATH: &str = "/xyz/ljones/rogcc";
-pub const ZBUS_IFACE: &str = "xyz.ljones.rogcc";
-
-#[interface(name = "xyz.ljones.rogcc")]
-impl ROGCCZbus {
-    /// Return the device type for this Aura keyboard
-    #[zbus(property)]
-    async fn state(&self) -> AppState {
-        if let Ok(lock) = self.state.try_lock() {
-            return *lock;
-        }
-        AppState::LockFailed
-    }
-
-    #[zbus(property)]
-    async fn set_state(&self, state: AppState) {
-        if let Ok(mut lock) = self.state.try_lock() {
-            *lock = state;
-        }
-    }
-}
-
-#[proxy(
-    interface = "xyz.ljones.rogcc",
-    default_service = "xyz.ljones.rogcc",
-    default_path = "/xyz/ljones/rogcc"
-)]
-pub trait ROGCCZbus {
-    /// EnableDisplay property
-    #[zbus(property)]
-    fn state(&self) -> zbus::Result<AppState>;
-
-    #[zbus(property)]
-    fn set_state(&self, state: AppState) -> zbus::Result<()>;
-}

rog-control-center/src/zbus_proxies.rs

@@ -0,0 +1,150 @@
+use std::sync::{Arc, Mutex};
+
+use zbus::blocking::proxy::ProxyImpl;
+use zbus::blocking::{fdo, Connection};
+use zbus::zvariant::{OwnedValue, Type, Value};
+use zbus::{interface, proxy};
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Type, Value, OwnedValue)]
+#[zvariant(signature = "u")]
+pub enum AppState {
+    MainWindowOpen = 0,
+    /// If the app is running, open the main window
+    MainWindowShouldOpen = 1,
+    MainWindowClosed = 2,
+    StartingUp = 3,
+    QuitApp = 4,
+    LockFailed = 5,
+}
+
+pub struct ROGCCZbus {
+    state: Arc<Mutex<AppState>>,
+}
+
+impl ROGCCZbus {
+    #[allow(clippy::new_without_default)]
+    pub fn new() -> Self {
+        Self {
+            state: Arc::new(Mutex::new(AppState::StartingUp)),
+        }
+    }
+
+    pub fn clone_state(&self) -> Arc<Mutex<AppState>> {
+        self.state.clone()
+    }
+}
+
+pub const ZBUS_PATH: &str = "/xyz/ljones/rogcc";
+pub const ZBUS_IFACE: &str = "xyz.ljones.rogcc";
+
+#[interface(name = "xyz.ljones.rogcc")]
+impl ROGCCZbus {
+    /// Return the device type for this Aura keyboard
+    #[zbus(property)]
+    async fn state(&self) -> AppState {
+        if let Ok(lock) = self.state.try_lock() {
+            return *lock;
+        }
+        AppState::LockFailed
+    }
+
+    #[zbus(property)]
+    async fn set_state(&self, state: AppState) {
+        if let Ok(mut lock) = self.state.try_lock() {
+            *lock = state;
+        }
+    }
+}
+
+#[proxy(
+    interface = "xyz.ljones.rogcc",
+    default_service = "xyz.ljones.rogcc",
+    default_path = "/xyz/ljones/rogcc"
+)]
+pub trait ROGCCZbus {
+    /// EnableDisplay property
+    #[zbus(property)]
+    fn state(&self) -> zbus::Result<AppState>;
+
+    #[zbus(property)]
+    fn set_state(&self, state: AppState) -> zbus::Result<()>;
+}
+
+pub fn find_iface<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>>
+where
+    T: ProxyImpl<'static> + From<zbus::Proxy<'static>>,
+{
+    let conn = Connection::system().unwrap();
+    let f = fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").unwrap();
+    let interfaces = f.get_managed_objects().unwrap();
+    let mut paths = Vec::new();
+    for v in interfaces.iter() {
+        // let o: Vec<zbus::names::OwnedInterfaceName> = v.1.keys().map(|e|
+        // e.to_owned()).collect(); println!("{}, {:?}", v.0, o);
+        for k in v.1.keys() {
+            if k.as_str() == iface_name {
+                // println!("Found {iface_name} device at {}, {}", v.0, k);
+                paths.push(v.0.clone());
+            }
+        }
+    }
+    if paths.len() > 1 {
+        log::warn!("Multiple asusd interfaces devices found");
+    }
+    if !paths.is_empty() {
+        let mut ctrl = Vec::new();
+        paths.sort_by(|a, b| a.cmp(b));
+        for path in paths {
+            ctrl.push(
+                T::builder(&conn)
+                    .path(path.clone())?
+                    .destination("xyz.ljones.Asusd")?
+                    .build()?,
+            );
+        }
+        return Ok(ctrl);
+    }
+
+    Err("No Aura interface".into())
+}
+
+pub async fn find_iface_async<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>>
+where
+    T: zbus::proxy::ProxyImpl<'static> + From<zbus::Proxy<'static>>,
+{
+    let conn = zbus::Connection::system().await.unwrap();
+    let f = zbus::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/")
+        .await
+        .unwrap();
+    let interfaces = f.get_managed_objects().await.unwrap();
+    let mut paths = Vec::new();
+    for v in interfaces.iter() {
+        // let o: Vec<zbus::names::OwnedInterfaceName> = v.1.keys().map(|e|
+        // e.to_owned()).collect(); println!("{}, {:?}", v.0, o);
+        for k in v.1.keys() {
+            if k.as_str() == iface_name {
+                // println!("Found {iface_name} device at {}, {}", v.0, k);
+                paths.push(v.0.clone());
+            }
+        }
+    }
+    if paths.len() > 1 {
+        log::warn!("Multiple asusd interfaces devices found");
+    }
+    if !paths.is_empty() {
+        let mut ctrl = Vec::new();
+        paths.sort_by(|a, b| a.cmp(b));
+        for path in paths {
+            ctrl.push(
+                T::builder(&conn)
+                    .path(path.clone())?
+                    .destination("xyz.ljones.Asusd")?
+                    .build()
+                    .await?,
+            );
+        }
+        return Ok(ctrl);
+    }
+
+    Err("No interface".into())
+}

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

@@ -0,0 +1,684 @@
+
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2024-06-09 00:20+0000\n"
+"PO-Revision-Date: 2024-07-19 11:32+0400\n"
+"Last-Translator: Rəşad Qasımlı <rashadgasimli2005@gmail.com>\n"
+"Language-Team: Azerbaijan <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: az\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: rog-control-center/ui/pages/anime.slint:6
+msgctxt "Anime Brightness"
+msgid "Off"
+msgstr "Sönülü"
+
+#: rog-control-center/ui/pages/anime.slint:7
+msgctxt "Anime Brightness"
+msgid "Low"
+msgstr "Aşağı"
+
+#: 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üksək"
+
+#: rog-control-center/ui/pages/anime.slint:23
+msgctxt "AnimePageData"
+msgid "Glitch Construction"
+msgstr "Nasazlıq İnşaatı"
+
+#: rog-control-center/ui/pages/anime.slint:23
+msgctxt "AnimePageData"
+msgid "Static Emergence"
+msgstr "Statik Ortaya Çıxma"
+
+#: rog-control-center/ui/pages/anime.slint:25
+msgctxt "AnimePageData"
+msgid "Binary Banner Scroll"
+msgstr "İkili Afiş Sürüşdürmə"
+
+#: rog-control-center/ui/pages/anime.slint:25
+msgctxt "AnimePageData"
+msgid "Rog Logo Glitch"
+msgstr "Rog Logo Nasazlığı"
+
+#: rog-control-center/ui/pages/anime.slint:27
+msgctxt "AnimePageData"
+msgid "Banner Swipe"
+msgstr "Afiş Sürüşdürmə"
+
+#: rog-control-center/ui/pages/anime.slint:27
+msgctxt "AnimePageData"
+msgid "Starfield"
+msgstr "Ulduz Sahəsi"
+
+#: rog-control-center/ui/pages/anime.slint:29
+msgctxt "AnimePageData"
+msgid "Glitch Out"
+msgstr "Nasazlıq"
+
+#: rog-control-center/ui/pages/anime.slint:29
+msgctxt "AnimePageData"
+msgid "See Ya"
+msgstr "Görüşərik"
+
+#: rog-control-center/ui/pages/anime.slint:50
+msgctxt "Anime Brightness"
+msgid "Brightness"
+msgstr "Parlaqlıq"
+
+#: rog-control-center/ui/pages/anime.slint:66
+msgctxt "PageAnime"
+msgid "Enable display"
+msgstr "Ekranı aktivləşdir"
+
+#: rog-control-center/ui/pages/anime.slint:74 rog-control-center/ui/pages/anime.slint:97
+msgctxt "PageAnime"
+msgid "Advanced"
+msgstr "Qabaqcıl"
+
+#: rog-control-center/ui/pages/anime.slint:89
+msgctxt "PageAnime"
+msgid "Use built-in animations"
+msgstr "Yerləşik animasiyalardan istifadə edin"
+
+#: rog-control-center/ui/pages/anime.slint:146
+msgctxt "PageAnime"
+msgid "Set which builtin animations are played"
+msgstr "Hansı yerləşik animasiyaların oynadılacağını ayarlayın"
+
+#: rog-control-center/ui/pages/anime.slint:150
+msgctxt "Anime built-in selection"
+msgid "Boot Animation"
+msgstr "Açılış Animasiyası"
+
+#: rog-control-center/ui/pages/anime.slint:160
+msgctxt "Anime built-in selection"
+msgid "Running Animation"
+msgstr "İşləyən Animasiya"
+
+#: rog-control-center/ui/pages/anime.slint:170
+msgctxt "Anime built-in selection"
+msgid "Sleep Animation"
+msgstr "Yuxu Animasiyası"
+
+#: rog-control-center/ui/pages/anime.slint:180
+msgctxt "Anime built-in selection"
+msgid "Shutdown Animation"
+msgstr "Söndürmə Animasiyası"
+
+#: rog-control-center/ui/pages/anime.slint:220
+msgctxt "PageAnime"
+msgid "Advanced Display Settings"
+msgstr "Qabaqcıl Ekran Parametrləri"
+
+#: rog-control-center/ui/pages/anime.slint:225
+msgctxt "PageAnime"
+msgid "Off when lid closed"
+msgstr "Qapaq bağlandıqda söndür"
+
+#: rog-control-center/ui/pages/anime.slint:234
+msgctxt "PageAnime"
+msgid "Off when suspended"
+msgstr "Gözlədiləndə söndür"
+
+#: rog-control-center/ui/pages/anime.slint:243
+msgctxt "PageAnime"
+msgid "Off when on battery"
+msgstr "Batareyadaykən söndür"
+
+#: rog-control-center/ui/pages/app_settings.slint:26
+msgctxt "PageAppSettings"
+msgid "Run in background after closing"
+msgstr "Bağlandıqdan sonra arxafonda işlət"
+
+#: rog-control-center/ui/pages/app_settings.slint:34
+msgctxt "PageAppSettings"
+msgid "Start app in background (UI closed)"
+msgstr "Tətbiqi arxafonda başlat (İİ sönülü vəziyyətdə)"
+
+#: rog-control-center/ui/pages/app_settings.slint:42
+msgctxt "PageAppSettings"
+msgid "Enable system tray icon"
+msgstr "Sistem nimçə ikonunu aktivləşdir"
+
+#: rog-control-center/ui/pages/app_settings.slint:50
+msgctxt "PageAppSettings"
+msgid "Enable dGPU notifications"
+msgstr "Xarici ekran kartı bildirimlərini aktivləşdir"
+
+#: rog-control-center/ui/pages/aura.slint:28
+msgctxt "PageAura"
+msgid "Brightness"
+msgstr "Parlaqlıq"
+
+#: rog-control-center/ui/pages/aura.slint:39
+msgctxt "PageAura"
+msgid "Aura mode"
+msgstr "Aura rejimi"
+
+#: rog-control-center/ui/pages/aura.slint:59
+msgctxt "PageAura"
+msgid "Colour 1"
+msgstr "Rəng 1"
+
+#: rog-control-center/ui/pages/aura.slint:85
+msgctxt "PageAura"
+msgid "Colour 2"
+msgstr "Rəng 2"
+
+#: rog-control-center/ui/pages/aura.slint:119
+msgctxt "PageAura"
+msgid "Zone"
+msgstr "Qurşaq"
+
+#: rog-control-center/ui/pages/aura.slint:142
+msgctxt "PageAura"
+msgid "Direction"
+msgstr "İstiqamət"
+
+#: rog-control-center/ui/pages/aura.slint:164
+msgctxt "PageAura"
+msgid "Speed"
+msgstr "Sürət"
+
+#: rog-control-center/ui/pages/aura.slint:185
+msgctxt "PageAura"
+msgid "Power Settings"
+msgstr "Enerji Parametrləri"
+
+#: rog-control-center/ui/pages/aura.slint:270
+msgctxt "PageAura"
+msgid "Power Zones"
+msgstr "Enerji qurşaqları"
+
+#: rog-control-center/ui/pages/fans.slint:26
+msgctxt "FanTab"
+msgid "This fan is not avilable on this machine"
+msgstr "Bu ventilyator bu cihazda mövcud deyil"
+
+#: rog-control-center/ui/pages/fans.slint:34
+msgctxt "FanTab"
+msgid "Enabled"
+msgstr "Aktiv"
+
+#: rog-control-center/ui/pages/fans.slint:43
+msgctxt "FanTab"
+msgid "Apply"
+msgstr "Tətbiq et"
+
+#: rog-control-center/ui/pages/fans.slint:51
+msgctxt "FanTab"
+msgid "Cancel"
+msgstr "Ləğv et"
+
+#: rog-control-center/ui/pages/fans.slint:59
+msgctxt "FanTab"
+msgid "Factory Default (all fans)"
+msgstr "Zavod standartı (bütün ventilyatorlar)"
+
+#: rog-control-center/ui/pages/fans.slint:72
+msgctxt "PageFans"
+msgid "Balanced"
+msgstr "Balanslaşdırılmış"
+
+#: 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 "Prosessor"
+
+#: 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 "Orta"
+
+#: 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 "Ekran kartı"
+
+#: rog-control-center/ui/pages/fans.slint:131
+msgctxt "PageFans"
+msgid "Performance"
+msgstr "Performans"
+
+#: rog-control-center/ui/pages/fans.slint:190
+msgctxt "PageFans"
+msgid "Quiet"
+msgstr "Sakit"
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Balanced"
+msgstr "Balanslaşdırılmış"
+
+#: rog-control-center/ui/pages/system.slint:26 rog-control-center/ui/pages/system.slint:30
+msgctxt "SystemPageData"
+msgid "Performance"
+msgstr "Performans"
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Quiet"
+msgstr "Sakit"
+
+#: rog-control-center/ui/pages/system.slint:29
+msgctxt "SystemPageData"
+msgid "Default"
+msgstr "Standart"
+
+#: rog-control-center/ui/pages/system.slint:31
+msgctxt "SystemPageData"
+msgid "BalancePerformance"
+msgstr "Taraz-Performans"
+
+#: rog-control-center/ui/pages/system.slint:32
+msgctxt "SystemPageData"
+msgid "BalancePower"
+msgstr "Taraz-Enerji"
+
+#: rog-control-center/ui/pages/system.slint:33
+msgctxt "SystemPageData"
+msgid "Power"
+msgstr "Enerji"
+
+#: rog-control-center/ui/pages/system.slint:110
+msgctxt "PageSystem"
+msgid "Base system settings"
+msgstr "Əsas sistem parametrləri"
+
+#: rog-control-center/ui/pages/system.slint:115
+msgctxt "PageSystem"
+msgid "Charge limit"
+msgstr "Şarj limiti"
+
+#: rog-control-center/ui/pages/system.slint:127
+msgctxt "PageSystem"
+msgid "Throttle Policy"
+msgstr "Enerji Siyasəti"
+
+#: rog-control-center/ui/pages/system.slint:137
+msgctxt "PageSystem"
+msgid "Advanced"
+msgstr "Qabaqcıl"
+
+#: rog-control-center/ui/pages/system.slint:149
+msgctxt "PageSystem"
+msgid "Panel Overdrive"
+msgstr "Panel aşırma"
+
+#: rog-control-center/ui/pages/system.slint:157
+msgctxt "PageSystem"
+msgid "MiniLED Mode"
+msgstr "MiniLED Rejimi"
+
+#: rog-control-center/ui/pages/system.slint:165
+msgctxt "PageSystem"
+msgid "POST boot sound"
+msgstr "POST açılış səsi"
+
+#: rog-control-center/ui/pages/system.slint:183
+msgctxt "PageSystem"
+msgid "System performance settings"
+msgstr "Sistem performans parametrləri"
+
+#: rog-control-center/ui/pages/system.slint:188
+msgctxt "ppt_pl1_spl"
+msgid "PL1, sustained power limit"
+msgstr "ES1, davamlı enerji limiti"
+
+#: rog-control-center/ui/pages/system.slint:198
+msgctxt "ppt_pl2_sppt"
+msgid "PL2, turbo power limit"
+msgstr "ES2, turbo enerji limiti"
+
+#: rog-control-center/ui/pages/system.slint:208
+msgctxt "ppt_fppt"
+msgid "FPPT, Fast Power Limit"
+msgstr "SPEİ, sürətli enerji limiti"
+
+#: rog-control-center/ui/pages/system.slint:218
+msgctxt "ppt_apu_sppt"
+msgid "SPPT, APU slow power limit"
+msgstr "YPEİ, APU yavaş enerji limiti"
+
+#: rog-control-center/ui/pages/system.slint:228
+msgctxt "ppt_platform_sppt"
+msgid "Slow package power tracking limit"
+msgstr "Yavaş paket enerji izləmə limiti"
+
+#: rog-control-center/ui/pages/system.slint:238
+msgctxt "nv_dynamic_boost"
+msgid "dGPU boost overclock"
+msgstr "Xarici ekran kartının sürət aşırtma sürətini artırma"
+
+#: rog-control-center/ui/pages/system.slint:248
+msgctxt "nv_temp_target"
+msgid "dGPU temperature max"
+msgstr "Xarici ekran kartının maksimum temperaturu"
+
+#: rog-control-center/ui/pages/system.slint:294
+msgctxt "PageSystem"
+msgid "Energy Performance Preference linked to Throttle Policy"
+msgstr "Enerji Performans Üstünlüyü Enerji Siyasətinə bağlıdır"
+
+#: rog-control-center/ui/pages/system.slint:298
+msgctxt "PageSystem"
+msgid "Change EPP based on Throttle Policy"
+msgstr "EPÜ-yü Enerji Siyasəti üçün dəyişdirin"
+
+#: rog-control-center/ui/pages/system.slint:306
+msgctxt "PageSystem"
+msgid "EPP for Balanced Policy"
+msgstr "Balanslaşdırılmış Siyasət üçün EPÜ"
+
+#: rog-control-center/ui/pages/system.slint:316
+msgctxt "PageSystem"
+msgid "EPP for Performance Policy"
+msgstr "Perfomans Siyasəti üçün EPÜ"
+
+#: rog-control-center/ui/pages/system.slint:326
+msgctxt "PageSystem"
+msgid "EPP for Quiet Policy"
+msgstr "Sakit Siyasət üçün EPÜ"
+
+#: rog-control-center/ui/pages/system.slint:344
+msgctxt "PageSystem"
+msgid "Throttle Policy for power state"
+msgstr "Enerji vəziyyəti üçün Enerji Siyasəti"
+
+#: rog-control-center/ui/pages/system.slint:350
+msgctxt "PageSystem"
+msgid "Throttle Policy on Battery"
+msgstr "Batareyadaykən Enerji Siyasəti"
+
+#: rog-control-center/ui/pages/system.slint:360 rog-control-center/ui/pages/system.slint:381
+msgctxt "PageSystem"
+msgid "Enabled"
+msgstr "Aktiv"
+
+#: rog-control-center/ui/pages/system.slint:371
+msgctxt "PageSystem"
+msgid "Throttle Policy on AC"
+msgstr "Şarjdaykən Enerji Siyasəti"
+
+#: rog-control-center/ui/types/aura_types.slint:49
+msgctxt "Aura power zone"
+msgid "Logo"
+msgstr "Loqo"
+
+#: 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 "Klaviatura"
+
+#: 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 "İşıq Çubuğu"
+
+#: rog-control-center/ui/types/aura_types.slint:52
+msgctxt "Aura power zone"
+msgid "Lid"
+msgstr "Qapaq"
+
+#: rog-control-center/ui/types/aura_types.slint:53
+msgctxt "Aura power zone"
+msgid "Rear Glow"
+msgstr "Arxa Parıltı"
+
+#: 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 "Klaviatura və İşıq Çubuğu"
+
+#: rog-control-center/ui/types/aura_types.slint:64
+msgctxt "Aura brightness"
+msgid "Off"
+msgstr "Sönülü"
+
+#: rog-control-center/ui/types/aura_types.slint:65
+msgctxt "Aura brightness"
+msgid "Low"
+msgstr "Aşağı"
+
+#: rog-control-center/ui/types/aura_types.slint:66
+msgctxt "Aura brightness"
+msgid "Med"
+msgstr "Orta"
+
+#: rog-control-center/ui/types/aura_types.slint:67
+msgctxt "Aura brightness"
+msgid "High"
+msgstr "Yüksək"
+
+#: 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 "Statik"
+
+#: 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 "Nəfəs Alma"
+
+#: 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 "Fləş"
+
+#: rog-control-center/ui/types/aura_types.slint:75
+msgctxt "Basic aura mode"
+msgid "Rainbow"
+msgstr "Göyqurşağı"
+
+#: rog-control-center/ui/types/aura_types.slint:76
+msgctxt "Basic aura mode"
+msgid "Star"
+msgstr "Ulduz"
+
+#: rog-control-center/ui/types/aura_types.slint:77
+msgctxt "Basic aura mode"
+msgid "Rain"
+msgstr "Yağış"
+
+#: rog-control-center/ui/types/aura_types.slint:78
+msgctxt "Basic aura mode"
+msgid "Highlight"
+msgstr "Vurğulama"
+
+#: rog-control-center/ui/types/aura_types.slint:79
+msgctxt "Basic aura mode"
+msgid "Laser"
+msgstr "Lazer"
+
+#: rog-control-center/ui/types/aura_types.slint:80
+msgctxt "Basic aura mode"
+msgid "Ripple"
+msgstr "Dalğalanma"
+
+#: rog-control-center/ui/types/aura_types.slint:81
+msgctxt "Basic aura mode"
+msgid "Nothing"
+msgstr "Heç nə"
+
+#: rog-control-center/ui/types/aura_types.slint:82
+msgctxt "Basic aura mode"
+msgid "Pulse"
+msgstr "Nəbz"
+
+#: rog-control-center/ui/types/aura_types.slint:83
+msgctxt "Basic aura mode"
+msgid "Comet"
+msgstr "Quyruqlu Ulduz"
+
+#: rog-control-center/ui/types/aura_types.slint:84
+msgctxt "Basic aura mode"
+msgid "Flash"
+msgstr "Fləş"
+
+#: rog-control-center/ui/types/aura_types.slint:96
+msgctxt "Aura zone"
+msgid "None"
+msgstr "Heç biri"
+
+#: rog-control-center/ui/types/aura_types.slint:97
+msgctxt "Aura zone"
+msgid "Key1"
+msgstr "Açar1"
+
+#: rog-control-center/ui/types/aura_types.slint:98
+msgctxt "Aura zone"
+msgid "Key2"
+msgstr "Açar2"
+
+#: rog-control-center/ui/types/aura_types.slint:99
+msgctxt "Aura zone"
+msgid "Key3"
+msgstr "Açar3"
+
+#: rog-control-center/ui/types/aura_types.slint:100
+msgctxt "Aura zone"
+msgid "Key4"
+msgstr "Açar5"
+
+#: rog-control-center/ui/types/aura_types.slint:101
+msgctxt "Aura zone"
+msgid "Logo"
+msgstr "Loqo"
+
+#: rog-control-center/ui/types/aura_types.slint:102
+msgctxt "Aura zone"
+msgid "Lightbar Left"
+msgstr "İşıq Çubuğu Sol"
+
+#: rog-control-center/ui/types/aura_types.slint:103
+msgctxt "Aura zone"
+msgid "Lightbar Right"
+msgstr "İşıq Çubuğu Sağ"
+
+#: rog-control-center/ui/types/aura_types.slint:107
+msgctxt "Aura direction"
+msgid "Right"
+msgstr "Sağ"
+
+#: rog-control-center/ui/types/aura_types.slint:108
+msgctxt "Aura direction"
+msgid "Left"
+msgstr "Sol"
+
+#: rog-control-center/ui/types/aura_types.slint:109
+msgctxt "Aura direction"
+msgid "Up"
+msgstr "Yuxarı"
+
+#: rog-control-center/ui/types/aura_types.slint:110
+msgctxt "Aura direction"
+msgid "Down"
+msgstr "Aşağı"
+
+#: rog-control-center/ui/types/aura_types.slint:114
+msgctxt "Aura speed"
+msgid "Low"
+msgstr "Aşağı"
+
+#: rog-control-center/ui/types/aura_types.slint:115
+msgctxt "Aura speed"
+msgid "Medium"
+msgstr "Orta"
+
+#: rog-control-center/ui/types/aura_types.slint:116
+msgctxt "Aura speed"
+msgid "High"
+msgstr "Yüksək"
+
+#: rog-control-center/ui/widgets/aura_power.slint:33
+msgctxt "AuraPowerGroup"
+msgid "Boot"
+msgstr "Açılış"
+
+#: rog-control-center/ui/widgets/aura_power.slint:43
+msgctxt "AuraPowerGroup"
+msgid "Awake"
+msgstr "Oyaq"
+
+#: rog-control-center/ui/widgets/aura_power.slint:53
+msgctxt "AuraPowerGroup"
+msgid "Sleep"
+msgstr "Yuxu"
+
+#: rog-control-center/ui/widgets/aura_power.slint:63
+msgctxt "AuraPowerGroup"
+msgid "Shutdown"
+msgstr "Söndür"
+
+#: rog-control-center/ui/widgets/aura_power.slint:102
+msgctxt "AuraPowerGroupOld"
+msgid "Zone Selection"
+msgstr "Bölgə seçimi"
+
+#: rog-control-center/ui/widgets/aura_power.slint:114
+msgctxt "AuraPowerGroupOld"
+msgid "Boot"
+msgstr "Açılış"
+
+#: rog-control-center/ui/widgets/aura_power.slint:124
+msgctxt "AuraPowerGroupOld"
+msgid "Awake"
+msgstr "Oyaq"
+
+#: rog-control-center/ui/widgets/aura_power.slint:134
+msgctxt "AuraPowerGroupOld"
+msgid "Sleep"
+msgstr "Yuxu"
+
+#: rog-control-center/ui/main_window.slint:51
+msgctxt "MainWindow"
+msgid "ROG"
+msgstr ""
+
+#: rog-control-center/ui/main_window.slint:53
+msgctxt "Menu1"
+msgid "System Control"
+msgstr "Sistem Nəzarəti"
+
+#: rog-control-center/ui/main_window.slint:54
+msgctxt "Menu2"
+msgid "Keyboard Aura"
+msgstr "Klaviatura Aura"
+
+#: rog-control-center/ui/main_window.slint:55
+msgctxt "Menu3"
+msgid "AniMe Matrix"
+msgstr "AniMe Matrisi"
+
+#: rog-control-center/ui/main_window.slint:56
+msgctxt "Menu4"
+msgid "Fan Curves"
+msgstr "Fan Əyriləri"
+
+#: rog-control-center/ui/main_window.slint:57
+msgctxt "Menu5"
+msgid "App Settings"
+msgstr "Tətbiq Parametrləri"
+
+#: rog-control-center/ui/main_window.slint:58
+msgctxt "Menu6"
+msgid "About"
+msgstr "Haqqında"
+
+#: rog-control-center/ui/main_window.slint:70
+msgctxt "MainWindow"
+msgid "Quit App"
+msgstr "Tətbiqdən Çıxın"
+

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-12-24 22:29+0000\n"
+"POT-Creation-Date: 2025-04-05 19:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,204 +12,44 @@ msgstr ""
 "Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: rog-control-center/ui/pages/system.slint:26
-msgctxt "SystemPageData"
-msgid "Balanced"
+#: rog-control-center/ui/main_window.slint:55
+msgctxt "MainWindow"
+msgid "ROG"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:26 rog-control-center/ui/pages/system.slint:30
-msgctxt "SystemPageData"
-msgid "Performance"
+#: rog-control-center/ui/main_window.slint:57
+msgctxt "Menu1"
+msgid "System Control"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:26
-msgctxt "SystemPageData"
-msgid "Quiet"
+#: rog-control-center/ui/main_window.slint:58
+msgctxt "Menu2"
+msgid "Keyboard Aura"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:29
-msgctxt "SystemPageData"
-msgid "Default"
+#: rog-control-center/ui/main_window.slint:59
+msgctxt "Menu3"
+msgid "AniMe Matrix"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:31
-msgctxt "SystemPageData"
-msgid "BalancePerformance"
+#: rog-control-center/ui/main_window.slint:60
+msgctxt "Menu4"
+msgid "Fan Curves"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:32
-msgctxt "SystemPageData"
-msgid "BalancePower"
+#: rog-control-center/ui/main_window.slint:61
+msgctxt "Menu5"
+msgid "App Settings"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:33
-msgctxt "SystemPageData"
-msgid "Power"
+#: rog-control-center/ui/main_window.slint:62
+msgctxt "Menu6"
+msgid "About"
 msgstr ""
 
-#: rog-control-center/ui/pages/system.slint:110
-msgctxt "PageSystem"
-msgid "Base system settings"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:115
-msgctxt "PageSystem"
-msgid "Charge limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:127
-msgctxt "PageSystem"
-msgid "Throttle Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:137
-msgctxt "PageSystem"
-msgid "Advanced"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:149
-msgctxt "PageSystem"
-msgid "Panel Overdrive"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:157
-msgctxt "PageSystem"
-msgid "MiniLED Mode"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:165
-msgctxt "PageSystem"
-msgid "POST boot sound"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:183
-msgctxt "PageSystem"
-msgid "System performance settings"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:188
-msgctxt "ppt_pl1_spl"
-msgid "PL1, sustained power limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:198
-msgctxt "ppt_pl2_sppt"
-msgid "PL2, turbo power limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:208
-msgctxt "ppt_fppt"
-msgid "FPPT, Fast Power Limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:218
-msgctxt "ppt_apu_sppt"
-msgid "SPPT, APU slow power limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:228
-msgctxt "ppt_platform_sppt"
-msgid "Slow package power tracking limit"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:238
-msgctxt "nv_dynamic_boost"
-msgid "dGPU boost overclock"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:248
-msgctxt "nv_temp_target"
-msgid "dGPU temperature max"
-msgstr ""
-
-#: 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:298
-msgctxt "PageSystem"
-msgid "Change EPP based on Throttle Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:306
-msgctxt "PageSystem"
-msgid "EPP for Balanced Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:316
-msgctxt "PageSystem"
-msgid "EPP for Performance Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:326
-msgctxt "PageSystem"
-msgid "EPP for Quiet Policy"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:344
-msgctxt "PageSystem"
-msgid "Throttle Policy for power state"
-msgstr ""
-
-#: rog-control-center/ui/pages/system.slint:350
-msgctxt "PageSystem"
-msgid "Throttle Policy on Battery"
-msgstr ""
-
-#: 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: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"
+#: rog-control-center/ui/main_window.slint:74
+msgctxt "MainWindow"
+msgid "Quit App"
 msgstr ""
 
 #: rog-control-center/ui/pages/anime.slint:6
@@ -337,6 +177,322 @@ msgctxt "PageAnime"
 msgid "Off when on battery"
 msgstr ""
 
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "Balanced"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:20 rog-control-center/ui/pages/system.slint:27
+msgctxt "SystemPageData"
+msgid "Performance"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "Quiet"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "LowPower"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Default"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:28
+msgctxt "SystemPageData"
+msgid "BalancePerformance"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:29
+msgctxt "SystemPageData"
+msgid "BalancePower"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:30
+msgctxt "SystemPageData"
+msgid "Power"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:159
+msgctxt "PageSystem"
+msgid "Power settings"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:164
+msgctxt "PageSystem"
+msgid "Charge limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:179
+msgctxt "PageSystem"
+msgid "Platform Profile"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:189
+msgctxt "PageSystem"
+msgid "Advanced"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:209
+msgctxt "PageSystem"
+msgid "Screenpad brightness"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:233
+msgctxt "PageSystem"
+msgid "Sync with primary"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:253
+msgctxt "PageSystem"
+msgid "Armoury settings"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:263
+msgctxt "no_asus_armoury_driver_1"
+msgid "The asus-armoury driver is not loaded"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:269
+msgctxt "no_asus_armoury_driver_2"
+msgid "For advanced features you will require a kernel with this driver added."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:280
+msgctxt "PageSystem"
+msgid "Panel Overdrive"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:288
+msgctxt "PageSystem"
+msgid "MiniLED Mode"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:296
+msgctxt "PageSystem"
+msgid "POST boot sound"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:312
+msgctxt "ppt_warning"
+msgid "The following settings are not applied until the toggle is enabled."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:317 rog-control-center/ui/pages/system.slint:324
+msgctxt "ppt_group_enabled"
+msgid "Enable Tuning"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:334 rog-control-center/ui/pages/system.slint:335
+msgctxt "ppt_pl1_spl"
+msgid "CPU Sustained Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:336
+msgctxt "ppt_pl1_spl_help"
+msgid ""
+"Long-term CPU power limit that affects sustained workload performance. "
+"Higher values may increase heat and power consumption."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:352 rog-control-center/ui/pages/system.slint:353
+msgctxt "ppt_pl2_sppt"
+msgid "CPU Turbo Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:354
+msgctxt "ppt_pl2_sppt_help"
+msgid ""
+"Short-term CPU power limit for boost periods. Controls maximum power during "
+"brief high-performance bursts."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:370 rog-control-center/ui/pages/system.slint:371
+msgctxt "ppt_pl3_fppt"
+msgid "CPU Fast Burst Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:372
+msgctxt "ppt_pl3_fppt_help"
+msgid ""
+"Ultra-short duration power limit for instantaneous CPU bursts. Affects "
+"responsiveness during sudden workload spikes."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:387 rog-control-center/ui/pages/system.slint:388
+msgctxt "ppt_fppt"
+msgid "Fast Package Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:389
+msgctxt "ppt_fppt_help"
+msgid ""
+"Ultra-short duration power limit for system package. Controls maximum power "
+"during millisecond-scale load spikes."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:405 rog-control-center/ui/pages/system.slint:406
+msgctxt "ppt_apu_sppt"
+msgid "APU Sustained Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:407
+msgctxt "ppt_apu_sppt_help"
+msgid ""
+"Long-term power limit for integrated graphics and CPU combined. Affects "
+"sustained performance of APU-based workloads."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:423 rog-control-center/ui/pages/system.slint:424
+msgctxt "ppt_platform_sppt"
+msgid "Platform Sustained Power Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:425
+msgctxt "ppt_platform_sppt_help"
+msgid ""
+"Overall system power limit for sustained operations. Controls total platform "
+"power consumption over extended periods."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:441 rog-control-center/ui/pages/system.slint:442
+msgctxt "nv_dynamic_boost"
+msgid "GPU Power Boost"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:443
+msgctxt "nv_dynamic_boost_help"
+msgid ""
+"Additional power allocation for GPU dynamic boost. Higher values increase "
+"GPU performance but generate more heat."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:459 rog-control-center/ui/pages/system.slint:460
+msgctxt "nv_temp_target"
+msgid "GPU Temperature Limit"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:461
+msgctxt "nv_temp_target_help"
+msgid ""
+"Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain "
+"temperature below this limit."
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:513
+msgctxt "PageSystem"
+msgid "Energy Performance Preference linked to Throttle Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:517
+msgctxt "PageSystem"
+msgid "Change EPP based on Throttle Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:525
+msgctxt "PageSystem"
+msgid "EPP for Balanced Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:535
+msgctxt "PageSystem"
+msgid "EPP for Performance Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:545
+msgctxt "PageSystem"
+msgid "EPP for Quiet Policy"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:563
+msgctxt "PageSystem"
+msgid "Throttle Policy for power state"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:569
+msgctxt "PageSystem"
+msgid "Throttle Policy on Battery"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:579 rog-control-center/ui/pages/system.slint:600
+msgctxt "PageSystem"
+msgid "Enabled"
+msgstr ""
+
+#: rog-control-center/ui/pages/system.slint:590
+msgctxt "PageSystem"
+msgid "Throttle Policy on AC"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:28
+msgctxt "PageAura"
+msgid "Brightness"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:39
+msgctxt "PageAura"
+msgid "Aura mode"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:59
+msgctxt "PageAura"
+msgid "Colour 1"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:85
+msgctxt "PageAura"
+msgid "Colour 2"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:119
+msgctxt "PageAura"
+msgid "Zone"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:142
+msgctxt "PageAura"
+msgid "Direction"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:164
+msgctxt "PageAura"
+msgid "Speed"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:185
+msgctxt "PageAura"
+msgid "Power Settings"
+msgstr ""
+
+#: rog-control-center/ui/pages/aura.slint:270
+msgctxt "PageAura"
+msgid "Power Zones"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:26
+msgctxt "PageAppSettings"
+msgid "Run in background after closing"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:34
+msgctxt "PageAppSettings"
+msgid "Start app in background (UI closed)"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:42
+msgctxt "PageAppSettings"
+msgid "Enable system tray icon"
+msgstr ""
+
+#: rog-control-center/ui/pages/app_settings.slint:50
+msgctxt "PageAppSettings"
+msgid "Enable dGPU notifications"
+msgstr ""
+
 #: rog-control-center/ui/pages/fans.slint:26
 msgctxt "FanTab"
 msgid "This fan is not avilable on this machine"
@@ -392,24 +548,49 @@ msgctxt "PageFans"
 msgid "Quiet"
 msgstr ""
 
-#: rog-control-center/ui/pages/app_settings.slint:26
-msgctxt "PageAppSettings"
-msgid "Run in background after closing"
+#: rog-control-center/ui/widgets/common.slint:126
+msgctxt "confirm_reset"
+msgid "Are you sure you want to reset this?"
 msgstr ""
 
-#: rog-control-center/ui/pages/app_settings.slint:34
-msgctxt "PageAppSettings"
-msgid "Start app in background (UI closed)"
+#: rog-control-center/ui/widgets/aura_power.slint:33
+msgctxt "AuraPowerGroup"
+msgid "Boot"
 msgstr ""
 
-#: rog-control-center/ui/pages/app_settings.slint:42
-msgctxt "PageAppSettings"
-msgid "Enable system tray icon"
+#: rog-control-center/ui/widgets/aura_power.slint:43
+msgctxt "AuraPowerGroup"
+msgid "Awake"
 msgstr ""
 
-#: rog-control-center/ui/pages/app_settings.slint:50
-msgctxt "PageAppSettings"
-msgid "Enable dGPU notifications"
+#: rog-control-center/ui/widgets/aura_power.slint:53
+msgctxt "AuraPowerGroup"
+msgid "Sleep"
+msgstr ""
+
+#: rog-control-center/ui/widgets/aura_power.slint:63
+msgctxt "AuraPowerGroup"
+msgid "Shutdown"
+msgstr ""
+
+#: rog-control-center/ui/widgets/aura_power.slint:102
+msgctxt "AuraPowerGroupOld"
+msgid "Zone Selection"
+msgstr ""
+
+#: rog-control-center/ui/widgets/aura_power.slint:114
+msgctxt "AuraPowerGroupOld"
+msgid "Boot"
+msgstr ""
+
+#: 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:52
@@ -607,83 +788,3 @@ msgctxt "Aura speed"
 msgid "High"
 msgstr ""
 
-#: rog-control-center/ui/widgets/aura_power.slint:33
-msgctxt "AuraPowerGroup"
-msgid "Boot"
-msgstr ""
-
-#: rog-control-center/ui/widgets/aura_power.slint:43
-msgctxt "AuraPowerGroup"
-msgid "Awake"
-msgstr ""
-
-#: rog-control-center/ui/widgets/aura_power.slint:53
-msgctxt "AuraPowerGroup"
-msgid "Sleep"
-msgstr ""
-
-#: rog-control-center/ui/widgets/aura_power.slint:63
-msgctxt "AuraPowerGroup"
-msgid "Shutdown"
-msgstr ""
-
-#: rog-control-center/ui/widgets/aura_power.slint:102
-msgctxt "AuraPowerGroupOld"
-msgid "Zone Selection"
-msgstr ""
-
-#: rog-control-center/ui/widgets/aura_power.slint:114
-msgctxt "AuraPowerGroupOld"
-msgid "Boot"
-msgstr ""
-
-#: 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/main_window.slint:51
-msgctxt "MainWindow"
-msgid "ROG"
-msgstr ""
-
-#: rog-control-center/ui/main_window.slint:53
-msgctxt "Menu1"
-msgid "System Control"
-msgstr ""
-
-#: rog-control-center/ui/main_window.slint:54
-msgctxt "Menu2"
-msgid "Keyboard Aura"
-msgstr ""
-
-#: rog-control-center/ui/main_window.slint:55
-msgctxt "Menu3"
-msgid "AniMe Matrix"
-msgstr ""
-
-#: rog-control-center/ui/main_window.slint:56
-msgctxt "Menu4"
-msgid "Fan Curves"
-msgstr ""
-
-#: rog-control-center/ui/main_window.slint:57
-msgctxt "Menu5"
-msgid "App Settings"
-msgstr ""
-
-#: rog-control-center/ui/main_window.slint:58
-msgctxt "Menu6"
-msgid "About"
-msgstr ""
-
-#: rog-control-center/ui/main_window.slint:70
-msgctxt "MainWindow"
-msgid "Quit App"
-msgstr ""
-

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

@@ -0,0 +1,771 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2025-03-01 07:51+0000\n"
+"PO-Revision-Date: 2025-03-18 00:19-0300\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 3.5\n"
+
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "Balanced"
+msgstr "Equilibrado"
+
+#: rog-control-center/ui/pages/system.slint:20 rog-control-center/ui/pages/system.slint:24
+msgctxt "SystemPageData"
+msgid "Performance"
+msgstr "Performance"
+
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "Quiet"
+msgstr "Silencioso"
+
+#: rog-control-center/ui/pages/system.slint:23
+msgctxt "SystemPageData"
+msgid "Default"
+msgstr "Padrão"
+
+#: rog-control-center/ui/pages/system.slint:25
+msgctxt "SystemPageData"
+msgid "BalancePerformance"
+msgstr "Equilibrado Performance"
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "BalancePower"
+msgstr "Equilibrado Força"
+
+#: rog-control-center/ui/pages/system.slint:27
+msgctxt "SystemPageData"
+msgid "Power"
+msgstr "Energia"
+
+#: rog-control-center/ui/pages/system.slint:147
+msgctxt "PageSystem"
+msgid "Power settings"
+msgstr "Configurações de Energia"
+
+#: rog-control-center/ui/pages/system.slint:152
+msgctxt "PageSystem"
+msgid "Charge limit"
+msgstr "Limite de Carga"
+
+#: rog-control-center/ui/pages/system.slint:167
+msgctxt "PageSystem"
+msgid "Platform Profile"
+msgstr "Perfil de Plataforma"
+
+#: rog-control-center/ui/pages/system.slint:177
+msgctxt "PageSystem"
+msgid "Advanced"
+msgstr "Avançado"
+
+#: rog-control-center/ui/pages/system.slint:195
+msgctxt "PageSystem"
+msgid "Armoury settings"
+msgstr "Configurações Armoury"
+
+#: rog-control-center/ui/pages/system.slint:205
+msgctxt "no_asus_armoury_driver_1"
+msgid "The asus-armoury driver is not loaded"
+msgstr "O driver asus-armoury não está carregado"
+
+#: rog-control-center/ui/pages/system.slint:211
+msgctxt "no_asus_armoury_driver_2"
+msgid "For advanced features you will require a kernel with this driver added."
+msgstr "Para recursos avançados é necessário um Kernel com esse driver adicionado."
+
+#: rog-control-center/ui/pages/system.slint:222
+msgctxt "PageSystem"
+msgid "Panel Overdrive"
+msgstr "Overdrive do Painel"
+
+#: rog-control-center/ui/pages/system.slint:230
+msgctxt "PageSystem"
+msgid "MiniLED Mode"
+msgstr "Modo MiniLED"
+
+#: rog-control-center/ui/pages/system.slint:238
+msgctxt "PageSystem"
+msgid "POST boot sound"
+msgstr "Som PÓS inicialização"
+
+#: rog-control-center/ui/pages/system.slint:254
+msgctxt "ppt_warning"
+msgid "The following settings are not applied until the toggle is enabled."
+msgstr "As seguintes configurações não são aplicadas até que o seletor esteja habilitado."
+
+#: rog-control-center/ui/pages/system.slint:259 rog-control-center/ui/pages/system.slint:266
+msgctxt "ppt_group_enabled"
+msgid "Enable Tuning"
+msgstr "Habilitar ajustes"
+
+#: rog-control-center/ui/pages/system.slint:277 rog-control-center/ui/pages/system.slint:278
+msgctxt "ppt_pl1_spl"
+msgid "CPU Sustained Power Limit"
+msgstr "Limite Sustentado de Energia da CPU"
+
+#: rog-control-center/ui/pages/system.slint:279
+msgctxt "ppt_pl1_spl_help"
+msgid ""
+"Long-term CPU power limit that affects sustained workload performance. Higher values may increase heat and power consumption."
+msgstr ""
+"Limite de Energia da CPU que afeta o desempenho de cargas sustentada de trabalho. Valores mais altos podem aumentar a "
+"temperatura e o consumo de energia."
+
+#: rog-control-center/ui/pages/system.slint:295 rog-control-center/ui/pages/system.slint:296
+msgctxt "ppt_pl2_sppt"
+msgid "CPU Turbo Power Limit"
+msgstr "Limite Turbo de Energia da CPU"
+
+#: rog-control-center/ui/pages/system.slint:297
+msgctxt "ppt_pl2_sppt_help"
+msgid "Short-term CPU power limit for boost periods. Controls maximum power during brief high-performance bursts."
+msgstr ""
+"Limite de Energia de curto prazo do Processador para períodos de picos rápidos. Controla a Energia máxima durante picos curtos "
+"de alta performance."
+
+#: rog-control-center/ui/pages/system.slint:313 rog-control-center/ui/pages/system.slint:314
+msgctxt "ppt_pl3_fppt"
+msgid "CPU Fast Burst Power Limit"
+msgstr "Limite de energia de pico rápido da CPU"
+
+#: rog-control-center/ui/pages/system.slint:315
+msgctxt "ppt_pl3_fppt_help"
+msgid "Ultra-short duration power limit for instantaneous CPU bursts. Affects responsiveness during sudden workload spikes."
+msgstr ""
+"Limite de Energia de duração ultra-curta para picos instantâneos de Processamento. Afeta a responsividade durante picos de "
+"trabalho repentinos."
+
+#: rog-control-center/ui/pages/system.slint:330 rog-control-center/ui/pages/system.slint:331
+msgctxt "ppt_fppt"
+msgid "Fast Package Power Limit"
+msgstr "Limite de Energia Rápido do Pacote"
+
+#: rog-control-center/ui/pages/system.slint:332
+msgctxt "ppt_fppt_help"
+msgid "Ultra-short duration power limit for system package. Controls maximum power during millisecond-scale load spikes."
+msgstr ""
+"Limite de energia do pacote do sistema de duração ultra curta. Controla a energia máxima durante picos de carga em escala de "
+"milissegundos."
+
+#: rog-control-center/ui/pages/system.slint:348 rog-control-center/ui/pages/system.slint:349
+msgctxt "ppt_apu_sppt"
+msgid "APU Sustained Power Limit"
+msgstr "Limite de Força Sustentada para APU"
+
+#: rog-control-center/ui/pages/system.slint:350
+msgctxt "ppt_apu_sppt_help"
+msgid "Long-term power limit for integrated graphics and CPU combined. Affects sustained performance of APU-based workloads."
+msgstr ""
+"Limite de Força de Longo-termo para Gráficos Integrados e Processador combinados.Afeta a perfomance sustentada em cargas "
+"baseadas na APU."
+
+#: rog-control-center/ui/pages/system.slint:366 rog-control-center/ui/pages/system.slint:367
+msgctxt "ppt_platform_sppt"
+msgid "Platform Sustained Power Limit"
+msgstr "Limite de Força Sustentado da Plataforma"
+
+#: rog-control-center/ui/pages/system.slint:368
+msgctxt "ppt_platform_sppt_help"
+msgid "Overall system power limit for sustained operations. Controls total platform power consumption over extended periods."
+msgstr "Limite geral de força do sistema para operações prolongadas. Controla o Consumo total de força por períodos extendidos."
+
+#: rog-control-center/ui/pages/system.slint:384 rog-control-center/ui/pages/system.slint:385
+msgctxt "nv_dynamic_boost"
+msgid "GPU Power Boost"
+msgstr "Incremento de força da GPU"
+
+#: rog-control-center/ui/pages/system.slint:386
+msgctxt "nv_dynamic_boost_help"
+msgid "Additional power allocation for GPU dynamic boost. Higher values increase GPU performance but generate more heat."
+msgstr ""
+"Alocação adicional de força para o Aumento dinâmico da GPU. Valores mais altosaumentam a perfomance da GPU ao custo de gerar "
+"mais calor."
+
+#: rog-control-center/ui/pages/system.slint:402 rog-control-center/ui/pages/system.slint:403
+msgctxt "nv_temp_target"
+msgid "GPU Temperature Limit"
+msgstr "Limite de Temperatura da GPU"
+
+#: rog-control-center/ui/pages/system.slint:404
+msgctxt "nv_temp_target_help"
+msgid "Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain temperature below this limit."
+msgstr "Limite de Temperatura Máxima da GPU em Celsius.A GPU irá desacelerar para manter A Temperatura abaixo deste Limite."
+
+#: rog-control-center/ui/pages/system.slint:456
+msgctxt "PageSystem"
+msgid "Energy Performance Preference linked to Throttle Policy"
+msgstr "Preferência de Performance Energética ligada a Política de Proteção de Sobre-aquecimento"
+
+#: rog-control-center/ui/pages/system.slint:460
+msgctxt "PageSystem"
+msgid "Change EPP based on Throttle Policy"
+msgstr "Alterar o PPE baseado na Política de Proteção de Sobre-aquecimento"
+
+#: rog-control-center/ui/pages/system.slint:468
+msgctxt "PageSystem"
+msgid "EPP for Balanced Policy"
+msgstr "PPE para a Política Equilibrada"
+
+#: rog-control-center/ui/pages/system.slint:478
+msgctxt "PageSystem"
+msgid "EPP for Performance Policy"
+msgstr "PPE para a Política de Desempenho"
+
+#: rog-control-center/ui/pages/system.slint:488
+msgctxt "PageSystem"
+msgid "EPP for Quiet Policy"
+msgstr "PPE para a Política Silenciosa"
+
+#: rog-control-center/ui/pages/system.slint:506
+msgctxt "PageSystem"
+msgid "Throttle Policy for power state"
+msgstr "Política de Proteção de Sobre-aquecimento para o Estaddo de Força"
+
+#: rog-control-center/ui/pages/system.slint:512
+msgctxt "PageSystem"
+msgid "Throttle Policy on Battery"
+msgstr "Política de Proteção de Sobre-aquecimento Ligado na Bateria"
+
+#: rog-control-center/ui/pages/system.slint:522 rog-control-center/ui/pages/system.slint:543
+msgctxt "PageSystem"
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: rog-control-center/ui/pages/system.slint:533
+msgctxt "PageSystem"
+msgid "Throttle Policy on AC"
+msgstr "Política de Proteção de Sobre-aquecimento Ligado na Fonte"
+
+#: rog-control-center/ui/pages/aura.slint:28
+msgctxt "PageAura"
+msgid "Brightness"
+msgstr "Brilho"
+
+#: rog-control-center/ui/pages/aura.slint:39
+msgctxt "PageAura"
+msgid "Aura mode"
+msgstr "Modo Aura"
+
+#: rog-control-center/ui/pages/aura.slint:59
+msgctxt "PageAura"
+msgid "Colour 1"
+msgstr "Cor 1"
+
+#: rog-control-center/ui/pages/aura.slint:85
+msgctxt "PageAura"
+msgid "Colour 2"
+msgstr "Cor 2"
+
+#: rog-control-center/ui/pages/aura.slint:119
+msgctxt "PageAura"
+msgid "Zone"
+msgstr "Zona"
+
+#: rog-control-center/ui/pages/aura.slint:142
+msgctxt "PageAura"
+msgid "Direction"
+msgstr "Direção"
+
+#: rog-control-center/ui/pages/aura.slint:164
+msgctxt "PageAura"
+msgid "Speed"
+msgstr "Velocidade"
+
+#: rog-control-center/ui/pages/aura.slint:185
+msgctxt "PageAura"
+msgid "Power Settings"
+msgstr "Configurações de Energia"
+
+#: rog-control-center/ui/pages/aura.slint:270
+msgctxt "PageAura"
+msgid "Power Zones"
+msgstr "Zonas de Energia"
+
+#: rog-control-center/ui/pages/anime.slint:6
+msgctxt "Anime Brightness"
+msgid "Off"
+msgstr "Desligado"
+
+#: rog-control-center/ui/pages/anime.slint:7
+msgctxt "Anime Brightness"
+msgid "Low"
+msgstr "Baixo"
+
+#: rog-control-center/ui/pages/anime.slint:8
+msgctxt "Anime Brightness"
+msgid "Med"
+msgstr "Médio"
+
+#: rog-control-center/ui/pages/anime.slint:9
+msgctxt "Anime Brightness"
+msgid "High"
+msgstr "Alto"
+
+#: rog-control-center/ui/pages/anime.slint:23
+msgctxt "AnimePageData"
+msgid "Glitch Construction"
+msgstr "Construção de Falha"
+
+#: rog-control-center/ui/pages/anime.slint:23
+msgctxt "AnimePageData"
+msgid "Static Emergence"
+msgstr "Emergência Estática"
+
+#: rog-control-center/ui/pages/anime.slint:25
+msgctxt "AnimePageData"
+msgid "Binary Banner Scroll"
+msgstr "Rolagem Binária de Banner"
+
+#: rog-control-center/ui/pages/anime.slint:25
+msgctxt "AnimePageData"
+msgid "Rog Logo Glitch"
+msgstr "Falha no Logo ROG"
+
+#: rog-control-center/ui/pages/anime.slint:27
+msgctxt "AnimePageData"
+msgid "Banner Swipe"
+msgstr "Deslizamento de Banner"
+
+#: rog-control-center/ui/pages/anime.slint:27
+msgctxt "AnimePageData"
+msgid "Starfield"
+msgstr "Campo Estelar"
+
+#: rog-control-center/ui/pages/anime.slint:29
+msgctxt "AnimePageData"
+msgid "Glitch Out"
+msgstr "Falhando"
+
+#: rog-control-center/ui/pages/anime.slint:29
+msgctxt "AnimePageData"
+msgid "See Ya"
+msgstr "Te Vejo por Aí"
+
+#: rog-control-center/ui/pages/anime.slint:50
+msgctxt "Anime Brightness"
+msgid "Brightness"
+msgstr "Brilho"
+
+#: rog-control-center/ui/pages/anime.slint:66
+msgctxt "PageAnime"
+msgid "Enable display"
+msgstr "Habilitar Tela"
+
+#: rog-control-center/ui/pages/anime.slint:74 rog-control-center/ui/pages/anime.slint:97
+msgctxt "PageAnime"
+msgid "Advanced"
+msgstr "Avançado"
+
+#: rog-control-center/ui/pages/anime.slint:89
+msgctxt "PageAnime"
+msgid "Use built-in animations"
+msgstr "Usar animações padrão"
+
+#: rog-control-center/ui/pages/anime.slint:146
+msgctxt "PageAnime"
+msgid "Set which builtin animations are played"
+msgstr "Definir quais animações padrão são tocadas"
+
+#: rog-control-center/ui/pages/anime.slint:150
+msgctxt "Anime built-in selection"
+msgid "Boot Animation"
+msgstr "Animação de Inicilização"
+
+#: rog-control-center/ui/pages/anime.slint:160
+msgctxt "Anime built-in selection"
+msgid "Running Animation"
+msgstr "Animação de Execução"
+
+#: rog-control-center/ui/pages/anime.slint:170
+msgctxt "Anime built-in selection"
+msgid "Sleep Animation"
+msgstr "Animação de Dormir"
+
+#: rog-control-center/ui/pages/anime.slint:180
+msgctxt "Anime built-in selection"
+msgid "Shutdown Animation"
+msgstr "Animação de Desligamento"
+
+#: rog-control-center/ui/pages/anime.slint:220
+msgctxt "PageAnime"
+msgid "Advanced Display Settings"
+msgstr "Configurações Avançadas da Tela"
+
+#: rog-control-center/ui/pages/anime.slint:225
+msgctxt "PageAnime"
+msgid "Off when lid closed"
+msgstr "Desligado quando a tampa estiver fechada"
+
+#: rog-control-center/ui/pages/anime.slint:234
+msgctxt "PageAnime"
+msgid "Off when suspended"
+msgstr "Desligado enquanto suspenso"
+
+#: rog-control-center/ui/pages/anime.slint:243
+msgctxt "PageAnime"
+msgid "Off when on battery"
+msgstr "Desligado enquanto na bateria"
+
+#: rog-control-center/ui/pages/fans.slint:26
+msgctxt "FanTab"
+msgid "This fan is not avilable on this machine"
+msgstr "Esta ventoinha não está disponível nessa máquina"
+
+#: rog-control-center/ui/pages/fans.slint:34
+msgctxt "FanTab"
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: rog-control-center/ui/pages/fans.slint:43
+msgctxt "FanTab"
+msgid "Apply"
+msgstr "Aplicar"
+
+#: rog-control-center/ui/pages/fans.slint:51
+msgctxt "FanTab"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: rog-control-center/ui/pages/fans.slint:59
+msgctxt "FanTab"
+msgid "Factory Default (all fans)"
+msgstr "Padrão de Fabrica (todas as ventoinhas)"
+
+#: rog-control-center/ui/pages/fans.slint:72
+msgctxt "PageFans"
+msgid "Balanced"
+msgstr "Equilibrado"
+
+#: 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 "Processador"
+
+#: 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 "Médio"
+
+#: 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 "Placa de Vídeo"
+
+#: rog-control-center/ui/pages/fans.slint:131
+msgctxt "PageFans"
+msgid "Performance"
+msgstr "Performance"
+
+#: rog-control-center/ui/pages/fans.slint:190
+msgctxt "PageFans"
+msgid "Quiet"
+msgstr "Silencioso"
+
+#: rog-control-center/ui/pages/app_settings.slint:26
+msgctxt "PageAppSettings"
+msgid "Run in background after closing"
+msgstr "Executar em pano de fundo após fechar"
+
+#: rog-control-center/ui/pages/app_settings.slint:34
+msgctxt "PageAppSettings"
+msgid "Start app in background (UI closed)"
+msgstr "Iniciar Aplicação em pano de fundo (Interface Gráfica fechada)"
+
+#: rog-control-center/ui/pages/app_settings.slint:42
+msgctxt "PageAppSettings"
+msgid "Enable system tray icon"
+msgstr "Habilitar icone da bandeja de sistema"
+
+#: rog-control-center/ui/pages/app_settings.slint:50
+msgctxt "PageAppSettings"
+msgid "Enable dGPU notifications"
+msgstr "Habilitar notificações da GPU dedicada"
+
+#: rog-control-center/ui/types/aura_types.slint:52
+msgctxt "Aura power zone"
+msgid "Logo"
+msgstr "Logo"
+
+#: rog-control-center/ui/types/aura_types.slint:53 rog-control-center/ui/types/aura_types.slint:63
+msgctxt "Aura power zone"
+msgid "Keyboard"
+msgstr "Teclado"
+
+#: rog-control-center/ui/types/aura_types.slint:54 rog-control-center/ui/types/aura_types.slint:64
+msgctxt "Aura power zone"
+msgid "Lightbar"
+msgstr "Barra de Luz"
+
+#: rog-control-center/ui/types/aura_types.slint:55
+msgctxt "Aura power zone"
+msgid "Lid"
+msgstr "Tampa"
+
+#: rog-control-center/ui/types/aura_types.slint:56
+msgctxt "Aura power zone"
+msgid "Rear Glow"
+msgstr "Brilho Traseiro"
+
+#: rog-control-center/ui/types/aura_types.slint:57 rog-control-center/ui/types/aura_types.slint:65
+msgctxt "Aura power zone"
+msgid "Keyboard and Lightbar"
+msgstr "Teclado e Barra de Luz"
+
+#: rog-control-center/ui/types/aura_types.slint:58
+msgctxt "Aura power zone"
+msgid "Ally"
+msgstr "Ally"
+
+#: rog-control-center/ui/types/aura_types.slint:68
+msgctxt "Aura brightness"
+msgid "Off"
+msgstr "Desligado"
+
+#: rog-control-center/ui/types/aura_types.slint:69
+msgctxt "Aura brightness"
+msgid "Low"
+msgstr "Baixo"
+
+#: rog-control-center/ui/types/aura_types.slint:70
+msgctxt "Aura brightness"
+msgid "Med"
+msgstr "Médio"
+
+#: rog-control-center/ui/types/aura_types.slint:71
+msgctxt "Aura brightness"
+msgid "High"
+msgstr "Alto"
+
+#: rog-control-center/ui/types/aura_types.slint:76 rog-control-center/ui/types/aura_types.slint:91
+msgctxt "Basic aura mode"
+msgid "Static"
+msgstr "Estático"
+
+#: rog-control-center/ui/types/aura_types.slint:77 rog-control-center/ui/types/aura_types.slint:92
+msgctxt "Basic aura mode"
+msgid "Breathe"
+msgstr "Respiração"
+
+#: rog-control-center/ui/types/aura_types.slint:78 rog-control-center/ui/types/aura_types.slint:93
+msgctxt "Basic aura mode"
+msgid "Strobe"
+msgstr "Estroboscópio"
+
+#: rog-control-center/ui/types/aura_types.slint:79
+msgctxt "Basic aura mode"
+msgid "Rainbow"
+msgstr "Arco-Íris"
+
+#: rog-control-center/ui/types/aura_types.slint:80
+msgctxt "Basic aura mode"
+msgid "Star"
+msgstr "Estrela"
+
+#: rog-control-center/ui/types/aura_types.slint:81
+msgctxt "Basic aura mode"
+msgid "Rain"
+msgstr "Chuva"
+
+#: rog-control-center/ui/types/aura_types.slint:82
+msgctxt "Basic aura mode"
+msgid "Highlight"
+msgstr "Destaque"
+
+#: rog-control-center/ui/types/aura_types.slint:83
+msgctxt "Basic aura mode"
+msgid "Laser"
+msgstr "Lase"
+
+#: rog-control-center/ui/types/aura_types.slint:84
+msgctxt "Basic aura mode"
+msgid "Ripple"
+msgstr "Ondas"
+
+#: rog-control-center/ui/types/aura_types.slint:85
+msgctxt "Basic aura mode"
+msgid "Nothing"
+msgstr "Nenhum"
+
+#: rog-control-center/ui/types/aura_types.slint:86
+msgctxt "Basic aura mode"
+msgid "Pulse"
+msgstr "Pulso"
+
+#: rog-control-center/ui/types/aura_types.slint:87
+msgctxt "Basic aura mode"
+msgid "Comet"
+msgstr "Cometa"
+
+#: rog-control-center/ui/types/aura_types.slint:88
+msgctxt "Basic aura mode"
+msgid "Flash"
+msgstr "Piscando"
+
+#: rog-control-center/ui/types/aura_types.slint:100
+msgctxt "Aura zone"
+msgid "None"
+msgstr "Nenhuma"
+
+#: rog-control-center/ui/types/aura_types.slint:101
+msgctxt "Aura zone"
+msgid "Key1"
+msgstr "Tecla1"
+
+#: rog-control-center/ui/types/aura_types.slint:102
+msgctxt "Aura zone"
+msgid "Key2"
+msgstr "Tecla2"
+
+#: rog-control-center/ui/types/aura_types.slint:103
+msgctxt "Aura zone"
+msgid "Key3"
+msgstr "Tecla3"
+
+#: rog-control-center/ui/types/aura_types.slint:104
+msgctxt "Aura zone"
+msgid "Key4"
+msgstr "Tecla4"
+
+#: rog-control-center/ui/types/aura_types.slint:105
+msgctxt "Aura zone"
+msgid "Logo"
+msgstr "Logo"
+
+#: rog-control-center/ui/types/aura_types.slint:106
+msgctxt "Aura zone"
+msgid "Lightbar Left"
+msgstr "Barra de Luza Esquerda"
+
+#: rog-control-center/ui/types/aura_types.slint:107
+msgctxt "Aura zone"
+msgid "Lightbar Right"
+msgstr "Barra de Luz Direita"
+
+#: rog-control-center/ui/types/aura_types.slint:111
+msgctxt "Aura direction"
+msgid "Right"
+msgstr "Direita"
+
+#: rog-control-center/ui/types/aura_types.slint:112
+msgctxt "Aura direction"
+msgid "Left"
+msgstr "Esquerda"
+
+#: rog-control-center/ui/types/aura_types.slint:113
+msgctxt "Aura direction"
+msgid "Up"
+msgstr "Cima"
+
+#: rog-control-center/ui/types/aura_types.slint:114
+msgctxt "Aura direction"
+msgid "Down"
+msgstr "Baixo"
+
+#: rog-control-center/ui/types/aura_types.slint:118
+msgctxt "Aura speed"
+msgid "Low"
+msgstr "Baixa"
+
+#: rog-control-center/ui/types/aura_types.slint:119
+msgctxt "Aura speed"
+msgid "Medium"
+msgstr "Média"
+
+#: rog-control-center/ui/types/aura_types.slint:120
+msgctxt "Aura speed"
+msgid "High"
+msgstr "Alta"
+
+#: rog-control-center/ui/widgets/aura_power.slint:33
+msgctxt "AuraPowerGroup"
+msgid "Boot"
+msgstr "Inicilização"
+
+#: rog-control-center/ui/widgets/aura_power.slint:43
+msgctxt "AuraPowerGroup"
+msgid "Awake"
+msgstr "Acordado"
+
+#: rog-control-center/ui/widgets/aura_power.slint:53
+msgctxt "AuraPowerGroup"
+msgid "Sleep"
+msgstr "Dormir"
+
+#: rog-control-center/ui/widgets/aura_power.slint:63
+msgctxt "AuraPowerGroup"
+msgid "Shutdown"
+msgstr "Desligar"
+
+#: rog-control-center/ui/widgets/aura_power.slint:102
+msgctxt "AuraPowerGroupOld"
+msgid "Zone Selection"
+msgstr "Seleção de Zona"
+
+#: rog-control-center/ui/widgets/aura_power.slint:114
+msgctxt "AuraPowerGroupOld"
+msgid "Boot"
+msgstr "Inicilizacao"
+
+#: rog-control-center/ui/widgets/aura_power.slint:124
+msgctxt "AuraPowerGroupOld"
+msgid "Awake"
+msgstr "Acordado"
+
+#: rog-control-center/ui/widgets/aura_power.slint:134
+msgctxt "AuraPowerGroupOld"
+msgid "Sleep"
+msgstr "Dormir"
+
+#: rog-control-center/ui/widgets/common.slint:136
+msgctxt "confirm_reset"
+msgid "Are you sure you want to reset this?"
+msgstr "Tem certeza que deseja resetar isso?"
+
+#: rog-control-center/ui/main_window.slint:55
+msgctxt "MainWindow"
+msgid "ROG"
+msgstr "ROG"
+
+#: rog-control-center/ui/main_window.slint:57
+msgctxt "Menu1"
+msgid "System Control"
+msgstr "Controles do Sistema"
+
+#: rog-control-center/ui/main_window.slint:58
+msgctxt "Menu2"
+msgid "Keyboard Aura"
+msgstr "Teclado Aura"
+
+#: rog-control-center/ui/main_window.slint:59
+msgctxt "Menu3"
+msgid "AniMe Matrix"
+msgstr "AniMe Matrix"
+
+#: rog-control-center/ui/main_window.slint:60
+msgctxt "Menu4"
+msgid "Fan Curves"
+msgstr "Curvas das Ventoinhas"
+
+#: rog-control-center/ui/main_window.slint:61
+msgctxt "Menu5"
+msgid "App Settings"
+msgstr "Configuracoes do App"
+
+#: rog-control-center/ui/main_window.slint:62
+msgctxt "Menu6"
+msgid "About"
+msgstr "Sobre"
+
+#: rog-control-center/ui/main_window.slint:74
+msgctxt "MainWindow"
+msgid "Quit App"
+msgstr "Sair do App"

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

@@ -0,0 +1,818 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2025-01-21 06:49+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: rog-control-center/ui/pages/system.slint:19
+msgctxt "SystemPageData"
+msgid "Balanced"
+msgstr "Сбалансированный"
+
+#: rog-control-center/ui/pages/system.slint:19
+#: rog-control-center/ui/pages/system.slint:23
+msgctxt "SystemPageData"
+msgid "Performance"
+msgstr "Производительный"
+
+#: rog-control-center/ui/pages/system.slint:19
+msgctxt "SystemPageData"
+msgid "Quiet"
+msgstr "Тихий"
+
+#: rog-control-center/ui/pages/system.slint:22
+msgctxt "SystemPageData"
+msgid "Default"
+msgstr "По умолчанию"
+
+#: rog-control-center/ui/pages/system.slint:24
+msgctxt "SystemPageData"
+msgid "BalancePerformance"
+msgstr "Баланс-Производительность"
+
+#: rog-control-center/ui/pages/system.slint:25
+msgctxt "SystemPageData"
+msgid "BalancePower"
+msgstr "Баланс-Мощность"
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Power"
+msgstr "Мощность"
+
+#: rog-control-center/ui/pages/system.slint:142
+msgctxt "PageSystem"
+msgid "Power settings"
+msgstr "Настройки питания"
+
+#: rog-control-center/ui/pages/system.slint:147
+msgctxt "PageSystem"
+msgid "Charge limit"
+msgstr "Ограничение заряда"
+
+#: rog-control-center/ui/pages/system.slint:161
+msgctxt "PageSystem"
+msgid "Platform Profile"
+msgstr "Профиль работы"
+
+#: rog-control-center/ui/pages/system.slint:171
+msgctxt "PageSystem"
+msgid "Advanced"
+msgstr "Больше"
+
+#: rog-control-center/ui/pages/system.slint:189
+msgctxt "PageSystem"
+msgid "Armoury settings"
+msgstr "Настройки Armoury Crate"
+
+#: rog-control-center/ui/pages/system.slint:199
+msgctxt "no_asus_armoury_driver_1"
+msgid "The asus-armoury driver is not loaded"
+msgstr "Драйвер Asus-Armoury не загружен"
+
+#: rog-control-center/ui/pages/system.slint:205
+msgctxt "no_asus_armoury_driver_2"
+msgid ""
+"For advanced features you will require a kernel with this driver added."
+msgstr ""
+"Для расширенных функций требуется ядро с поддержкой этого драйвера."
+
+#: rog-control-center/ui/pages/system.slint:216
+msgctxt "PageSystem"
+msgid "Panel Overdrive"
+msgstr "Панель перегрузки"
+
+#: rog-control-center/ui/pages/system.slint:224
+msgctxt "PageSystem"
+msgid "MiniLED Mode"
+msgstr "Режим MiniLED"
+
+#: rog-control-center/ui/pages/system.slint:232
+msgctxt "PageSystem"
+msgid "POST boot sound"
+msgstr "Звук при загрузке системы"
+
+#: rog-control-center/ui/pages/system.slint:248
+msgctxt "ppt_warning"
+msgid "The following settings are not applied until the toggle is enabled."
+msgstr ""
+"Следующие настройки применяются только после включения переключателя."
+
+#: rog-control-center/ui/pages/system.slint:253
+msgctxt "ppt_group_enabled"
+msgid "Enable Tuning"
+msgstr "Включить настройку"
+
+#: rog-control-center/ui/pages/system.slint:262
+#: rog-control-center/ui/pages/system.slint:263
+msgctxt "ppt_pl1_spl"
+msgid "CPU Sustained Power Limit"
+msgstr "Долгосрочный лимит мощности процессора"
+
+#: rog-control-center/ui/pages/system.slint:264
+msgctxt "ppt_pl1_spl_help"
+msgid ""
+"Long-term CPU power limit that affects sustained workload performance. "
+"Higher values may increase heat and power consumption."
+msgstr ""
+"Долгосрочный предел мощности процессора, который влияет на устойчивую "
+"производительность рабочей нагрузки. Более высокие значения могут увеличить "
+"тепло и энергопотребление."
+
+#: rog-control-center/ui/pages/system.slint:279
+#: rog-control-center/ui/pages/system.slint:280
+msgctxt "ppt_pl2_sppt"
+msgid "CPU Turbo Power Limit"
+msgstr "Лимит мощности в режиме Turbo процессора"
+
+#: rog-control-center/ui/pages/system.slint:281
+msgctxt "ppt_pl2_sppt_help"
+msgid ""
+"Short-term CPU power limit for boost periods. Controls maximum power during "
+"brief high-performance bursts."
+msgstr ""
+"Краткосрочный предел мощности процессора для периодов повышения. Управление "
+"максимальной мощностью во время коротких высокопроизводительных всплесков."
+
+#: rog-control-center/ui/pages/system.slint:296
+#: rog-control-center/ui/pages/system.slint:297
+msgctxt "ppt_pl3_fppt"
+msgid "CPU Fast Burst Power Limit"
+msgstr "Лимит мощности для кратковременных всплесков процессора"
+
+#: rog-control-center/ui/pages/system.slint:298
+msgctxt "ppt_pl3_fppt_help"
+msgid ""
+"Ultra-short duration power limit for instantaneous CPU bursts. Affects "
+"responsiveness during sudden workload spikes."
+msgstr ""
+"Ультра-короткая продолжительность предела мощности для мгновенных всплесков "
+"процессора. Влияет на отзывчивость во время внезапных всплесков рабочей "
+"нагрузки."
+
+#: rog-control-center/ui/pages/system.slint:312
+#: rog-control-center/ui/pages/system.slint:313
+msgctxt "ppt_fppt"
+msgid "Fast Package Power Limit"
+msgstr "Лимит мощности для кратковременных нагрузок на систему"
+
+#: rog-control-center/ui/pages/system.slint:314
+msgctxt "ppt_fppt_help"
+msgid ""
+"Ultra-short duration power limit for system package. Controls maximum power "
+"during millisecond-scale load spikes."
+msgstr ""
+"Ультра-короткая продолжительность предела мощности для системного пакета. "
+"Управление максимальной мощностью во время кратковременных всплесков нагрузки."
+
+#: rog-control-center/ui/pages/system.slint:329
+#: rog-control-center/ui/pages/system.slint:330
+msgctxt "ppt_apu_sppt"
+msgid "APU Sustained Power Limit"
+msgstr "Долгосрочный лимит мощности APU"
+
+#: rog-control-center/ui/pages/system.slint:331
+msgctxt "ppt_apu_sppt_help"
+msgid ""
+"Long-term power limit for integrated graphics and CPU combined. Affects "
+"sustained performance of APU-based workloads."
+msgstr ""
+"Долгосрочный лимит мощности для интегрированной графики и процессора "
+"объединена. Влияет на производительность задач, использующих APU."
+
+#: rog-control-center/ui/pages/system.slint:346
+#: rog-control-center/ui/pages/system.slint:347
+msgctxt "ppt_platform_sppt"
+msgid "Platform Sustained Power Limit"
+msgstr "Долгосрочный лимит мощности системы"
+
+#: rog-control-center/ui/pages/system.slint:348
+msgctxt "ppt_platform_sppt_help"
+msgid ""
+"Overall system power limit for sustained operations. Controls total platform"
+" power consumption over extended periods."
+msgstr ""
+"Общий предел мощности системы для длительных операций. Управляет общим потреблением "
+"энергии платформы в течение продолжительных периодов времени"
+
+#: rog-control-center/ui/pages/system.slint:363
+#: rog-control-center/ui/pages/system.slint:364
+msgctxt "nv_dynamic_boost"
+msgid "GPU Power Boost"
+msgstr "Динамическое усиление мощности GPU"
+
+#: rog-control-center/ui/pages/system.slint:365
+msgctxt "nv_dynamic_boost_help"
+msgid ""
+"Additional power allocation for GPU dynamic boost. Higher values increase "
+"GPU performance but generate more heat."
+msgstr ""
+"Дополнительное распределение мощности для динамического буста GPU. Более высокие значения "
+"увеличивают производительность GPU, но приводят к большему выделению тепла"
+
+#: rog-control-center/ui/pages/system.slint:380
+#: rog-control-center/ui/pages/system.slint:381
+msgctxt "nv_temp_target"
+msgid "GPU Temperature Limit"
+msgstr "Предел температуры GPU"
+
+#: rog-control-center/ui/pages/system.slint:382
+msgctxt "nv_temp_target_help"
+msgid ""
+"Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain "
+"temperature below this limit."
+msgstr ""
+"Максимальный порог температуры GPU в градусах Цельсия. GPU будет "
+"ограничивать свою производительность, чтобы поддерживать температуру ниже этого предела"
+
+#: rog-control-center/ui/pages/system.slint:433
+msgctxt "PageSystem"
+msgid "Energy Performance Preference linked to Throttle Policy"
+msgstr "Предпочтение энергоэффективности, связанное с политикой ограничения"
+
+#: rog-control-center/ui/pages/system.slint:437
+msgctxt "PageSystem"
+msgid "Change EPP based on Throttle Policy"
+msgstr "Изменить EPP на основе политики дроссельной заслонки"
+
+#: rog-control-center/ui/pages/system.slint:445
+msgctxt "PageSystem"
+msgid "EPP for Balanced Policy"
+msgstr "EPP для сбалансированного режима"
+
+#: rog-control-center/ui/pages/system.slint:455
+msgctxt "PageSystem"
+msgid "EPP for Performance Policy"
+msgstr "EPP для эффективного режима"
+
+#: rog-control-center/ui/pages/system.slint:465
+msgctxt "PageSystem"
+msgid "EPP for Quiet Policy"
+msgstr "EPP для тихого режима"
+
+#: rog-control-center/ui/pages/system.slint:483
+msgctxt "PageSystem"
+msgid "Throttle Policy for power state"
+msgstr "Политика ограничения для состояния питания"
+
+#: rog-control-center/ui/pages/system.slint:489
+msgctxt "PageSystem"
+msgid "Throttle Policy on Battery"
+msgstr "Политика управления производительностью (от аккумулятора)"
+
+#: rog-control-center/ui/pages/system.slint:499
+#: rog-control-center/ui/pages/system.slint:520
+msgctxt "PageSystem"
+msgid "Enabled"
+msgstr "Включено"
+
+#: rog-control-center/ui/pages/system.slint:510
+msgctxt "PageSystem"
+msgid "Throttle Policy on AC"
+msgstr "Политика управления производительностью (от сети)"
+
+#: rog-control-center/ui/pages/aura.slint:28
+msgctxt "PageAura"
+msgid "Brightness"
+msgstr "Яркость"
+
+#: rog-control-center/ui/pages/aura.slint:39
+msgctxt "PageAura"
+msgid "Aura mode"
+msgstr "Режим подсветки"
+
+#: rog-control-center/ui/pages/aura.slint:59
+msgctxt "PageAura"
+msgid "Colour 1"
+msgstr "Цвет 1"
+
+#: rog-control-center/ui/pages/aura.slint:85
+msgctxt "PageAura"
+msgid "Colour 2"
+msgstr "Цвет 2"
+
+#: rog-control-center/ui/pages/aura.slint:119
+msgctxt "PageAura"
+msgid "Zone"
+msgstr "Зона подсветки"
+
+#: rog-control-center/ui/pages/aura.slint:142
+msgctxt "PageAura"
+msgid "Direction"
+msgstr "Направление подсветки"
+
+#: rog-control-center/ui/pages/aura.slint:164
+msgctxt "PageAura"
+msgid "Speed"
+msgstr "Скорость подсветки"
+
+#: rog-control-center/ui/pages/aura.slint:185
+msgctxt "PageAura"
+msgid "Power Settings"
+msgstr "Настройки питания"
+
+#: rog-control-center/ui/pages/aura.slint:270
+msgctxt "PageAura"
+msgid "Power Zones"
+msgstr "Напряжения"
+
+#: rog-control-center/ui/pages/anime.slint:6
+msgctxt "Anime Brightness"
+msgid "Off"
+msgstr "Выключено"
+
+#: rog-control-center/ui/pages/anime.slint:7
+msgctxt "Anime Brightness"
+msgid "Low"
+msgstr "Низкая"
+
+#: rog-control-center/ui/pages/anime.slint:8
+msgctxt "Anime Brightness"
+msgid "Med"
+msgstr "Средняя"
+
+#: rog-control-center/ui/pages/anime.slint:9
+msgctxt "Anime Brightness"
+msgid "High"
+msgstr "Высокая"
+
+#: 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 Logo Glitch"
+
+#: 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 "Яркость"
+
+#: rog-control-center/ui/pages/anime.slint:66
+msgctxt "PageAnime"
+msgid "Enable display"
+msgstr "Включить дисплей"
+
+#: rog-control-center/ui/pages/anime.slint:74
+#: rog-control-center/ui/pages/anime.slint:97
+msgctxt "PageAnime"
+msgid "Advanced"
+msgstr "Продвинутый"
+
+#: rog-control-center/ui/pages/anime.slint:89
+msgctxt "PageAnime"
+msgid "Use built-in animations"
+msgstr "Используйте встроенные анимации"
+
+#: rog-control-center/ui/pages/anime.slint:146
+msgctxt "PageAnime"
+msgid "Set which builtin animations are played"
+msgstr "Установите где должны быть анимации"
+
+#: 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 "Анимация сна"
+
+#: rog-control-center/ui/pages/anime.slint:180
+msgctxt "Anime built-in selection"
+msgid "Shutdown Animation"
+msgstr "Выключение анимации"
+
+#: rog-control-center/ui/pages/anime.slint:220
+msgctxt "PageAnime"
+msgid "Advanced Display Settings"
+msgstr "Расширенные настройки дисплея"
+
+#: rog-control-center/ui/pages/anime.slint:225
+msgctxt "PageAnime"
+msgid "Off when lid closed"
+msgstr "Выключить при закрытии крышки"
+
+#: rog-control-center/ui/pages/anime.slint:234
+msgctxt "PageAnime"
+msgid "Off when suspended"
+msgstr "Выключен при приостановке"
+
+#: rog-control-center/ui/pages/anime.slint:243
+msgctxt "PageAnime"
+msgid "Off when on battery"
+msgstr "Выключить при питании от батареи"
+
+#: rog-control-center/ui/pages/fans.slint:26
+msgctxt "FanTab"
+msgid "This fan is not avilable on this machine"
+msgstr "Кулер корпуса недоступен"
+
+#: rog-control-center/ui/pages/fans.slint:34
+msgctxt "FanTab"
+msgid "Enabled"
+msgstr "Включено"
+
+#: rog-control-center/ui/pages/fans.slint:43
+msgctxt "FanTab"
+msgid "Apply"
+msgstr "Применить"
+
+#: rog-control-center/ui/pages/fans.slint:51
+msgctxt "FanTab"
+msgid "Cancel"
+msgstr "Отмена"
+
+#: rog-control-center/ui/pages/fans.slint:59
+msgctxt "FanTab"
+msgid "Factory Default (all fans)"
+msgstr "По умолчанию (все куллеры)"
+
+#: rog-control-center/ui/pages/fans.slint:72
+msgctxt "PageFans"
+msgid "Balanced"
+msgstr "Сбалансированный"
+
+#: rog-control-center/ui/pages/fans.slint:75
+#: rog-control-center/ui/pages/fans.slint:134
+#: rog-control-center/ui/pages/fans.slint:193
+msgctxt "PageFans"
+msgid "CPU"
+msgstr "Центральный Процессор"
+
+#: rog-control-center/ui/pages/fans.slint:93
+#: rog-control-center/ui/pages/fans.slint:152
+#: rog-control-center/ui/pages/fans.slint:211
+msgctxt "PageFans"
+msgid "Mid"
+msgstr "Корпус"
+
+#: rog-control-center/ui/pages/fans.slint:111
+#: rog-control-center/ui/pages/fans.slint:170
+#: rog-control-center/ui/pages/fans.slint:229
+msgctxt "PageFans"
+msgid "GPU"
+msgstr "Графический процессор"
+
+#: rog-control-center/ui/pages/fans.slint:131
+msgctxt "PageFans"
+msgid "Performance"
+msgstr "Производительный"
+
+#: rog-control-center/ui/pages/fans.slint:190
+msgctxt "PageFans"
+msgid "Quiet"
+msgstr "Тихий"
+
+#: rog-control-center/ui/pages/app_settings.slint:26
+msgctxt "PageAppSettings"
+msgid "Run in background after closing"
+msgstr "Запустить в фоновом режиме после закрытия"
+
+#: rog-control-center/ui/pages/app_settings.slint:34
+msgctxt "PageAppSettings"
+msgid "Start app in background (UI closed)"
+msgstr "Запускать приложение в фоне/трее (UI закрыт)"
+
+#: rog-control-center/ui/pages/app_settings.slint:42
+msgctxt "PageAppSettings"
+msgid "Enable system tray icon"
+msgstr "Включить значок системного лотка"
+
+#: rog-control-center/ui/pages/app_settings.slint:50
+msgctxt "PageAppSettings"
+msgid "Enable dGPU notifications"
+msgstr "Включить уведомления DGPU"
+
+#: rog-control-center/ui/types/aura_types.slint:52
+msgctxt "Aura power zone"
+msgid "Logo"
+msgstr "Логотип"
+
+#: rog-control-center/ui/types/aura_types.slint:53
+#: rog-control-center/ui/types/aura_types.slint:63
+msgctxt "Aura power zone"
+msgid "Keyboard"
+msgstr "Клавиатура"
+
+#: rog-control-center/ui/types/aura_types.slint:54
+#: rog-control-center/ui/types/aura_types.slint:64
+msgctxt "Aura power zone"
+msgid "Lightbar"
+msgstr "Бар подсветки"
+
+#: rog-control-center/ui/types/aura_types.slint:55
+msgctxt "Aura power zone"
+msgid "Lid"
+msgstr "Крышка"
+
+#: rog-control-center/ui/types/aura_types.slint:56
+msgctxt "Aura power zone"
+msgid "Rear Glow"
+msgstr "Задняя подсветка"
+
+#: rog-control-center/ui/types/aura_types.slint:57
+#: rog-control-center/ui/types/aura_types.slint:65
+msgctxt "Aura power zone"
+msgid "Keyboard and Lightbar"
+msgstr "Клавиатура и световая панель"
+
+#: rog-control-center/ui/types/aura_types.slint:58
+msgctxt "Aura power zone"
+msgid "Ally"
+msgstr "Союзник"
+
+#: rog-control-center/ui/types/aura_types.slint:68
+msgctxt "Aura brightness"
+msgid "Off"
+msgstr "Выключена"
+
+#: rog-control-center/ui/types/aura_types.slint:69
+msgctxt "Aura brightness"
+msgid "Low"
+msgstr "Низкая"
+
+#: rog-control-center/ui/types/aura_types.slint:70
+msgctxt "Aura brightness"
+msgid "Med"
+msgstr "Средняя"
+
+#: rog-control-center/ui/types/aura_types.slint:71
+msgctxt "Aura brightness"
+msgid "High"
+msgstr "Высокая"
+
+#: rog-control-center/ui/types/aura_types.slint:76
+#: rog-control-center/ui/types/aura_types.slint:91
+msgctxt "Basic aura mode"
+msgid "Static"
+msgstr "Статический"
+
+#: rog-control-center/ui/types/aura_types.slint:77
+#: rog-control-center/ui/types/aura_types.slint:92
+msgctxt "Basic aura mode"
+msgid "Breathe"
+msgstr "Дыхание"
+
+#: rog-control-center/ui/types/aura_types.slint:78
+#: rog-control-center/ui/types/aura_types.slint:93
+msgctxt "Basic aura mode"
+msgid "Strobe"
+msgstr "Стробопод"
+
+#: rog-control-center/ui/types/aura_types.slint:79
+msgctxt "Basic aura mode"
+msgid "Rainbow"
+msgstr "Радуга"
+
+#: rog-control-center/ui/types/aura_types.slint:80
+msgctxt "Basic aura mode"
+msgid "Star"
+msgstr "Звезда"
+
+#: rog-control-center/ui/types/aura_types.slint:81
+msgctxt "Basic aura mode"
+msgid "Rain"
+msgstr "Дождь"
+
+#: rog-control-center/ui/types/aura_types.slint:82
+msgctxt "Basic aura mode"
+msgid "Highlight"
+msgstr "Выделенный"
+
+#: rog-control-center/ui/types/aura_types.slint:83
+msgctxt "Basic aura mode"
+msgid "Laser"
+msgstr "Лазер"
+
+#: rog-control-center/ui/types/aura_types.slint:84
+msgctxt "Basic aura mode"
+msgid "Ripple"
+msgstr "Пульс"
+
+#: rog-control-center/ui/types/aura_types.slint:85
+msgctxt "Basic aura mode"
+msgid "Nothing"
+msgstr "Ничего"
+
+#: rog-control-center/ui/types/aura_types.slint:86
+msgctxt "Basic aura mode"
+msgid "Pulse"
+msgstr "Пульс"
+
+#: rog-control-center/ui/types/aura_types.slint:87
+msgctxt "Basic aura mode"
+msgid "Comet"
+msgstr "Комета"
+
+#: rog-control-center/ui/types/aura_types.slint:88
+msgctxt "Basic aura mode"
+msgid "Flash"
+msgstr "Вспышка"
+
+#: rog-control-center/ui/types/aura_types.slint:100
+msgctxt "Aura zone"
+msgid "None"
+msgstr "Отсутствует"
+
+#: rog-control-center/ui/types/aura_types.slint:101
+msgctxt "Aura zone"
+msgid "Key1"
+msgstr "Кнопка 1"
+
+#: rog-control-center/ui/types/aura_types.slint:102
+msgctxt "Aura zone"
+msgid "Key2"
+msgstr "Кнопка 2"
+
+#: rog-control-center/ui/types/aura_types.slint:103
+msgctxt "Aura zone"
+msgid "Key3"
+msgstr "Кнопка 3"
+
+#: rog-control-center/ui/types/aura_types.slint:104
+msgctxt "Aura zone"
+msgid "Key4"
+msgstr "Кнопка 4"
+
+#: rog-control-center/ui/types/aura_types.slint:105
+msgctxt "Aura zone"
+msgid "Logo"
+msgstr "Логотип"
+
+#: rog-control-center/ui/types/aura_types.slint:106
+msgctxt "Aura zone"
+msgid "Lightbar Left"
+msgstr "Левый бар подсветки"
+
+#: rog-control-center/ui/types/aura_types.slint:107
+msgctxt "Aura zone"
+msgid "Lightbar Right"
+msgstr "Правый бар подсветки"
+
+#: rog-control-center/ui/types/aura_types.slint:111
+msgctxt "Aura direction"
+msgid "Right"
+msgstr "Правый"
+
+#: rog-control-center/ui/types/aura_types.slint:112
+msgctxt "Aura direction"
+msgid "Left"
+msgstr "Левый"
+
+#: rog-control-center/ui/types/aura_types.slint:113
+msgctxt "Aura direction"
+msgid "Up"
+msgstr "Вверх"
+
+#: rog-control-center/ui/types/aura_types.slint:114
+msgctxt "Aura direction"
+msgid "Down"
+msgstr "Вниз"
+
+#: rog-control-center/ui/types/aura_types.slint:118
+msgctxt "Aura speed"
+msgid "Low"
+msgstr "Низкая"
+
+#: rog-control-center/ui/types/aura_types.slint:119
+msgctxt "Aura speed"
+msgid "Medium"
+msgstr "Средняя"
+
+#: rog-control-center/ui/types/aura_types.slint:120
+msgctxt "Aura speed"
+msgid "High"
+msgstr "Высокая"
+
+#: rog-control-center/ui/widgets/aura_power.slint:33
+msgctxt "AuraPowerGroup"
+msgid "Boot"
+msgstr "Загрузка"
+
+#: rog-control-center/ui/widgets/aura_power.slint:43
+msgctxt "AuraPowerGroup"
+msgid "Awake"
+msgstr "Работа"
+
+#: rog-control-center/ui/widgets/aura_power.slint:53
+msgctxt "AuraPowerGroup"
+msgid "Sleep"
+msgstr "Сон"
+
+#: rog-control-center/ui/widgets/aura_power.slint:63
+msgctxt "AuraPowerGroup"
+msgid "Shutdown"
+msgstr "Отключен"
+
+#: rog-control-center/ui/widgets/aura_power.slint:102
+msgctxt "AuraPowerGroupOld"
+msgid "Zone Selection"
+msgstr "Выбор зоны"
+
+#: rog-control-center/ui/widgets/aura_power.slint:114
+msgctxt "AuraPowerGroupOld"
+msgid "Boot"
+msgstr "Загрузка"
+
+#: 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/widgets/common.slint:133
+msgctxt "confirm_reset"
+msgid "Are you sure you want to reset this?"
+msgstr "Вы уверены, что хотите сбросить это?"
+
+#: rog-control-center/ui/main_window.slint:54
+msgctxt "MainWindow"
+msgid "ROG"
+msgstr "ROG"
+
+#: rog-control-center/ui/main_window.slint:56
+msgctxt "Menu1"
+msgid "System Control"
+msgstr "Главная"
+
+#: rog-control-center/ui/main_window.slint:57
+msgctxt "Menu2"
+msgid "Keyboard Aura"
+msgstr "Подсветка"
+
+#: rog-control-center/ui/main_window.slint:58
+msgctxt "Menu3"
+msgid "AniMe Matrix"
+msgstr "Матрица AniMe"
+
+#: rog-control-center/ui/main_window.slint:59
+msgctxt "Menu4"
+msgid "Fan Curves"
+msgstr "Кривые вентиляторов"
+
+#: rog-control-center/ui/main_window.slint:60
+msgctxt "Menu5"
+msgid "App Settings"
+msgstr "Настройки"
+
+#: rog-control-center/ui/main_window.slint:61
+msgctxt "Menu6"
+msgid "About"
+msgstr "О нас"
+
+#: rog-control-center/ui/main_window.slint:73
+msgctxt "MainWindow"
+msgid "Quit App"
+msgstr "Выйти"

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

@@ -0,0 +1,810 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: rog-control-center\n"
+"POT-Creation-Date: 2026-01-16 22:25+0000\n"
+"PO-Revision-Date: 2024-07-28 12:00+0300\n"
+"Last-Translator: Mykola Shevchenko\n"
+"Language-Team: Ukrainian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk_UA\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: rog-control-center/ui/main_window.slint:55
+msgctxt "MainWindow"
+msgid "ROG"
+msgstr "ROG"
+
+#: rog-control-center/ui/main_window.slint:57
+msgctxt "Menu1"
+msgid "System Control"
+msgstr "Системні"
+
+#: rog-control-center/ui/main_window.slint:58
+msgctxt "Menu2"
+msgid "Keyboard Aura"
+msgstr "Aura клавіатури"
+
+#: rog-control-center/ui/main_window.slint:59
+msgctxt "Menu3"
+msgid "AniMe Matrix"
+msgstr "AniMe матриця"
+
+#: rog-control-center/ui/main_window.slint:60
+msgctxt "Menu4"
+msgid "Fan Curves"
+msgstr "Криві вентиляторів"
+
+#: rog-control-center/ui/main_window.slint:61
+msgctxt "Menu5"
+msgid "App Settings"
+msgstr "Налаштування"
+
+#: rog-control-center/ui/main_window.slint:62
+msgctxt "Menu6"
+msgid "About"
+msgstr "Про додаток"
+
+#: rog-control-center/ui/main_window.slint:74
+msgctxt "MainWindow"
+msgid "Quit App"
+msgstr "Вийти"
+
+#: rog-control-center/ui/pages/anime.slint:6
+msgctxt "Anime Brightness"
+msgid "Off"
+msgstr "Вимкнено"
+
+#: rog-control-center/ui/pages/anime.slint:7
+msgctxt "Anime Brightness"
+msgid "Low"
+msgstr "Низька"
+
+#: rog-control-center/ui/pages/anime.slint:8
+msgctxt "Anime Brightness"
+msgid "Med"
+msgstr "Середня"
+
+#: rog-control-center/ui/pages/anime.slint:9
+msgctxt "Anime Brightness"
+msgid "High"
+msgstr "Висока"
+
+#: 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"
+
+#: 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 "Яскравість"
+
+#: rog-control-center/ui/pages/anime.slint:66
+msgctxt "PageAnime"
+msgid "Enable display"
+msgstr "Увімкнути показ"
+
+#: rog-control-center/ui/pages/anime.slint:74 rog-control-center/ui/pages/anime.slint:97
+msgctxt "PageAnime"
+msgid "Advanced"
+msgstr "Розширені"
+
+#: rog-control-center/ui/pages/anime.slint:89
+msgctxt "PageAnime"
+msgid "Use built-in animations"
+msgstr "Використовувати вбудовані анімації"
+
+#: rog-control-center/ui/pages/anime.slint:146
+msgctxt "PageAnime"
+msgid "Set which builtin animations are played"
+msgstr "Встановити, які вбудовані анімації відтворювати"
+
+#: 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 "Анімація сну"
+
+#: rog-control-center/ui/pages/anime.slint:180
+msgctxt "Anime built-in selection"
+msgid "Shutdown Animation"
+msgstr "Анімація вимкнення"
+
+#: rog-control-center/ui/pages/anime.slint:220
+msgctxt "PageAnime"
+msgid "Advanced Display Settings"
+msgstr "Розширені налаштування показу"
+
+#: rog-control-center/ui/pages/anime.slint:225
+msgctxt "PageAnime"
+msgid "Off when lid closed"
+msgstr "Вимикати при закритій кришці"
+
+#: rog-control-center/ui/pages/anime.slint:234
+msgctxt "PageAnime"
+msgid "Off when suspended"
+msgstr "Вимикати в режимі сну"
+
+#: rog-control-center/ui/pages/anime.slint:243
+msgctxt "PageAnime"
+msgid "Off when on battery"
+msgstr "Вимикати при роботі від батареї"
+
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "Balanced"
+msgstr "Збалансований"
+
+#: rog-control-center/ui/pages/system.slint:20 rog-control-center/ui/pages/system.slint:27
+msgctxt "SystemPageData"
+msgid "Performance"
+msgstr "Продуктивний"
+
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "Quiet"
+msgstr "Тихий"
+
+#: rog-control-center/ui/pages/system.slint:20
+msgctxt "SystemPageData"
+msgid "LowPower"
+msgstr "Низьке споживання"
+
+#: rog-control-center/ui/pages/system.slint:26
+msgctxt "SystemPageData"
+msgid "Default"
+msgstr "За замовчуванням"
+
+#: rog-control-center/ui/pages/system.slint:28
+msgctxt "SystemPageData"
+msgid "BalancePerformance"
+msgstr "Баланс-Продуктивність"
+
+#: rog-control-center/ui/pages/system.slint:29
+msgctxt "SystemPageData"
+msgid "BalancePower"
+msgstr "Баланс-Енергозбереження"
+
+#: rog-control-center/ui/pages/system.slint:30
+msgctxt "SystemPageData"
+msgid "Power"
+msgstr "Енергозбереження"
+
+#: rog-control-center/ui/pages/system.slint:159
+msgctxt "PageSystem"
+msgid "Power settings"
+msgstr "Налаштування живлення"
+
+#: rog-control-center/ui/pages/system.slint:164
+msgctxt "PageSystem"
+msgid "Charge limit"
+msgstr "Ліміт заряду"
+
+#: rog-control-center/ui/pages/system.slint:179
+msgctxt "PageSystem"
+msgid "Platform Profile"
+msgstr "Профіль платформи"
+
+#: rog-control-center/ui/pages/system.slint:189
+msgctxt "PageSystem"
+msgid "Advanced"
+msgstr "Розширені"
+
+#: rog-control-center/ui/pages/system.slint:209
+msgctxt "PageSystem"
+msgid "Screenpad brightness"
+msgstr "Яскравість екранної панелі"
+
+#: rog-control-center/ui/pages/system.slint:233
+msgctxt "PageSystem"
+msgid "Sync with primary"
+msgstr "Синхронізувати з основним"
+
+#: rog-control-center/ui/pages/system.slint:253
+msgctxt "PageSystem"
+msgid "Armoury settings"
+msgstr "Налаштування Armoury"
+
+#: rog-control-center/ui/pages/system.slint:253
+msgctxt "PageSystem"
+msgid "Keyboard Power Management"
+msgstr "Керування живленням клавіатури"
+
+#: rog-control-center/ui/pages/system.slint:263
+msgctxt "no_asus_armoury_driver_1"
+msgid "The asus-armoury driver is not loaded"
+msgstr "Драйвер asus-armoury не завантажено"
+
+#: rog-control-center/ui/pages/system.slint:269
+msgctxt "no_asus_armoury_driver_2"
+msgid "For advanced features you will require a kernel with this driver added."
+msgstr "Для розширених функцій вам знадобиться ядро з доданим цим драйвером."
+
+#: rog-control-center/ui/pages/system.slint:280
+msgctxt "PageSystem"
+msgid "Panel Overdrive"
+msgstr "Розгін матриці"
+
+#: rog-control-center/ui/pages/system.slint:288
+msgctxt "PageSystem"
+msgid "MiniLED Mode"
+msgstr "Режим MiniLED"
+
+#: rog-control-center/ui/pages/system.slint:296
+msgctxt "PageSystem"
+msgid "POST boot sound"
+msgstr "Звук при завантаженні"
+
+#: rog-control-center/ui/pages/system.slint:312
+msgctxt "ppt_warning"
+msgid "The following settings are not applied until the toggle is enabled."
+msgstr "Наступні налаштування не застосовуються, доки перемикач не буде увімкнено."
+
+#: rog-control-center/ui/pages/system.slint:317 rog-control-center/ui/pages/system.slint:324
+msgctxt "ppt_group_enabled"
+msgid "Enable Tuning"
+msgstr "Увімкнути налаштування"
+
+#: rog-control-center/ui/pages/system.slint:334 rog-control-center/ui/pages/system.slint:335
+msgctxt "ppt_pl1_spl"
+msgid "CPU Sustained Power Limit"
+msgstr "Тривалий ліміт потужності CPU"
+
+#: rog-control-center/ui/pages/system.slint:336
+msgctxt "ppt_pl1_spl_help"
+msgid ""
+"Long-term CPU power limit that affects sustained workload performance. "
+"Higher values may increase heat and power consumption."
+msgstr ""
+"Довготривалий ліміт потужності CPU, що впливає на продуктивність при тривалих навантаженнях."
+"Вищі значення можуть збільшити нагрівання та споживання енергії."
+
+#: rog-control-center/ui/pages/system.slint:352 rog-control-center/ui/pages/system.slint:353
+msgctxt "ppt_pl2_sppt"
+msgid "CPU Turbo Power Limit"
+msgstr "Турбо ліміт потужності CPU"
+
+#: rog-control-center/ui/pages/system.slint:354
+msgctxt "ppt_pl2_sppt_help"
+msgid ""
+"Short-term CPU power limit for boost periods. Controls maximum power during "
+"brief high-performance bursts."
+msgstr ""
+"Короткочасний ліміт потужності CPU для періодів прискорення. Контролює максимальну"
+"потужність під час коротких сплесків високої продуктивності."
+
+#: rog-control-center/ui/pages/system.slint:370 rog-control-center/ui/pages/system.slint:371
+msgctxt "ppt_pl3_fppt"
+msgid "CPU Fast Burst Power Limit"
+msgstr "Швидкий ліміт потужності CPU"
+
+#: rog-control-center/ui/pages/system.slint:372
+msgctxt "ppt_pl3_fppt_help"
+msgid ""
+"Ultra-short duration power limit for instantaneous CPU bursts. Affects "
+"responsiveness during sudden workload spikes."
+msgstr ""
+"Надкороткий ліміт потужності для миттєвих сплесків CPU."
+"Впливає на чутливість під час раптових піків навантаження."
+
+#: rog-control-center/ui/pages/system.slint:387 rog-control-center/ui/pages/system.slint:388
+msgctxt "ppt_fppt"
+msgid "Fast Package Power Limit"
+msgstr "Швидкий ліміт потужності пакета"
+
+#: rog-control-center/ui/pages/system.slint:389
+msgctxt "ppt_fppt_help"
+msgid ""
+"Ultra-short duration power limit for system package. Controls maximum power "
+"during millisecond-scale load spikes."
+msgstr ""
+"Надкороткий ліміт потужності для системного пакета. Контролює максимальну"
+"потужність під час пікових навантажень мілісекундного масштабу."
+
+#: rog-control-center/ui/pages/system.slint:405 rog-control-center/ui/pages/system.slint:406
+msgctxt "ppt_apu_sppt"
+msgid "APU Sustained Power Limit"
+msgstr "Тривалий ліміт потужності APU"
+
+#: rog-control-center/ui/pages/system.slint:407
+msgctxt "ppt_apu_sppt_help"
+msgid ""
+"Long-term power limit for integrated graphics and CPU combined. Affects "
+"sustained performance of APU-based workloads."
+msgstr ""
+"Довготривалий ліміт потужності для інтегрованої графіки та CPU разом."
+"Впливає на тривалу продуктивність навантажень на базі APU."
+
+#: rog-control-center/ui/pages/system.slint:423 rog-control-center/ui/pages/system.slint:424
+msgctxt "ppt_platform_sppt"
+msgid "Platform Sustained Power Limit"
+msgstr "Тривалий ліміт потужності платформи"
+
+#: rog-control-center/ui/pages/system.slint:425
+msgctxt "ppt_platform_sppt_help"
+msgid ""
+"Overall system power limit for sustained operations. Controls total platform "
+"power consumption over extended periods."
+msgstr ""
+"Загальний ліміт потужності системи для тривалих операцій. Контролює загальне"
+"споживання енергії платформою протягом тривалих періодів."
+
+#: rog-control-center/ui/pages/system.slint:441 rog-control-center/ui/pages/system.slint:442
+msgctxt "nv_dynamic_boost"
+msgid "GPU Power Boost"
+msgstr "Прискорення потужності GPU"
+
+#: rog-control-center/ui/pages/system.slint:443
+msgctxt "nv_dynamic_boost_help"
+msgid ""
+"Additional power allocation for GPU dynamic boost. Higher values increase "
+"GPU performance but generate more heat."
+msgstr ""
+"Додаткове виділення потужності для динамічного прискорення GPU. Вищі значення"
+"збільшують продуктивність GPU, але генерують більше тепла."
+
+#: rog-control-center/ui/pages/system.slint:459 rog-control-center/ui/pages/system.slint:460
+msgctxt "nv_temp_target"
+msgid "GPU Temperature Limit"
+msgstr "Ліміт температури GPU"
+
+#: rog-control-center/ui/pages/system.slint:461
+msgctxt "nv_temp_target_help"
+msgid ""
+"Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain "
+"temperature below this limit."
+msgstr ""
+"Максимальний поріг температури GPU у градусах Цельсія. GPU буде знижувати"
+"частоту для підтримки температури нижче цього ліміту."
+
+#: rog-control-center/ui/pages/system.slint:513
+msgctxt "PageSystem"
+msgid "Energy Performance Preference linked to Throttle Policy"
+msgstr "Перевага енергоефективності пов'язана з Політикою Тротлінгу"
+
+#: rog-control-center/ui/pages/system.slint:517
+msgctxt "PageSystem"
+msgid "Change EPP based on Throttle Policy"
+msgstr "Змінювати EPP на основі Політики Тротлінгу"
+
+#: rog-control-center/ui/pages/system.slint:525
+msgctxt "PageSystem"
+msgid "EPP for Balanced Policy"
+msgstr "EPP для Збалансованої Політики"
+
+#: rog-control-center/ui/pages/system.slint:535
+msgctxt "PageSystem"
+msgid "EPP for Performance Policy"
+msgstr "EPP для Політики Продуктивності"
+
+#: rog-control-center/ui/pages/system.slint:545
+msgctxt "PageSystem"
+msgid "EPP for Quiet Policy"
+msgstr "EPP для Тихої Політики"
+
+#: rog-control-center/ui/pages/system.slint:563
+msgctxt "PageSystem"
+msgid "Throttle Policy for power state"
+msgstr "Політика Тротлінгу для стану живлення"
+
+#: rog-control-center/ui/pages/system.slint:569
+msgctxt "PageSystem"
+msgid "Throttle Policy on Battery"
+msgstr "Політика Тротлінгу при живленні від батареї"
+
+#: rog-control-center/ui/pages/system.slint:579 rog-control-center/ui/pages/system.slint:600
+msgctxt "PageSystem"
+msgid "Enabled"
+msgstr "Увімкнено"
+
+#: rog-control-center/ui/pages/system.slint:590
+msgctxt "PageSystem"
+msgid "Throttle Policy on AC"
+msgstr "Політика Тротлінгу при живленні від мережі"
+
+#: rog-control-center/ui/pages/aura.slint:28
+msgctxt "PageAura"
+msgid "Brightness"
+msgstr "Яскравість"
+
+#: rog-control-center/ui/pages/aura.slint:39
+msgctxt "PageAura"
+msgid "Aura mode"
+msgstr "Режим Aura"
+
+#: rog-control-center/ui/pages/aura.slint:59
+msgctxt "PageAura"
+msgid "Colour 1"
+msgstr "Колір 1"
+
+#: rog-control-center/ui/pages/aura.slint:85
+msgctxt "PageAura"
+msgid "Colour 2"
+msgstr "Колір 2"
+
+#: 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/app_settings.slint:26
+msgctxt "PageAppSettings"
+msgid "Run in background after closing"
+msgstr "Працювати у фоні після закриття"
+
+#: rog-control-center/ui/pages/app_settings.slint:34
+msgctxt "PageAppSettings"
+msgid "Start app in background (UI closed)"
+msgstr "Запускати у фоні (без інтерфейсу)"
+
+#: rog-control-center/ui/pages/app_settings.slint:42
+msgctxt "PageAppSettings"
+msgid "Enable system tray icon"
+msgstr "Увімкнути іконку в треї"
+
+#: rog-control-center/ui/pages/app_settings.slint:50
+msgctxt "PageAppSettings"
+msgid "Enable dGPU notifications"
+msgstr "Увімкнути сповіщення про dGPU"
+
+#: rog-control-center/ui/pages/fans.slint:26
+msgctxt "FanTab"
+msgid "This fan is not avilable on this machine"
+msgstr "Цей вентилятор недоступний на цьому пристрої"
+
+#: rog-control-center/ui/pages/fans.slint:34
+msgctxt "FanTab"
+msgid "Enabled"
+msgstr "Увімкнено"
+
+#: rog-control-center/ui/pages/fans.slint:43
+msgctxt "FanTab"
+msgid "Apply"
+msgstr "Застосувати"
+
+#: rog-control-center/ui/pages/fans.slint:51
+msgctxt "FanTab"
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: rog-control-center/ui/pages/fans.slint:59
+msgctxt "FanTab"
+msgid "Factory Default (all fans)"
+msgstr "Заводські налаштування (всі вентилятори)"
+
+#: rog-control-center/ui/pages/fans.slint:72
+msgctxt "PageFans"
+msgid "Balanced"
+msgstr "Збалансований"
+
+#: rog-control-center/ui/pages/fans.slint:75 rog-control-center/ui/pages/fans.slint:134 rog-control-center/ui/pages/fans.slint:193
+msgctxt "PageFans"
+msgid "CPU"
+msgstr "CPU"
+
+#: rog-control-center/ui/pages/fans.slint:93 rog-control-center/ui/pages/fans.slint:152 rog-control-center/ui/pages/fans.slint:211
+msgctxt "PageFans"
+msgid "Mid"
+msgstr "Середній"
+
+#: rog-control-center/ui/pages/fans.slint:111 rog-control-center/ui/pages/fans.slint:170 rog-control-center/ui/pages/fans.slint:229
+msgctxt "PageFans"
+msgid "GPU"
+msgstr "GPU"
+
+#: rog-control-center/ui/pages/fans.slint:131
+msgctxt "PageFans"
+msgid "Performance"
+msgstr "Продуктивний"
+
+#: rog-control-center/ui/pages/fans.slint:190
+msgctxt "PageFans"
+msgid "Quiet"
+msgstr "Тихий"
+
+#: rog-control-center/ui/widgets/common.slint:126
+msgctxt "confirm_reset"
+msgid "Are you sure you want to reset this?"
+msgstr "Ви впевнені, що хочете скинути це?"
+
+#: rog-control-center/ui/widgets/aura_power.slint:33
+msgctxt "AuraPowerGroup"
+msgid "Boot"
+msgstr "Запуск"
+
+#: rog-control-center/ui/widgets/aura_power.slint:43
+msgctxt "AuraPowerGroup"
+msgid "Awake"
+msgstr "Робота"
+
+#: rog-control-center/ui/widgets/aura_power.slint:53
+msgctxt "AuraPowerGroup"
+msgid "Sleep"
+msgstr "Сон"
+
+#: rog-control-center/ui/widgets/aura_power.slint:63
+msgctxt "AuraPowerGroup"
+msgid "Shutdown"
+msgstr "Вимкнення"
+
+#: rog-control-center/ui/widgets/aura_power.slint:102
+msgctxt "AuraPowerGroupOld"
+msgid "Zone Selection"
+msgstr "Вибір зони"
+
+#: rog-control-center/ui/widgets/aura_power.slint:114
+msgctxt "AuraPowerGroupOld"
+msgid "Boot"
+msgstr "Завантаження"
+
+#: 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:52
+msgctxt "Aura power zone"
+msgid "Logo"
+msgstr "Логотип"
+
+#: rog-control-center/ui/types/aura_types.slint:53 rog-control-center/ui/types/aura_types.slint:63
+msgctxt "Aura power zone"
+msgid "Keyboard"
+msgstr "Клавіатура"
+
+#: rog-control-center/ui/types/aura_types.slint:54 rog-control-center/ui/types/aura_types.slint:64
+msgctxt "Aura power zone"
+msgid "Lightbar"
+msgstr "Світлова панель"
+
+#: rog-control-center/ui/types/aura_types.slint:55
+msgctxt "Aura power zone"
+msgid "Lid"
+msgstr "Кришка"
+
+#: rog-control-center/ui/types/aura_types.slint:56
+msgctxt "Aura power zone"
+msgid "Rear Glow"
+msgstr "Заднє світіння"
+
+#: rog-control-center/ui/types/aura_types.slint:57 rog-control-center/ui/types/aura_types.slint:65
+msgctxt "Aura power zone"
+msgid "Keyboard and Lightbar"
+msgstr "Клавіатура та світлова панель"
+
+#: rog-control-center/ui/types/aura_types.slint:58
+msgctxt "Aura power zone"
+msgid "Ally"
+msgstr "Ally"
+
+#: rog-control-center/ui/types/aura_types.slint:68
+msgctxt "Aura brightness"
+msgid "Off"
+msgstr "Вимкнено"
+
+#: rog-control-center/ui/types/aura_types.slint:69
+msgctxt "Aura brightness"
+msgid "Low"
+msgstr "Низька"
+
+#: rog-control-center/ui/types/aura_types.slint:70
+msgctxt "Aura brightness"
+msgid "Med"
+msgstr "Середня"
+
+#: rog-control-center/ui/types/aura_types.slint:71
+msgctxt "Aura brightness"
+msgid "High"
+msgstr "Висока"
+
+#: rog-control-center/ui/types/aura_types.slint:76 rog-control-center/ui/types/aura_types.slint:91
+msgctxt "Basic aura mode"
+msgid "Static"
+msgstr "Статичний"
+
+#: rog-control-center/ui/types/aura_types.slint:77 rog-control-center/ui/types/aura_types.slint:92
+msgctxt "Basic aura mode"
+msgid "Breathe"
+msgstr "Дихання"
+
+#: rog-control-center/ui/types/aura_types.slint:78 rog-control-center/ui/types/aura_types.slint:93
+msgctxt "Basic aura mode"
+msgid "Strobe"
+msgstr "Стробоскоп"
+
+#: rog-control-center/ui/types/aura_types.slint:79
+msgctxt "Basic aura mode"
+msgid "Rainbow"
+msgstr "Веселка"
+
+#: rog-control-center/ui/types/aura_types.slint:80
+msgctxt "Basic aura mode"
+msgid "Star"
+msgstr "Зірка"
+
+#: rog-control-center/ui/types/aura_types.slint:81
+msgctxt "Basic aura mode"
+msgid "Rain"
+msgstr "Дощ"
+
+#: rog-control-center/ui/types/aura_types.slint:82
+msgctxt "Basic aura mode"
+msgid "Highlight"
+msgstr "Підсвічування"
+
+#: rog-control-center/ui/types/aura_types.slint:83
+msgctxt "Basic aura mode"
+msgid "Laser"
+msgstr "Лазер"
+
+#: rog-control-center/ui/types/aura_types.slint:84
+msgctxt "Basic aura mode"
+msgid "Ripple"
+msgstr "Хвиля"
+
+#: rog-control-center/ui/types/aura_types.slint:85
+msgctxt "Basic aura mode"
+msgid "Nothing"
+msgstr "Нічого"
+
+#: rog-control-center/ui/types/aura_types.slint:86
+msgctxt "Basic aura mode"
+msgid "Pulse"
+msgstr "Пульс"
+
+#: rog-control-center/ui/types/aura_types.slint:87
+msgctxt "Basic aura mode"
+msgid "Comet"
+msgstr "Комета"
+
+#: rog-control-center/ui/types/aura_types.slint:88
+msgctxt "Basic aura mode"
+msgid "Flash"
+msgstr "Спалах"
+
+#: rog-control-center/ui/types/aura_types.slint:100
+msgctxt "Aura zone"
+msgid "None"
+msgstr "Немає"
+
+#: rog-control-center/ui/types/aura_types.slint:101
+msgctxt "Aura zone"
+msgid "Key1"
+msgstr "Клавіша 1"
+
+#: rog-control-center/ui/types/aura_types.slint:102
+msgctxt "Aura zone"
+msgid "Key2"
+msgstr "Клавіша 2"
+
+#: rog-control-center/ui/types/aura_types.slint:103
+msgctxt "Aura zone"
+msgid "Key3"
+msgstr "Клавіша 3"
+
+#: rog-control-center/ui/types/aura_types.slint:104
+msgctxt "Aura zone"
+msgid "Key4"
+msgstr "Клавіша 4"
+
+#: rog-control-center/ui/types/aura_types.slint:105
+msgctxt "Aura zone"
+msgid "Logo"
+msgstr "Логотип"
+
+#: rog-control-center/ui/types/aura_types.slint:106
+msgctxt "Aura zone"
+msgid "Lightbar Left"
+msgstr "Світлова панель зліва"
+
+#: rog-control-center/ui/types/aura_types.slint:107
+msgctxt "Aura zone"
+msgid "Lightbar Right"
+msgstr "Світлова панель справа"
+
+#: rog-control-center/ui/types/aura_types.slint:111
+msgctxt "Aura direction"
+msgid "Right"
+msgstr "Вправо"
+
+#: rog-control-center/ui/types/aura_types.slint:112
+msgctxt "Aura direction"
+msgid "Left"
+msgstr "Вліво"
+
+#: rog-control-center/ui/types/aura_types.slint:113
+msgctxt "Aura direction"
+msgid "Up"
+msgstr "Вгору"
+
+#: rog-control-center/ui/types/aura_types.slint:114
+msgctxt "Aura direction"
+msgid "Down"
+msgstr "Вниз"
+
+#: rog-control-center/ui/types/aura_types.slint:118
+msgctxt "Aura speed"
+msgid "Low"
+msgstr "Низька"
+
+#: rog-control-center/ui/types/aura_types.slint:119
+msgctxt "Aura speed"
+msgid "Medium"
+msgstr "Середня"
+
+#: rog-control-center/ui/types/aura_types.slint:120
+msgctxt "Aura speed"
+msgid "High"
+msgstr "Висока"
+

rog-control-center/ui/main_window.slint

@@ -1,6 +1,6 @@
 import { Palette, Button, VerticalBox } from "std-widgets.slint";
 import { AppSize } from "globals.slint";
-import { PageSystem, AvailableSystemProperties, SystemPageData } from "pages/system.slint";
+import { PageSystem, SystemPageData, AttrMinMax } from "pages/system.slint";
 import { SideBar } from "widgets/sidebar.slint";
 import { PageAbout } from "pages/about.slint";
 import { PageFans } from "pages/fans.slint";
@@ -15,14 +15,18 @@ import { AuraPageData, AuraDevType, LaptopAuraPower, AuraPowerState, PowerZones,
 export { AuraPageData, AuraDevType, LaptopAuraPower, AuraPowerState, PowerZones, AuraEffect }
 import { PageAppSettings, AppSettingsPageData } from "pages/app_settings.slint";
 
-export { AppSize, AvailableSystemProperties, SystemPageData, AnimePageData, AppSettingsPageData }
+export { AppSize, AttrMinMax, SystemPageData, AnimePageData, AppSettingsPageData }
 
 export component MainWindow inherits Window {
     title: "ROG Control";
-    default-font-family: "DejaVu Sans";
+    always-on-top: true;
+    default-font-family: "Noto Sans";
+    default-font-size: 14px;
+    default-font-weight: 400;
+    icon: @image-url("../data/rog-control-center.png");
     in property <[bool]> sidebar_items_avilable: [true, true, true, true, true, true];
-    private property <bool> show-notif;
-    private property <bool> fade-cover;
+    private property <bool> show_notif;
+    private property <bool> fade_cover;
     private property <bool> toast: false;
     private property <string> toast_text: "I show when something is waiting";
     callback show_toast(string);
@@ -31,10 +35,10 @@ export component MainWindow inherits Window {
         toast_text = text;
     }
     callback exit-app();
-    callback show-notification(bool);
-    show-notification(yes) => {
-        show-notif = yes;
-        fade-cover = yes;
+    callback show_notification(bool);
+    show_notification(yes) => {
+        show_notif = yes;
+        fade_cover = yes;
     }
     callback external_colour_change();
     external_colour_change() => {
@@ -106,10 +110,37 @@ export component MainWindow inherits Window {
             if(side-bar.current-item == 5): PageAbout {
                 width: root.width - side-bar.width;
             }
+
+            if toast: Rectangle {
+                x: 0px;
+                y: root.height - self.height;
+                width: root.width - side-bar.width;
+                height: 40px;
+                opacity: 1.0;
+                background: Palette.selection-background;
+                clip: true;
+                TouchArea {
+                    height: 100%;
+                    width: 100%;
+                    clicked => {
+                        toast = false;
+                    }
+                }
+
+                Rectangle {
+                    height: 100%;
+                    width: 100%;
+                    background: Palette.control-background;
+                    Text {
+                        color: Palette.control-foreground;
+                        text: root.toast_text;
+                    }
+                }
+            }
         }
     }
 
-    if fade-cover: Rectangle {
+    if fade_cover: Rectangle {
         x: 0px;
         y: 0px;
         width: root.width;
@@ -121,41 +152,17 @@ export component MainWindow inherits Window {
             width: 100%;
             clicked => {
                 // toolbar-dropdown.close();
-                if (show-notif) {
-                    show-notif = false;
+                if (show_notif) {
+                    show_notif = false;
                 }
-                fade-cover = false;
+                fade_cover = false;
             }
         }
     }
 
-    if toast: Rectangle {
-        x: 0px;
-        y: 0px;
-        width: root.width;
-        height: 32px;
-        opacity: 0.8;
-        TouchArea {
-            height: 100%;
-            width: 100%;
-            clicked => {
-                toast = false;
-            }
-        }
-
-        Rectangle {
-            height: 100%;
-            width: 100%;
-            background: Palette.control-background;
-            Text {
-                color: Palette.control-foreground;
-                text: root.toast_text;
-            }
-        }
-    }
 
     // // TODO: or use Dialogue
-    if show-notif: Rectangle {
+    if show_notif: Rectangle {
         x: root.width / 8;
         y: root.height / 8;
         height: (root.height / 8) * 6;
@@ -164,7 +171,7 @@ export component MainWindow inherits Window {
             height: 100%;
             width: 100%;
             clicked => {
-                show-notif = false;
+                show_notif = false;
                 exit-app();
             }
         }
@@ -185,7 +192,9 @@ export component MainWindow inherits Window {
         y: 0px;
         width: root.width;
         height: root.height;
-        padding: 10px;
+
+        //padding only has effect on layout elements
+        //padding: 10px;
 
         background: Palette.background;
         border-color: Palette.border;

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

@@ -17,7 +17,7 @@ export component PageAbout inherits VerticalLayout {
 
             Text {
                 wrap: TextWrap.word-wrap;
-                text: "You will require these patches: https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/, they have been merged upstream for kernel 6.10. The main thing is that the PPT settings will apply without them, but the read/back will fail";
+                text: "You need to use kernel version 6.19 to use this software";
             }
 
             Text {
@@ -28,19 +28,7 @@ export component PageAbout inherits VerticalLayout {
             }
 
             Text {
-                text: "- [x] Theme the widgets";
-            }
-
-            Text {
-                text: "- [x] Add a fullscreen mode (cli arg)";
-            }
-
-            Text {
-                text: "- [x] Disable aura items depending if mode supports or not";
-            }
-
-            Text {
-                text: "- [x] Add fan curve graph controls";
+                text: "- [ ] Theme the widgets";
             }
 
             Text {
@@ -48,11 +36,11 @@ export component PageAbout inherits VerticalLayout {
             }
 
             Text {
-                text: "- [ ] Supergfx control";
+                text: "- [ ] Include fan speeds, temps in a bottom bar";
             }
 
             Text {
-                text: "- [ ] Include fan speeds, temps in a bottom bar";
+                text: "- [ ] Slash control";
             }
 
             Text {

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

@@ -9,17 +9,17 @@ export global AnimePageData {
         @tr("Anime Brightness" => "High"),
     ];
     in-out property <int> brightness;
-    callback set_brightness(int);
+    callback cb_brightness(int);
     in-out property <bool> builtins_enabled;
-    callback set_builtins_enabled(bool);
+    callback cb_builtins_enabled(bool);
     in-out property <bool> enable_display;
-    callback set_enable_display(bool);
+    callback cb_enable_display(bool);
     in-out property <bool> off_when_lid_closed;
-    callback set_off_when_lid_closed(bool);
+    callback cb_off_when_lid_closed(bool);
     in-out property <bool> off_when_suspended;
-    callback set_off_when_suspended(bool);
+    callback cb_off_when_suspended(bool);
     in-out property <bool> off_when_unplugged;
-    callback set_off_when_unplugged(bool);
+    callback cb_off_when_unplugged(bool);
     in-out property <[string]> boot_anim_choices: [@tr("Glitch Construction"), @tr("Static Emergence")];
     in property <int> boot_anim: 0;
     in-out property <[string]> awake_anim_choices: [@tr("Binary Banner Scroll"), @tr("Rog Logo Glitch")];
@@ -28,7 +28,7 @@ export global AnimePageData {
     in property <int> sleep_anim: 0;
     in-out property <[string]> shutdown_anim_choices: [@tr("Glitch Out"), @tr("See Ya")];
     in property <int> shutdown_anim: 0;
-    callback set_builtin_animations(int, int, int, int);
+    callback cb_builtin_animations(int, int, int, int);
 }
 
 export component PageAnime inherits Rectangle {
@@ -37,7 +37,8 @@ export component PageAnime inherits Rectangle {
     property <bool> show_builtin_advanced: false;
     clip: true;
     // TODO: slow with border-radius
-        padding: 8px;
+    //padding only has effect on layout elements
+    //padding: 8px;
     // height: parent.height - infobar.height - mainview.padding - self.padding * 2;
         // TODO: border-radius: 8px;
         VerticalLayout {
@@ -53,7 +54,7 @@ export component PageAnime inherits Rectangle {
                 model <=> AnimePageData.brightness_names;
                 selected => {
                     self.current_value = AnimePageData.brightness_names[AnimePageData.brightness];
-                    AnimePageData.set_brightness(AnimePageData.brightness)
+                    AnimePageData.cb_brightness(AnimePageData.brightness)
                 }
             }
         }
@@ -66,7 +67,7 @@ export component PageAnime inherits Rectangle {
                 text: @tr("Enable display");
                 checked <=> AnimePageData.enable_display;
                 toggled => {
-                    AnimePageData.set_enable_display(AnimePageData.enable_display)
+                    AnimePageData.cb_enable_display(AnimePageData.enable_display)
                 }
             }
 
@@ -89,7 +90,7 @@ export component PageAnime inherits Rectangle {
                 text: @tr("Use built-in animations");
                 checked <=> AnimePageData.builtins_enabled;
                 toggled => {
-                    AnimePageData.set_builtins_enabled(AnimePageData.builtins_enabled)
+                    AnimePageData.cb_builtins_enabled(AnimePageData.builtins_enabled)
                 }
             }
 
@@ -152,7 +153,7 @@ export component PageAnime inherits Rectangle {
                         current_value: AnimePageData.boot_anim_choices[AnimePageData.boot_anim];
                         model <=> AnimePageData.boot_anim_choices;
                         selected => {
-                            AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
+                            AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
                         }
                     }
 
@@ -162,7 +163,7 @@ export component PageAnime inherits Rectangle {
                         current_value: AnimePageData.awake_anim_choices[AnimePageData.awake_anim];
                         model <=> AnimePageData.awake_anim_choices;
                         selected => {
-                            AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
+                            AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
                         }
                     }
 
@@ -172,7 +173,7 @@ export component PageAnime inherits Rectangle {
                         current_value: AnimePageData.sleep_anim_choices[AnimePageData.sleep_anim];
                         model <=> AnimePageData.sleep_anim_choices;
                         selected => {
-                            AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
+                            AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
                         }
                     }
 
@@ -182,7 +183,7 @@ export component PageAnime inherits Rectangle {
                         current_value: AnimePageData.shutdown_anim_choices[AnimePageData.shutdown_anim];
                         model <=> AnimePageData.shutdown_anim_choices;
                         selected => {
-                            AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
+                            AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
                         }
                     }
                 }
@@ -225,7 +226,7 @@ export component PageAnime inherits Rectangle {
                         text: @tr("Off when lid closed");
                         checked <=> AnimePageData.off_when_lid_closed;
                         toggled => {
-                            AnimePageData.set_off_when_lid_closed(AnimePageData.off_when_lid_closed)
+                            AnimePageData.cb_off_when_lid_closed(AnimePageData.off_when_lid_closed)
                         }
                     }
 
@@ -234,7 +235,7 @@ export component PageAnime inherits Rectangle {
                         text: @tr("Off when suspended");
                         checked <=> AnimePageData.off_when_suspended;
                         toggled => {
-                            AnimePageData.set_off_when_suspended(AnimePageData.off_when_suspended)
+                            AnimePageData.cb_off_when_suspended(AnimePageData.off_when_suspended)
                         }
                     }
 
@@ -243,7 +244,7 @@ export component PageAnime inherits Rectangle {
                         text: @tr("Off when on battery");
                         checked <=> AnimePageData.off_when_unplugged;
                         toggled => {
-                            AnimePageData.set_off_when_unplugged(AnimePageData.off_when_unplugged)
+                            AnimePageData.cb_off_when_unplugged(AnimePageData.off_when_unplugged)
                         }
                     }
                 }

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

@@ -16,7 +16,9 @@ export component PageAppSettings inherits VerticalLayout {
     Rectangle {
         clip: true;
         // TODO: slow with border-radius
-        padding: 8px;
+        //padding only has effect on layout elements
+        //padding: 8px;
+
         // height: parent.height - infobar.height - mainview.padding - self.padding * 2;
         // TODO: border-radius: 8px;
         mainview := VerticalLayout {

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

@@ -30,7 +30,7 @@ export component PageAura inherits Rectangle {
                     current_value: AuraPageData.brightness_names[self.current-index];
                     model <=> AuraPageData.brightness_names;
                     selected => {
-                        AuraPageData.set_brightness(AuraPageData.brightness)
+                        AuraPageData.cb_brightness(AuraPageData.brightness)
                     }
                 }
 
@@ -44,7 +44,7 @@ export component PageAura inherits Rectangle {
                         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);
+                        AuraPageData.cb_led_mode(AuraPageData.current_available_mode);
                     }
                 }
             }
@@ -67,14 +67,14 @@ export component PageAura inherits Rectangle {
                                 final_colour <=> AuraPageData.color1;
                                 colourbox <=> AuraPageData.colorbox1;
                                 set_hex_from_colour(c1) => {
-                                    return AuraPageData.set_hex_from_colour(c1);
+                                    return AuraPageData.cb_hex_from_colour(c1);
                                 }
                                 hex_to_colour(s) => {
-                                    return AuraPageData.set_hex_to_colour(s);
+                                    return AuraPageData.cb_hex_to_colour(s);
                                 }
                                 released => {
                                     AuraPageData.led_mode_data.colour1 = AuraPageData.color1;
-                                    AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                                    AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
                                 }
                             }
                         }
@@ -93,14 +93,14 @@ export component PageAura inherits Rectangle {
                                 final_colour <=> AuraPageData.color2;
                                 colourbox <=> AuraPageData.colorbox2;
                                 set_hex_from_colour(c1) => {
-                                    return AuraPageData.set_hex_from_colour(c1);
+                                    return AuraPageData.cb_hex_from_colour(c1);
                                 }
                                 hex_to_colour(s) => {
-                                    return AuraPageData.set_hex_to_colour(s);
+                                    return AuraPageData.cb_hex_to_colour(s);
                                 }
                                 released => {
                                     AuraPageData.led_mode_data.colour2 = AuraPageData.color2;
-                                    AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                                    AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
                                 }
                             }
                         }
@@ -113,7 +113,8 @@ export component PageAura inherits Rectangle {
                 min-height: 80px;
                 max-height: 90px;
                 RogItem {
-                    padding: 0px;
+                    //padding only has effect on layout elements
+                    //padding: 0px;
                     VerticalBox {
                         Text {
                             text: @tr("Zone");
@@ -129,14 +130,15 @@ export component PageAura inherits Rectangle {
                             model <=> AuraPageData.zone_names;
                             selected => {
                                 AuraPageData.led_mode_data.zone = self.current-index;
-                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                                AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
                             }
                         }
                     }
                 }
 
                 RogItem {
-                    padding: 0px;
+                    //padding only has effect on layout elements
+                    //padding: 0px;
                     VerticalBox {
                         Text {
                             text: @tr("Direction");
@@ -151,14 +153,15 @@ export component PageAura inherits Rectangle {
                             model <=> AuraPageData.direction_names;
                             selected => {
                                 AuraPageData.led_mode_data.direction = self.current-index;
-                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                                AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
                             }
                         }
                     }
                 }
 
                 RogItem {
-                    padding: 0px;
+                    //padding only has effect on layout elements
+                    //padding: 0px;
                     VerticalBox {
                         Text {
                             text: @tr("Speed");
@@ -173,7 +176,7 @@ export component PageAura inherits Rectangle {
                             model <=> AuraPageData.speed_names;
                             selected => {
                                 AuraPageData.led_mode_data.speed = self.current-index;
-                                AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
+                                AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
                             }
                         }
                     }
@@ -218,22 +221,22 @@ export component PageAura inherits Rectangle {
                     boot_checked: state.boot;
                     boot_toggled => {
                         AuraPageData.led_power.states[idx].boot = zone.boot_checked;
-                        AuraPageData.set_led_power(AuraPageData.led_power);
+                        AuraPageData.cb_led_power(AuraPageData.led_power);
                     }
                     awake_checked: state.awake;
                     awake_toggled => {
                         AuraPageData.led_power.states[idx].awake = zone.awake_checked;
-                        AuraPageData.set_led_power(AuraPageData.led_power);
+                        AuraPageData.cb_led_power(AuraPageData.led_power);
                     }
                     sleep_checked: state.sleep;
                     sleep_toggled => {
                         AuraPageData.led_power.states[idx].sleep = zone.sleep_checked;
-                        AuraPageData.set_led_power(AuraPageData.led_power);
+                        AuraPageData.cb_led_power(AuraPageData.led_power);
                     }
                     shutdown_checked: state.shutdown;
                     shutdown_toggled => {
                         AuraPageData.led_power.states[idx].shutdown = zone.shutdown_checked;
-                        AuraPageData.set_led_power(AuraPageData.led_power);
+                        AuraPageData.cb_led_power(AuraPageData.led_power);
                     }
                 }
             }
@@ -271,22 +274,22 @@ export component PageAura inherits Rectangle {
                     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);
+                        AuraPageData.cb_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);
+                        AuraPageData.cb_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);
+                        AuraPageData.cb_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);
+                        AuraPageData.cb_led_power(AuraPageData.led_power);
                     }
                 }
             }

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

@@ -1,30 +1,27 @@
-import { SystemSlider, SystemDropdown, SystemToggle } from "../widgets/common.slint";
-import { Palette, HorizontalBox , VerticalBox, ScrollView, Slider, Button, Switch, ComboBox, GroupBox} from "std-widgets.slint";
+import { SystemSlider, SystemDropdown, SystemToggle, SystemToggleInt, RogItem } from "../widgets/common.slint";
+import { Palette, HorizontalBox , VerticalBox, ScrollView, Slider, Button, Switch, ComboBox, GroupBox, StandardButton} from "std-widgets.slint";
 
-export struct AvailableSystemProperties {
-    charge_control_end_threshold: bool,
-    panel_od: bool,
-    boot_sound: bool,
-    mini_led_mode: bool,
-    disable_nvidia_powerd_on_battery: bool,
-    ac_command: bool,
-    bat_command: bool,
-    throttle_thermal_policy: bool,
-    ppt_pl1_spl: bool,
-    ppt_pl2_sppt: bool,
-    ppt_fppt: bool,
-    ppt_apu_sppt: bool,
-    ppt_platform_sppt: bool,
-    nv_dynamic_boost: bool,
-    nv_temp_target: bool,
+export struct AttrMinMax {
+  min: int,
+  max: int,
+  current: float,
+}
+
+export struct AttrPossible {
+  range: [int],
+  current: int,
 }
 
 export global SystemPageData {
+    in-out property <bool> charge_control_enabled: true;
     in-out property <float> charge_control_end_threshold: 30;
-    callback set_charge_control_end_threshold(/* charge limit */ int);
-    in-out property <int> throttle_thermal_policy: 0;
-    in-out property <[string]> throttle_policy_choices: [@tr("Balanced"), @tr("Performance"), @tr("Quiet")];
-    callback set_throttle_thermal_policy(int);
+    callback cb_charge_control_end_threshold(/* charge limit */ int);
+    in-out property <int> platform_profile: 0;
+    in-out property <[string]> platform_profile_choices: [@tr("Balanced"), @tr("Performance"), @tr("Quiet"), @tr("LowPower")];
+    // The dropdown list index is used to index in to this and find the correct
+    // value for platform profile
+    in-out property <[int]> platform_profile_indexes: [0, 1, 2, 3];
+    callback cb_platform_profile(int);
     in-out property <[string]> energy_performance_choices: [
         @tr("Default"),
         @tr("Performance"),
@@ -32,71 +29,136 @@ export global SystemPageData {
         @tr("BalancePower"),
         @tr("Power")
     ];
-    in-out property <int> throttle_balanced_epp: 0;
-    callback set_throttle_balanced_epp(int);
-    in-out property <int> throttle_performance_epp: 0;
-    callback set_throttle_performance_epp(int);
-    in-out property <int> throttle_quiet_epp: 0;
-    callback set_throttle_quiet_epp(int);
+    in-out property <int> profile_balanced_epp: 0;
+    callback cb_profile_balanced_epp(int);
+    in-out property <int> profile_performance_epp: 0;
+    callback cb_profile_performance_epp(int);
+    in-out property <int> profile_quiet_epp: 0;
+    callback cb_profile_quiet_epp(int);
     // if the EPP should change with throttle
-    in-out property <bool> throttle_policy_linked_epp: true;
-    callback 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;
-    callback set_boot_sound(bool);
-    in-out property <bool> mini_led_mode;
-    callback set_mini_led_mode(bool);
-    in-out property <float> ppt_pl1_spl: 5;
-    callback set_ppt_pl1_spl(int);
-    in-out property <float> ppt_pl2_sppt: 5;
-    callback set_ppt_pl2_sppt(int);
-    in-out property <float> ppt_fppt: 5;
-    callback set_ppt_fppt(int);
-    in-out property <float> ppt_apu_sppt: 5;
-    callback set_ppt_apu_sppt(int);
-    in-out property <float> ppt_platform_sppt: 5;
-    callback set_ppt_platform_sppt(int);
-    in-out property <float> nv_dynamic_boost: 5;
-    callback set_nv_dynamic_boost(int);
-    in-out property <float> nv_temp_target: 75;
-    callback set_nv_temp_target(int);
-    in-out property <AvailableSystemProperties> available: {
-        charge_control_end_threshold: true,
-        panel_od: true,
-        boot_sound: true,
-        mini_led_mode: true,
-        disable_nvidia_powerd_on_battery: true,
-        ac_command: true,
-        bat_command: true,
-        throttle_thermal_policy: true,
-        ppt_pl1_spl: true,
-        ppt_pl2_sppt: true,
-        ppt_fppt: true,
-        ppt_apu_sppt: true,
-        ppt_platform_sppt: true,
-        nv_dynamic_boost: true,
-        nv_temp_target: true,
+    in-out property <bool> platform_profile_linked_epp: true;
+    callback cb_platform_profile_linked_epp(bool);
+    in-out property <int> platform_profile_on_ac: 0;
+    callback cb_platform_profile_on_ac(int);
+    in-out property <bool> change_platform_profile_on_ac: true;
+    callback cb_change_platform_profile_on_ac(bool);
+    in-out property <int> platform_profile_on_battery: 0;
+    callback cb_platform_profile_on_battery(int);
+    in-out property <bool> change_platform_profile_on_battery: true;
+    callback cb_change_platform_profile_on_battery(bool);
+    //
+    in-out property <int> panel_overdrive;
+    callback cb_panel_overdrive(int);
+    in-out property <int> boot_sound;
+    callback cb_boot_sound(int);
+    in-out property <int> kbd_leds_awake;
+    callback cb_kbd_leds_awake(int);
+    in-out property <int> kbd_leds_sleep;
+    callback cb_kbd_leds_sleep(int);
+    in-out property <int> kbd_leds_boot;
+    callback cb_kbd_leds_boot(int);
+    in-out property <int> kbd_leds_shutdown;
+    callback cb_kbd_leds_shutdown(int);
+    in-out property <int> screen_auto_brightness;
+    callback cb_screen_auto_brightness(int);
+    in-out property <int> mcu_powersave;
+    callback cb_mcu_powersave(int);
+    in-out property <int> mini_led_mode;
+    callback cb_mini_led_mode(int);
+
+    in-out property <float> screenpad_gamma;
+    callback cb_screenpad_gamma(float);
+    // percentage
+    in-out property <int> screenpad_brightness: 50;
+    callback cb_screenpad_brightness(int);
+    in-out property <bool> screenpad_sync_with_primary: false;
+    callback cb_screenpad_sync_with_primary(bool);
+
+    in-out property <bool> asus_armoury_loaded: false;
+
+    in-out property <AttrMinMax> ppt_pl1_spl: {
+        min: 0,
+        max: 100,
+        current: 20,
     };
+    callback cb_ppt_pl1_spl(int);
+    callback cb_default_ppt_pl1_spl();
+
+    in-out property <AttrMinMax> ppt_pl2_sppt: {
+        min: 0,
+        max: 100,
+        current: 20,
+    };
+    callback cb_ppt_pl2_sppt(int);
+    callback cb_default_ppt_pl2_sppt();
+
+    in-out property <AttrMinMax> ppt_pl3_fppt: {
+        min: 0,
+        max: 100,
+        current: 20,
+    };
+    callback cb_ppt_pl3_fppt(int);
+    callback cb_default_ppt_pl3_fppt();
+
+    in-out property <AttrMinMax> ppt_fppt: {
+        min: 0,
+        max: 100,
+        current: 20,
+    };
+    callback cb_ppt_fppt(int);
+    callback cb_default_ppt_fppt();
+
+    in-out property <AttrMinMax> ppt_apu_sppt: {
+        min: 0,
+        max: 100,
+        current: 20,
+    };
+    callback cb_ppt_apu_sppt(int);
+    callback cb_default_ppt_apu_sppt();
+
+    in-out property <AttrMinMax> ppt_platform_sppt: {
+        min: 0,
+        max: 100,
+        current: 20,
+    };
+    callback cb_ppt_platform_sppt(int);
+    callback cb_default_ppt_platform_sppt();
+
+    in-out property <AttrMinMax> nv_dynamic_boost: {
+        min: 0,
+        max: 30,
+        current: 5,
+    };
+    callback cb_nv_dynamic_boost(int);
+    callback cb_default_nv_dynamic_boost();
+
+    in-out property <AttrMinMax> nv_temp_target: {
+        min: 0,
+        max: 80,
+        current: 75,
+    };
+    callback cb_nv_temp_target(int);
+    callback cb_default_nv_temp_target();
+
+    in-out property <bool> enable_ppt_group: false;
+    callback cb_enable_ppt_group(bool);
+
+    in-out property <bool> ppt_enabled_available;
+    in-out property <bool> ppt_enabled;
+    callback cb_ppt_enabled(bool);
 }
 
 export component PageSystem inherits Rectangle {
     property <bool> show_fade_cover: false;
     property <bool> show_throttle_advanced: false;
     clip: true;
-    padding: 8px;
+    //padding only has effect on layout elements
+    //padding: 8px;
     ScrollView {
         VerticalLayout {
             padding: 10px;
             spacing: 10px;
+            alignment: LayoutAlignment.start;
             Rectangle {
                 background: Palette.alternate-background;
                 border-color: Palette.accent-background;
@@ -107,29 +169,32 @@ export component PageSystem inherits Rectangle {
                     font-size: 18px;
                     color: Palette.control-foreground;
                     horizontal-alignment: TextHorizontalAlignment.center;
-                    text: @tr("Base system settings");
+                    text: @tr("Power settings");
                 }
             }
 
-            if SystemPageData.available.charge-control-end-threshold: SystemSlider {
+            if SystemPageData.charge_control_end_threshold != -1: SystemSlider {
                 text: @tr("Charge limit");
                 minimum: 20;
                 maximum: 100;
-                value <=> SystemPageData.charge_control_end_threshold;
+                has_reset: false;
+                enabled <=> SystemPageData.charge_control_enabled;
+                value: SystemPageData.charge_control_end_threshold;
                 released => {
-                    SystemPageData.set_charge_control_end_threshold(Math.round(SystemPageData.charge_control_end_threshold))
+                    SystemPageData.charge_control_end_threshold = self.value;
+                    SystemPageData.cb_charge_control_end_threshold(Math.round(SystemPageData.charge_control_end_threshold))
                 }
             }
 
-            if SystemPageData.available.throttle-thermal-policy: HorizontalLayout {
+            if SystemPageData.platform_profile != -1: HorizontalLayout {
                 spacing: 10px;
                 SystemDropdown {
-                    text: @tr("Throttle Policy");
-                    current_index <=> SystemPageData.throttle_thermal_policy;
-                    current_value: SystemPageData.throttle_policy_choices[SystemPageData.throttle_thermal_policy];
-                    model <=> SystemPageData.throttle_policy_choices;
+                    text: @tr("Platform Profile");
+                    current_index <=> SystemPageData.platform_profile;
+                    current_value: SystemPageData.platform_profile_choices[SystemPageData.platform_profile];
+                    model <=> SystemPageData.platform_profile_choices;
                     selected => {
-                        SystemPageData.set_throttle_thermal_policy(SystemPageData.throttle_thermal_policy)
+                        SystemPageData.cb_platform_profile(SystemPageData.platform_profile_indexes[SystemPageData.platform_profile])
                     }
                 }
 
@@ -142,30 +207,48 @@ export component PageSystem inherits Rectangle {
                 }
             }
 
-            HorizontalBox {
-                padding: 0px;
-                spacing: 10px;
-                if SystemPageData.available.panel-od: SystemToggle {
-                    text: @tr("Panel Overdrive");
-                    checked <=> SystemPageData.panel_od;
-                    toggled => {
-                        SystemPageData.set_panel_od(SystemPageData.panel_od)
+            if SystemPageData.screenpad_brightness != -1: RogItem {
+                HorizontalLayout {
+                    padding-left: 10px;
+                    padding-right: 20px;
+                    HorizontalLayout {
+                        width: 38%;
+                        alignment: LayoutAlignment.space-between;
+                        padding-right: 15px;
+                        Text {
+                            font-size: 16px;
+                            vertical-alignment: TextVerticalAlignment.center;
+                            color: Palette.control-foreground;
+                            text: @tr("Screenpad brightness");
+                        }
                     }
-                }
 
-                if SystemPageData.available.mini-led-mode: SystemToggle {
-                    text: @tr("MiniLED Mode");
-                    checked <=> SystemPageData.mini_led_mode;
-                    toggled => {
-                        SystemPageData.set_mini_led_mode(SystemPageData.mini_led_mode)
+                    HorizontalLayout {
+                        width: 38%;
+                        alignment: LayoutAlignment.stretch;
+                        screen_bright := Slider {
+                            enabled: true;
+                            minimum: 0;
+                            maximum: 100;
+                            value: SystemPageData.screenpad_brightness;
+                            released(value) => {
+                                // SystemPageData.screenpad_brightness = self.value;
+                                SystemPageData.cb_screenpad_brightness(Math.floor(self.value));
+                            }
+                        }
                     }
-                }
 
-                if SystemPageData.available.boot-sound: SystemToggle {
-                    text: @tr("POST boot sound");
-                    checked <=> SystemPageData.boot_sound;
-                    toggled => {
-                        SystemPageData.set_boot_sound(SystemPageData.boot_sound)
+                    HorizontalLayout {
+                    width: 20%;
+                    padding-left: 10px;
+                        alignment: LayoutAlignment.stretch;
+                        Switch {
+                            text: @tr("Sync with primary");
+                            checked <=> SystemPageData.screenpad_sync_with_primary;
+                            toggled => {
+                                SystemPageData.cb_screenpad_sync_with_primary(self.checked);
+                            }
+                        }
                     }
                 }
             }
@@ -180,77 +263,280 @@ export component PageSystem inherits Rectangle {
                     font-size: 18px;
                     color: Palette.control-foreground;
                     horizontal-alignment: TextHorizontalAlignment.center;
-                    text: @tr("System performance settings");
+                    text: @tr("Armoury settings");
                 }
             }
 
-            if SystemPageData.available.ppt-pl1-spl: SystemSlider {
-                text: @tr("ppt_pl1_spl" => "PL1, sustained power limit");
-                minimum: 5;
-                maximum: 250;
-                value <=> SystemPageData.ppt_pl1_spl;
-                released => {
-                    SystemPageData.set_ppt_pl1_spl(Math.round(SystemPageData.ppt_pl1_spl))
+            if !SystemPageData.asus_armoury_loaded: Rectangle {
+                border-width: 3px;
+                border-color: red;
+                max-height: 30px;
+                VerticalBox {
+                    Text {
+                        text: @tr("no_asus_armoury_driver_1" => "The asus-armoury driver is not loaded");
+                        font-size: 16px;
+                        horizontal-alignment: TextHorizontalAlignment.center;
+                    }
+
+                    Text {
+                        text: @tr("no_asus_armoury_driver_2" => "For advanced features you will require a kernel with this driver added.");
+                        font-size: 16px;
+                        horizontal-alignment: TextHorizontalAlignment.center;
+                    }
                 }
             }
 
-            if SystemPageData.available.ppt-pl2-sppt: SystemSlider {
-                text: @tr("ppt_pl2_sppt" => "PL2, turbo power limit");
-                minimum: 5;
-                maximum: 250;
-                value <=> SystemPageData.ppt_pl2_sppt;
-                released => {
-                    SystemPageData.set_ppt_pl2_sppt(Math.round(SystemPageData.ppt_pl2_sppt))
+            GroupBox {
+                title: @tr("Keyboard Power Management");
+                HorizontalLayout {
+                    spacing: 10px;
+                    if SystemPageData.kbd_leds_awake != -1: SystemToggleInt {
+                        text: @tr("Keyboard Awake Effect");
+                        checked_int <=> SystemPageData.kbd_leds_awake;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_awake(SystemPageData.kbd_leds_awake)
+                        }
+                    }
+
+                    if SystemPageData.kbd_leds_sleep != -1: SystemToggleInt {
+                        text: @tr("Keyboard Sleep Effect");
+                        checked_int <=> SystemPageData.kbd_leds_sleep;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_sleep(SystemPageData.kbd_leds_sleep)
+                        }
+                    }
+
+                    if SystemPageData.kbd_leds_boot != -1: SystemToggleInt {
+                        text: @tr("Keyboard Boot Effect");
+                        checked_int <=> SystemPageData.kbd_leds_boot;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_boot(SystemPageData.kbd_leds_boot)
+                        }
+                    }
+
+                    if SystemPageData.kbd_leds_shutdown != -1: SystemToggleInt {
+                        text: @tr("Keyboard Shutdown Effect");
+                        checked_int <=> SystemPageData.kbd_leds_shutdown;
+                        toggled => {
+                            SystemPageData.cb_kbd_leds_shutdown(SystemPageData.kbd_leds_shutdown)
+                        }
+                    }
                 }
             }
 
-            if SystemPageData.available.ppt-fppt: SystemSlider {
-                text: @tr("ppt_fppt" => "FPPT, Fast Power Limit");
-                minimum: 5;
-                maximum: 250;
-                value <=> SystemPageData.ppt_fppt;
-                released => {
-                    SystemPageData.set_ppt_fppt(Math.round(SystemPageData.ppt_fppt))
+            HorizontalBox {
+                padding: 0px;
+                spacing: 10px;
+                if SystemPageData.panel_overdrive != -1: SystemToggleInt {
+                    text: @tr("Panel Overdrive");
+                    checked_int <=> SystemPageData.panel_overdrive;
+                    toggled => {
+                        SystemPageData.cb_panel_overdrive(SystemPageData.panel_overdrive)
+                    }
+                }
+
+                if SystemPageData.mini_led_mode != -1: SystemToggleInt {
+                    text: @tr("MiniLED Mode");
+                    checked_int <=> SystemPageData.mini_led_mode;
+                    toggled => {
+                        SystemPageData.cb_mini_led_mode(SystemPageData.mini_led_mode)
+                    }
+                }
+
+                if SystemPageData.boot_sound != -1: SystemToggleInt {
+                    text: @tr("POST boot sound");
+                    checked_int <=> SystemPageData.boot_sound;
+                    toggled => {
+                        SystemPageData.cb_boot_sound(SystemPageData.boot_sound)
+                    }
+                }
+
+                if SystemPageData.screen_auto_brightness != -1: SystemToggleInt {
+                    text: @tr("Screen Auto Brightness");
+                    checked_int <=> SystemPageData.screen_auto_brightness;
+                    toggled => {
+                        SystemPageData.cb_screen_auto_brightness(SystemPageData.screen_auto_brightness)
+                    }
+                }
+
+                if SystemPageData.mcu_powersave != -1: SystemToggleInt {
+                    text: @tr("MCU Powersave");
+                    checked_int <=> SystemPageData.mcu_powersave;
+                    toggled => {
+                        SystemPageData.cb_mcu_powersave(SystemPageData.mcu_powersave)
+                    }
                 }
             }
 
-            if SystemPageData.available.ppt-apu-sppt: SystemSlider {
-                text: @tr("ppt_apu_sppt" => "SPPT, APU slow power limit");
-                minimum: 5;
-                maximum: 130;
-                value <=> SystemPageData.ppt_apu_sppt;
-                released => {
-                    SystemPageData.set_ppt_apu_sppt(Math.round(SystemPageData.ppt_apu_sppt))
+            if (SystemPageData.ppt_pl1_spl.max > 0 && SystemPageData.ppt_pl1_spl.current != -1) || (SystemPageData.ppt_pl2_sppt.max > 0 && SystemPageData.ppt_pl2_sppt.current != -1) || (SystemPageData.ppt_pl3_fppt.max > 0 && SystemPageData.ppt_pl3_fppt.current != -1) || (SystemPageData.ppt_fppt.max > 0 && SystemPageData.ppt_fppt.current != -1) || (SystemPageData.ppt_apu_sppt.max > 0 && SystemPageData.ppt_apu_sppt.current != -1) || (SystemPageData.nv_temp_target.max > 0 && SystemPageData.nv_temp_target.current != -1) || (SystemPageData.nv_dynamic_boost.max > 0 && SystemPageData.nv_dynamic_boost.current != -1): HorizontalLayout {
+                padding-right: 10px;
+                padding-left: 10px;
+                alignment: LayoutAlignment.space-between;
+                Rectangle {
+                    height: 32px;
+                    Text {
+                        font-size: 16px;
+                        text: @tr("ppt_warning" => "The following settings are not applied until the toggle is enabled.");
+                    }
+                }
+
+                if !SystemPageData.ppt_enabled_available: Switch {
+                    text: @tr("ppt_group_enabled" => "Enable Tuning");
+                    checked <=> SystemPageData.enable_ppt_group;
+                    toggled => {
+                        SystemPageData.cb_enable_ppt_group(SystemPageData.enable_ppt_group)
+                    }
+                }
+                if SystemPageData.ppt_enabled_available: Switch {
+                    text: @tr("ppt_group_enabled" => "Enable Tuning");
+                    checked <=> SystemPageData.ppt_enabled;
+                    toggled => {
+                        SystemPageData.enable_ppt_group = self.checked;
+                        SystemPageData.cb_ppt_enabled(SystemPageData.ppt_enabled)
+                    }
                 }
             }
 
-            if SystemPageData.available.ppt-platform-sppt: SystemSlider {
-                text: @tr("ppt_platform_sppt" => "Slow package power tracking limit");
-                maximum: 130;
-                minimum: 5;
-                value <=> SystemPageData.ppt_platform_sppt;
-                released => {
-                    SystemPageData.set_ppt_platform_sppt(Math.round(SystemPageData.ppt_platform_sppt))
+            if SystemPageData.ppt_pl1_spl.max > 0 && SystemPageData.ppt_pl1_spl.current != -1: SystemSlider {
+                text: @tr("ppt_pl1_spl" => "CPU Sustained Power Limit");
+                title: @tr("ppt_pl1_spl" => "CPU Sustained Power Limit");
+                help_text: @tr("ppt_pl1_spl_help" => "Long-term CPU power limit that affects sustained workload performance. Higher values may increase heat and power consumption.");
+                minimum: SystemPageData.ppt_pl1_spl.min;
+                maximum: SystemPageData.ppt_pl1_spl.max;
+                value: SystemPageData.ppt_pl1_spl.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_pl1_spl();
+                }
+                released(value) => {
+                    SystemPageData.ppt_pl1_spl.current = Math.round(value);
+                    SystemPageData.cb_ppt_pl1_spl(Math.round(value));
                 }
             }
 
-            if SystemPageData.available.nv-dynamic-boost: SystemSlider {
-                text: @tr("nv_dynamic_boost" => "dGPU boost overclock");
-                minimum: 5;
-                maximum: 25;
-                value <=> SystemPageData.nv_dynamic_boost;
-                released => {
-                    SystemPageData.set_nv_dynamic_boost(Math.round(SystemPageData.nv_dynamic_boost))
+            if SystemPageData.ppt_pl2_sppt.max > 0 && SystemPageData.ppt_pl2_sppt.current != -1: SystemSlider {
+                text: @tr("ppt_pl2_sppt" => "CPU Turbo Power Limit");
+                title: @tr("ppt_pl2_sppt" => "CPU Turbo Power Limit");
+                help_text: @tr("ppt_pl2_sppt_help" => "Short-term CPU power limit for boost periods. Controls maximum power during brief high-performance bursts.");
+                minimum: SystemPageData.ppt_pl2_sppt.min;
+                maximum: SystemPageData.ppt_pl2_sppt.max;
+                value: SystemPageData.ppt_pl2_sppt.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_pl2_sppt();
+                }
+                released(value) => {
+                    SystemPageData.ppt_pl2_sppt.current = Math.round(value);
+                    SystemPageData.cb_ppt_pl2_sppt(Math.round(value));
                 }
             }
 
-            if SystemPageData.available.nv-temp-target: SystemSlider {
-                text: @tr("nv_temp_target" => "dGPU temperature max");
-                minimum: 75;
-                maximum: 87;
-                value <=> SystemPageData.nv_temp_target;
-                released => {
-                    SystemPageData.set_nv_temp_target(Math.round(SystemPageData.nv_temp_target))
+            if SystemPageData.ppt_pl3_fppt.max > 0 && SystemPageData.ppt_pl3_fppt.current != -1: SystemSlider {
+                text: @tr("ppt_pl3_fppt" => "CPU Fast Burst Power Limit");
+                title: @tr("ppt_pl3_fppt" => "CPU Fast Burst Power Limit");
+                help_text: @tr("ppt_pl3_fppt_help" => "Ultra-short duration power limit for instantaneous CPU bursts. Affects responsiveness during sudden workload spikes.");
+                minimum: SystemPageData.ppt_pl3_fppt.min;
+                maximum: SystemPageData.ppt_pl3_fppt.max;
+                value: SystemPageData.ppt_pl3_fppt.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_pl3_fppt();
+                }
+                released(value) => {
+                    SystemPageData.ppt_pl3_fppt.current = Math.round(value);
+                    SystemPageData.cb_ppt_pl3_fppt(Math.round(value));
+                }
+            }
+            if SystemPageData.ppt_fppt.max > 0 && SystemPageData.ppt_fppt.current != -1: SystemSlider {
+                text: @tr("ppt_fppt" => "Fast Package Power Limit");
+                title: @tr("ppt_fppt" => "Fast Package Power Limit");
+                help_text: @tr("ppt_fppt_help" => "Ultra-short duration power limit for system package. Controls maximum power during millisecond-scale load spikes.");
+                minimum: SystemPageData.ppt_fppt.min;
+                maximum: SystemPageData.ppt_fppt.max;
+                value: SystemPageData.ppt_fppt.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_fppt();
+                }
+                released(value) => {
+                    SystemPageData.ppt_fppt.current = Math.round(value);
+                    SystemPageData.cb_ppt_fppt(Math.round(value));
+                }
+            }
+
+            if SystemPageData.ppt_apu_sppt.max > 0 && SystemPageData.ppt_apu_sppt.current != -1: SystemSlider {
+                text: @tr("ppt_apu_sppt" => "APU Sustained Power Limit");
+                title: @tr("ppt_apu_sppt" => "APU Sustained Power Limit");
+                help_text: @tr("ppt_apu_sppt_help" => "Long-term power limit for integrated graphics and CPU combined. Affects sustained performance of APU-based workloads.");
+                minimum: SystemPageData.ppt_apu_sppt.min;
+                maximum: SystemPageData.ppt_apu_sppt.max;
+                value: SystemPageData.ppt_apu_sppt.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_apu_sppt();
+                }
+                released(value) => {
+                    SystemPageData.ppt_apu_sppt.current = Math.round(value);
+                    SystemPageData.cb_ppt_apu_sppt(Math.round(value));
+                }
+            }
+
+            if SystemPageData.ppt_platform_sppt.max > 0 && SystemPageData.ppt_platform_sppt.current != -1: SystemSlider {
+                text: @tr("ppt_platform_sppt" => "Platform Sustained Power Limit");
+                title: @tr("ppt_platform_sppt" => "Platform Sustained Power Limit");
+                help_text: @tr("ppt_platform_sppt_help" => "Overall system power limit for sustained operations. Controls total platform power consumption over extended periods.");
+                minimum: SystemPageData.ppt_platform_sppt.min;
+                maximum: SystemPageData.ppt_platform_sppt.max;
+                value: SystemPageData.ppt_platform_sppt.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_ppt_platform_sppt();
+                }
+                released(value) => {
+                    SystemPageData.ppt_platform_sppt.current = Math.round(value);
+                    SystemPageData.cb_ppt_platform_sppt(Math.round(value));
+                }
+            }
+
+            if SystemPageData.nv_dynamic_boost.max > 0 && SystemPageData.nv_dynamic_boost.current != -1: SystemSlider {
+                text: @tr("nv_dynamic_boost" => "GPU Power Boost");
+                title: @tr("nv_dynamic_boost" => "GPU Power Boost");
+                help_text: @tr("nv_dynamic_boost_help" => "Additional power allocation for GPU dynamic boost. Higher values increase GPU performance but generate more heat.");
+                minimum: SystemPageData.nv_dynamic_boost.min;
+                maximum: SystemPageData.nv_dynamic_boost.max;
+                value: SystemPageData.nv_dynamic_boost.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_nv_dynamic_boost();
+                }
+                released(value) => {
+                    SystemPageData.nv_dynamic_boost.current = Math.round(value);
+                    SystemPageData.cb_nv_dynamic_boost(Math.round(value));
+                }
+            }
+
+            if SystemPageData.nv_temp_target.max > 0 && SystemPageData.nv_temp_target.current != -1: SystemSlider {
+                text: @tr("nv_temp_target" => "GPU Temperature Limit");
+                title: @tr("nv_temp_target" => "GPU Temperature Limit");
+                help_text: @tr("nv_temp_target_help" => "Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain temperature below this limit.");
+                minimum: SystemPageData.nv_temp_target.min;
+                maximum: SystemPageData.nv_temp_target.max;
+                value: SystemPageData.nv_temp_target.current;
+                enabled <=> SystemPageData.enable_ppt_group;
+                has_reset: true;
+                cb_do_reset => {
+                    SystemPageData.cb_default_nv_temp_target();
+                }
+                released(value) => {
+                    SystemPageData.nv_temp_target.current = Math.round(value);
+                    SystemPageData.cb_nv_temp_target(Math.round(value));
                 }
             }
         }
@@ -296,39 +582,39 @@ export component PageSystem inherits Rectangle {
 
                         SystemToggle {
                             text: @tr("Change EPP based on Throttle Policy");
-                            checked <=> SystemPageData.throttle_policy_linked_epp;
+                            checked <=> SystemPageData.platform_profile_linked_epp;
                             toggled => {
-                                SystemPageData.set_throttle_policy_linked_epp(SystemPageData.throttle_policy_linked_epp)
+                                SystemPageData.cb_platform_profile_linked_epp(SystemPageData.platform_profile_linked_epp)
                             }
                         }
 
                         SystemDropdown {
                             text: @tr("EPP for Balanced Policy");
-                            current_index <=> SystemPageData.throttle_balanced_epp;
-                            current_value: SystemPageData.energy_performance_choices[SystemPageData.throttle_balanced_epp];
+                            current_index <=> SystemPageData.profile_balanced_epp;
+                            current_value: SystemPageData.energy_performance_choices[SystemPageData.profile_balanced_epp];
                             model <=> SystemPageData.energy_performance_choices;
                             selected => {
-                                SystemPageData.set_throttle_balanced_epp(SystemPageData.throttle_balanced_epp)
+                                SystemPageData.cb_profile_balanced_epp(SystemPageData.profile_balanced_epp)
                             }
                         }
 
                         SystemDropdown {
                             text: @tr("EPP for Performance Policy");
-                            current_index <=> SystemPageData.throttle_performance_epp;
-                            current_value: SystemPageData.energy_performance_choices[SystemPageData.throttle_performance_epp];
+                            current_index <=> SystemPageData.profile_performance_epp;
+                            current_value: SystemPageData.energy_performance_choices[SystemPageData.profile_performance_epp];
                             model <=> SystemPageData.energy_performance_choices;
                             selected => {
-                                SystemPageData.set_throttle_performance_epp(SystemPageData.throttle_performance_epp)
+                                SystemPageData.cb_profile_performance_epp(SystemPageData.profile_performance_epp)
                             }
                         }
 
                         SystemDropdown {
                             text: @tr("EPP for Quiet Policy");
-                            current_index <=> SystemPageData.throttle_quiet_epp;
-                            current_value: SystemPageData.energy_performance_choices[SystemPageData.throttle_quiet_epp];
+                            current_index <=> SystemPageData.profile_quiet_epp;
+                            current_value: SystemPageData.energy_performance_choices[SystemPageData.profile_quiet_epp];
                             model <=> SystemPageData.energy_performance_choices;
                             selected => {
-                                SystemPageData.set_throttle_quiet_epp(SystemPageData.throttle_quiet_epp)
+                                SystemPageData.cb_profile_quiet_epp(SystemPageData.profile_quiet_epp)
                             }
                         }
                     }
@@ -348,19 +634,19 @@ export component PageSystem inherits Rectangle {
                             spacing: 10px;
                             SystemDropdown {
                                 text: @tr("Throttle Policy on Battery");
-                                current_index <=> SystemPageData.throttle_policy_on_battery;
-                                current_value: SystemPageData.throttle_policy_choices[SystemPageData.throttle_policy_on_battery];
-                                model <=> SystemPageData.throttle_policy_choices;
+                                current_index <=> SystemPageData.platform_profile_on_battery;
+                                current_value: SystemPageData.platform_profile_choices[SystemPageData.platform_profile_on_battery];
+                                model <=> SystemPageData.platform_profile_choices;
                                 selected => {
-                                    SystemPageData.set_throttle_policy_on_battery(SystemPageData.throttle_policy_on_battery)
+                                    SystemPageData.cb_platform_profile_on_battery(SystemPageData.platform_profile_on_battery)
                                 }
                             }
 
                             SystemToggle {
                                 text: @tr("Enabled");
-                                checked <=> SystemPageData.change_throttle_policy_on_battery;
+                                checked <=> SystemPageData.change_platform_profile_on_battery;
                                 toggled => {
-                                    SystemPageData.set_change_throttle_policy_on_battery(SystemPageData.change_throttle_policy_on_battery);
+                                    SystemPageData.cb_change_platform_profile_on_battery(SystemPageData.change_platform_profile_on_battery);
                                 }
                             }
                         }
@@ -369,19 +655,19 @@ export component PageSystem inherits Rectangle {
                             spacing: 10px;
                             SystemDropdown {
                                 text: @tr("Throttle Policy on AC");
-                                current_index <=> SystemPageData.throttle_policy_on_ac;
-                                current_value: SystemPageData.throttle_policy_choices[SystemPageData.throttle_policy_on_ac];
-                                model <=> SystemPageData.throttle_policy_choices;
+                                current_index <=> SystemPageData.platform_profile_on_ac;
+                                current_value: SystemPageData.platform_profile_choices[SystemPageData.platform_profile_on_ac];
+                                model <=> SystemPageData.platform_profile_choices;
                                 selected => {
-                                    SystemPageData.set_throttle_policy_on_ac(SystemPageData.throttle_policy_on_ac)
+                                    SystemPageData.cb_platform_profile_on_ac(SystemPageData.platform_profile_on_ac)
                                 }
                             }
 
                             SystemToggle {
                                 text: @tr("Enabled");
-                                checked <=> SystemPageData.change_throttle_policy_on_ac;
+                                checked <=> SystemPageData.change_platform_profile_on_ac;
                                 toggled => {
-                                    SystemPageData.set_change_throttle_policy_on_ac(SystemPageData.change_throttle_policy_on_ac);
+                                    SystemPageData.cb_change_platform_profile_on_ac(SystemPageData.change_platform_profile_on_ac);
                                 }
                             }
                         }