Update dependencies

Bump to version 4.0.7
Update notes in CLI tool
2026-01-22 09:23:19 +01:00 · 2021-12-19 21:01:47 +13:00 · 2021-12-19 21:00:58 +13:00 · 2021-12-19 20:57:50 +13:00 · 2021-12-17 21:18:00 +00:00 · 2021-12-17 21:16:56 +00:00
113 changed files with 2720 additions and 3442 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ cargo-config
 .idea
 vendor-*
 vendor_*
+.vscode-ctags
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,72 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+# [4.0.7] - 2021-12-19
+### Changed
+- Fix incorrect power-profile validation
+- Update asusd-ledmodes.toml to support Asus Rog Strix G15 G513QE (@LordVicky)
+- Update patch notes and links
+
+# [4.0.6] - 2021-11-01
+### Changed
+- Fix CLI for bios toggles
+### Added
+- Extra commands for AniMe: pixel-image, gif, pixel-gif
+
+# [4.0.5] - 2021-10-27
+### Changed
+- Convert fan curve percentage to 0-255 expected by kernel driver only if '%' char is used, otherwise the expected range for fan power is 0-255
+- Use correct error in daemon for invalid charging limit
+- Enforce charging limit values in range 20-100
+### Added
+- LED modes for G513QR
+
+# [4.0.4] - 2021-10-02
+### Changed
+- Add missing Profile commands
+- Spawn tasks on individual threads to prevent blocking
+- Don't force fan-curve default on reload
+- Begin obsoleting the graphics switch command in favour of supergfxctl
+- Slim down the notification daemon to pure ASUS notifications
+
+# [4.0.3] - 2021-09-16
+### Changed
+- Don't show fan-curve warning if fan-curve available
+- Add G713QR to Strix led-modes
+- Fix part of CLI fan-curve control
+
+# [4.0.2] - 2021-09-14
+### Changed
+- Backup old configs to *-old if parse fails
+- Prevent some types of crashes related to unpatched kernels
+- Add better help for graphics errors
+- Add better help for asusctl general errors
+- Implement fan-curve dbus API
+- Implement partial fan-curve control via CLI tool
+  + Set fan curve for profile + fan gpu/cpu
+
+# [4.0.1] - 2021-09-11
+### Changed
+- Fix asusd-ledmodes.toml
+
+# [4.0.0] - 2021-09-10
+### Added
+- AniMe:
+  + Support 8bit RGB, RGBA, 16bit Greyscalw, RGB, RGBA
+  + add `AsusImage` type for slanted-template pixel-perfect images
+  + `BREAKING:` plain `Image` with time period is changed and old anime configs break as a result (sorry)
+- LED:
+  + By popular request LED prev/next cycle is added
+  + Add led modes for GX551Q
+### BREAKING CHANGES
+- Graphics control:
+  + graphics control is pulled out of asusd and moved to new package; https://gitlab.com/asus-linux/supergfxctl
+- Proflies:
+  + profiles now depend on power-profile-daemon plus kernel patches for support of platform_profile
+    - if your system supports fan-curves you will also require upcoming kernel patches for this
+  + profiles are now moved to a new file
+  + fan-curves are only partially completed due to this release needing to be done sooner
+
 # [3.7.2] - 2021-08-02
 ### Added
 - Enable multizone support on Strix 513IH
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,19 +31,20 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"

 [[package]]
 name = "asus-notify"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
 "notify-rust",
 "rog_aura",
 "rog_dbus",
 "rog_profiles",
- "rog_types",
+ "rog_supported",
 "serde_json",
+ "zbus",
 ]

 [[package]]
 name = "asusctl"
-version = "3.5.1"
+version = "4.0.7"
 dependencies = [
 "daemon",
 "gif",
@@ -52,21 +53,21 @@ dependencies = [
 "rog_anime",
 "rog_aura",
 "rog_dbus",
- "rog_fan_curve",
 "rog_profiles",
- "rog_types",
+ "rog_supported",
+ "sysfs-class",
 "tinybmp",
- "yansi-term",
+ "toml",
+ "zbus",
 ]

 [[package]]
 name = "async-io"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b"
+checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
 dependencies = [
 "concurrent-queue",
- "fastrand",
 "futures-lite",
 "libc",
 "log",
@@ -102,12 +103,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

-[[package]]
-name = "bitflags"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
-
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -139,21 +134,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

 [[package]]
 name = "cache-padded"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"

 [[package]]
 name = "cc"
-version = "1.0.68"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"

 [[package]]
 name = "cfg-if"
@@ -201,13 +190,13 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "lazy_static",
 ]

 [[package]]
 name = "daemon"
-version = "3.7.2"
+version = "4.0.7"
 dependencies = [
 "env_logger",
 "log",
@@ -215,9 +204,8 @@ dependencies = [
 "rog_anime",
 "rog_aura",
 "rog_dbus",
- "rog_fan_curve",
 "rog_profiles",
- "rog_types",
+ "rog_supported",
 "rusb",
 "serde",
 "serde_derive",
@@ -237,7 +225,7 @@ dependencies = [
 "dirs 3.0.2",
 "rog_anime",
 "rog_dbus",
- "rog_types",
+ "rog_supported",
 "serde",
 "serde_derive",
 "serde_json",
@@ -253,8 +241,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -305,15 +293,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
 dependencies = [
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "env_logger"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
+checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
 dependencies = [
 "atty",
 "humantime",
@@ -324,18 +312,18 @@ dependencies = [

 [[package]]
 name = "fastrand"
-version = "1.4.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb"
+checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2"
 dependencies = [
 "instant",
 ]

 [[package]]
 name = "futures"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
+checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -348,9 +336,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
+checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -358,15 +346,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
+checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"

 [[package]]
 name = "futures-executor"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
+checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -375,9 +363,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
+checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"

 [[package]]
 name = "futures-lite"
@@ -396,36 +384,33 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
+checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
 dependencies = [
- "autocfg",
- "proc-macro-hack",
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "futures-sink"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282"
+checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"

 [[package]]
 name = "futures-task"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
+checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"

 [[package]]
 name = "futures-util"
-version = "0.3.15"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
+checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
 dependencies = [
- "autocfg",
 "futures-channel",
 "futures-core",
 "futures-io",
@@ -435,8 +420,6 @@ dependencies = [
 "memchr",
 "pin-project-lite",
 "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
 "slab",
 ]

@@ -446,7 +429,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -457,16 +440,16 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "wasi 0.10.2+wasi-snapshot-preview1",
 ]

 [[package]]
 name = "gif"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a668f699973d0f573d15749b7002a9ac9e1f9c6b220e7b165601334c173d8de"
+checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b"
 dependencies = [
 "color_quant",
 "weezl",
@@ -497,15 +480,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915ef07c710d84733522461de2a734d4d62a3fd39a4d4f404c2f385ef8618d05"
 dependencies = [
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
 ]

 [[package]]
 name = "hermit-abi"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
 "libc",
 ]
@@ -518,28 +510,18 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

 [[package]]
 name = "instant"
-version = "0.1.9"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "intel-pstate"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dbd48c2f4886e44c137f4acb6ba3cf8df15154a2c996a65ee5e57c54a04c01f"
-dependencies = [
- "smart-default",
- "thiserror",
+ "cfg-if",
 ]

 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"

 [[package]]
 name = "lazy_static"
@@ -549,9 +531,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.95"
+version = "0.2.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"

 [[package]]
 name = "libudev-sys"
@@ -581,7 +563,7 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -621,9 +603,18 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]

 [[package]]
 name = "miniz_oxide"
@@ -647,15 +638,15 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.17.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
+checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945"
 dependencies = [
- "bitflags 1.2.1",
+ "bitflags",
 "cc",
- "cfg-if 0.1.10",
+ "cfg-if",
 "libc",
- "void",
+ "memoffset",
 ]

 [[package]]
@@ -670,9 +661,9 @@ dependencies = [

 [[package]]
 name = "notify-rust"
-version = "4.5.2"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2ca742cd7268b60c35828d318357f0b1bb9b82088e157ccf3013eb3ce70247"
+checksum = "ca6ebab865e67efdd7182a88d76cadbdd2a8d02d1c7a4e16bb7c234016a12cac"
 dependencies = [
 "mac-notification-sys",
 "serde",
@@ -703,9 +694,9 @@ dependencies = [

 [[package]]
 name = "numtoa"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e521b6adefa0b2c1fa5d2abdf9a5216288686fe6146249215d884c0e5ab320b0"
+checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"

 [[package]]
 name = "objc"
@@ -738,9 +729,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.7.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"

 [[package]]
 name = "parking"
@@ -750,9 +741,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"

 [[package]]
 name = "pin-project-lite"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"

 [[package]]
 name = "pin-utils"
@@ -768,9 +759,9 @@ checksum = "bea9d5c668f13b4a1b97d848780e00cfabf76eb83538129c264c0c6d6a968047"

 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"

 [[package]]
 name = "png_pong"
@@ -784,14 +775,14 @@ dependencies = [

 [[package]]
 name = "polling"
-version = "2.0.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b"
+checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "log",
- "wepoll-sys",
+ "wepoll-ffi",
 "winapi",
 ]

@@ -805,37 +796,29 @@ dependencies = [
 ]

 [[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
+name = "proc-macro-crate"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
+checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
+dependencies = [
+ "thiserror",
+ "toml",
+]

 [[package]]
 name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
 dependencies = [
- "unicode-xid 0.2.2",
+ "unicode-xid",
 ]

 [[package]]
 name = "quote"
-version = "0.3.15"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
-
-[[package]]
-name = "quote"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
 dependencies = [
 "proc-macro2",
 ]
@@ -848,11 +831,11 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"

 [[package]]
 name = "redox_syscall"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
 dependencies = [
- "bitflags 1.2.1",
+ "bitflags",
 ]

 [[package]]
@@ -873,7 +856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
 "getrandom 0.2.3",
- "redox_syscall 0.2.8",
+ "redox_syscall 0.2.10",
 ]

 [[package]]
@@ -895,7 +878,7 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"

 [[package]]
 name = "rog_anime"
-version = "1.0.5"
+version = "1.3.0"
 dependencies = [
 "gif",
 "glam",
@@ -919,41 +902,31 @@ dependencies = [

 [[package]]
 name = "rog_dbus"
-version = "3.5.1"
+version = "4.0.2"
 dependencies = [
 "rog_anime",
 "rog_aura",
 "rog_profiles",
- "rog_types",
+ "rog_supported",
 "zbus",
 "zbus_macros",
 "zvariant",
 ]

-[[package]]
-name = "rog_fan_curve"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d083149d6e2681d05882e7ff557dec07211a6349f6de9446073b2c7dfd81e2f2"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "rog_profiles"
-version = "0.1.2"
+version = "1.1.3"
 dependencies = [
- "intel-pstate",
- "rog_fan_curve",
 "serde",
 "serde_derive",
+ "udev",
 "zvariant",
 "zvariant_derive",
 ]

 [[package]]
-name = "rog_types"
-version = "3.2.0"
+name = "rog_supported"
+version = "4.0.0"
 dependencies = [
 "rog_aura",
 "serde",
@@ -986,9 +959,9 @@ dependencies = [

 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"

 [[package]]
 name = "scoped-tls"
@@ -998,29 +971,29 @@ checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

 [[package]]
 name = "serde"
-version = "1.0.126"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.126"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276"
 dependencies = [
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.64"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
+checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5"
 dependencies = [
 "itoa",
 "ryu",
@@ -1034,82 +1007,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
 dependencies = [
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "slab"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
-
-[[package]]
-name = "smart-default"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
-dependencies = [
- "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
-]
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"

 [[package]]
 name = "socket2"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
+checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
 dependencies = [
 "libc",
 "winapi",
 ]

 [[package]]
-name = "strum"
-version = "0.8.0"
+name = "static_assertions"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca6e4730f517e041e547ffe23d29daab8de6b73af4b6ae2a002108169f5e7da"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strum"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e"
+dependencies = [
+ "strum_macros",
+]

 [[package]]
 name = "strum_macros"
-version = "0.8.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3384590878eb0cab3b128e844412e2d010821e7e091211b9d87324173ada7db8"
+checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
 dependencies = [
- "quote 0.3.15",
- "syn 0.11.11",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "syn"
-version = "0.11.11"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
-dependencies = [
- "quote 0.3.15",
- "synom",
- "unicode-xid 0.0.4",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
+checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
 dependencies = [
 "proc-macro2",
- "quote 1.0.9",
- "unicode-xid 0.2.2",
-]
-
-[[package]]
-name = "synom"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
-dependencies = [
- "unicode-xid 0.0.4",
+ "quote",
+ "unicode-xid",
 ]

 [[package]]
@@ -1132,22 +1085,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.25"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.25"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -1190,10 +1143,10 @@ dependencies = [
 ]

 [[package]]
-name = "unicode-xid"
-version = "0.0.4"
+name = "unicode-segmentation"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"

 [[package]]
 name = "unicode-xid"
@@ -1203,9 +1156,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"

 [[package]]
 name = "vcpkg"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

 [[package]]
 name = "version_check"
@@ -1213,12 +1166,6 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"

-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
 [[package]]
 name = "waker-fn"
 version = "1.1.0"
@@ -1244,10 +1191,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e"

 [[package]]
-name = "wepoll-sys"
-version = "3.0.1"
+name = "wepoll-ffi"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
+checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
 dependencies = [
 "cc",
 ]
@@ -1284,50 +1231,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
-name = "winrt"
-version = "0.4.0"
+name = "windows"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30cba82e22b083dc5a422c2ee77e20dc7927271a0dc981360c57c1453cb48d"
+checksum = "a9f39345ae0c8ab072c0ac7fe8a8b411636aa34f89be19ddd0d9226544f13944"
 dependencies = [
- "winapi",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
 ]

 [[package]]
-name = "winrt-notification"
-version = "0.2.4"
+name = "windows_i686_gnu"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57790eb281688a4682dab44df2a1ba8b78373233bd71cb291c3e75fecb1a01c4"
+checksum = "c0866510a3eca9aed73a077490bbbf03e5eaac4e1fd70849d89539e5830501fd"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf0ffed56b7e9369a29078d2ab3aaeceea48eb58999d2cff3aa2494a275b95c6"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384a173630588044205a2993b6864a2f56e5a8c1e7668c07b93ec18cf4888dc4"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd8f062d8ca5446358159d79a90be12c543b3a965c847c8f3eedf14b321d399"
+
+[[package]]
+name = "winrt-notification"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eda101fb8e034a25f3d50a0714d7ca4f234a4fc7bc57427f6d81040db0ccbe6a"
 dependencies = [
 "strum",
- "strum_macros",
- "winapi",
- "winrt",
+ "windows",
 "xml-rs",
 ]

 [[package]]
 name = "xml-rs"
-version = "0.6.1"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1945e12e16b951721d7976520b0832496ef79c31602c7a29d950de79ba74621"
-dependencies = [
- "bitflags 0.9.1",
-]
-
-[[package]]
-name = "yansi-term"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-dependencies = [
- "winapi",
-]
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"

 [[package]]
 name = "zbus"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad"
+checksum = "e5983c3d035549ab80db67c844ec83ed271f7c1f2546fd9577c594d34c1b6c85"
 dependencies = [
 "async-io",
 "byteorder",
@@ -1348,36 +1308,38 @@ dependencies = [

 [[package]]
 name = "zbus_macros"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93"
+checksum = "bce54ac7b2150a2fa21ad5842a7470ce2288158d7da1f9bfda8ad455a1c59a97"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 0.1.5",
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]

 [[package]]
 name = "zvariant"
-version = "2.6.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678e7262502a135f49b1ece65010526649be7ee68acb80e1fc5377fc71fef878"
+checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525"
 dependencies = [
 "byteorder",
 "enumflags2",
+ "libc",
 "serde",
+ "static_assertions",
 "zvariant_derive",
 ]

 [[package]]
 name = "zvariant_derive"
-version = "2.6.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d7c34325a35020b94343389cc9391e0f8ac245cca9155429c4022d93141241"
+checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.1.0",
 "proc-macro2",
- "quote 1.0.9",
- "syn 1.0.72",
+ "quote",
+ "syn",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["asusctl", "asus-notify", "daemon", "daemon-user", "rog-types", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles"]
+members = ["asusctl", "asus-notify", "daemon", "daemon-user", "rog-supported", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles"]

 [profile.release]
 lto = true
@@ -13,4 +13,4 @@ opt-level = 1

 [profile.bench]
 debug = false
-opt-level = 3
+opt-level = 3
--- a/MANUAL.md
+++ b/MANUAL.md
@@ -16,57 +16,15 @@ but can also be used with non-asus laptops with reduced features.

 The functionality that `asusd` exposes is:

- graphics switching
 - anime control
 - led keyboard control (aura)
 - charge limiting
 - bios/efivar control
- profiles (fan/cpu)
+- power profile switching
+- fan curves (if supported, this is auto-detected)

 each of these will be detailed in sections.

-### Graphics switching
-
-`asusd` can switch graphics modes between:
- `integrated`, uses the iGPU only and force-disables the dGPU
- `compute`, enables Nvidia without Xorg. Useful for ML/Cuda
- `hybrid`, enables Nvidia prime-offload mode
- `nvidia`, uses the Nvidia gpu only
- `vfio`, binds the Nvidia gpu to vfio for VM pass-through
-
-Switching to/from Hybrid and Nvidia modes requires a logout only (no reboot). Switching between integrated/compute/vfio does not require a logout and is instant.
-
-#### Required actions in distro
-
-**Rebootless note:** You must edit `/etc/default/grub` to remove `nvidia-drm.modeset=1`
-from the line `GRUB_CMDLINE_LINUX=` and then recreate your grub config. In fedora
-you can do this with `sudo grub2-mkconfig -o /etc/grub2.cfg` - other distro may be
-similar but with a different config location. It's possible that graphics driver updates
-may change this.
-
-This switcher conflicts with other gpu switchers like optimus-manager, suse-prime
-or ubuntu-prime, system76-power, and bbswitch. If you have issues with `asusd`
-always defaulting to `integrated` mode on boot then you will need to check for
-stray configs blocking nvidia modules from loading in:
- `/etc/modprobe.d/`
- `/usr/lib/modprope.d/`
-
-#### Config options
-
-1. `"gfx_mode": "<MODE>",`: MODE can be <Integrated, Hybrid, Compute, Nvidia, vfio>
-2. `"gfx_last_mode": "Nvidia",`: currently unused
-3. `"gfx_managed": true,`: enable or disable graphics switching controller
-4. `"gfx_vfio_enable": false,`: enable vfio switching for Nvidia GPU passthrough
-5. `"gfx_save_compute_vfio": false,`: wether or not to save the vfio state (so it sticks between boots)
-
-#### Graphics switching notes
-
-**G-Sync note:** Some laptops are capable of using the dGPU as the sole GPU in the system which is generally to enable g-sync on the laptop display panel. This is controlled by the bios/efivar control and will be covered in that section.
-
-**vfio note:** The vfio modules *must not* be compiled into the kernel, they need
-to be separate modules. If you don't plan to use vfio mode then you can ignore this
-otherwise you may need a custom built kernel.
-
 ### AniMe control

 Controller for the fancy AniMe matrix display on the lid of some machines. This controller is a work in progress.
@@ -139,55 +97,27 @@ These options are not written to the config file as they are stored in efivars.

 ### Profiles

-Profiles provide a method setting up various basic CPU and fan settings in profile blocks which can then be switched between or cycled through. The CPU controls so far are:
+asusctl can support setting a power profile via platform_profile drivers. This requires [power-profiles-daemon](https://gitlab.freedesktop.org/hadess/power-profiles-daemon) v0.10.0 minimum. It also requires the kernel patch for platform_profile support to be applied form [here](https://lkml.org/lkml/2021/8/18/1022) - this patch is merged to 5.15 kernel upstream.

- Min/Max percentage of CPU frequency (Intel only for now)
- CPU turbo boost enable or disable
- Fan presets. These are 0: Normal, 1: Boost, 2: Silent.
- Fan curves, override fan-preset. AMD only.
-
-#### Config options
-
-Example:
-```json
-  "toggle_profiles": [
-    "normal",
-    "boost",
-    "silent"
-  ],
-  "power_profiles": {
-    "boost": {
-      "min_percentage": 0,
-      "max_percentage": 100,
-      "turbo": true,
-      "fan_preset": 1,
-      "fan_curve": null
-    },
-    "normal": {
-      "min_percentage": 0,
-      "max_percentage": 100,
-      "turbo": true,
-      "fan_preset": 0,
-      "fan_curve": null
-    },
-    "silent": {
-      "min_percentage": 0,
-      "max_percentage": 100,
-      "turbo": true,
-      "fan_preset": 2,
-      "fan_curve": null
-    }
-  }
-```
-
-1. `"toggle_profiles": [],`: these are the profile names that will be cycled through when using a provided next/prev dbus method.
-2. `"power_profiles": {}`: all the available profiles.
+A common use of asusctl is to bind the `fn+f5` (fan) key to `asusctl profile -n` to cycle through the 3 profiles:
+1. Balanced
+2. Performance
+3. Quiet

 #### Fan curves

-**fan_curve note:** This is a WIP. Currently it relies on `acpi_call` kernel module which is ancient and hacky, not intended for this purpose. A proper kernel driver is in progress.
+Fan curve support requires a laptop that supports it (this is detected automatically) and the kernel patch from [here](https://lkml.org/lkml/2021/10/23/250) which is accepted for the 5.17 kernel release .

-See [this document](https://github.com/cronosun/atrofac/blob/master/ADVANCED.md#limits) for details on the string format required, e.g, `"fan_curve": "30c:0%,40c:5%,50c:10%,60c:20%,70c:35%,80c:55%,90c:65%,100c:65%"`.
+The fan curve format can be of varying formats:
+
+- `30c:0%,40c:5%,50c:10%,60c:20%,70c:35%,80c:55%,90c:65%,100c:65%"`
+- `30:0,40:5,50:10,60:20,70:35,80:55,90:65,100:65"`
+- `30 0,40 5,50 10,60 20,70 35,80 55,90 65,100 65"`
+- `30 0 40 5 50 10 60 20 70 35 80 55 90 65 100 65"`
+
+the order must always be the same "temperature:percentage", lowest from left to rigth being highest.
+
+The config file is located at `/etc/asusd/profile.conf` and is self-descriptive. On first run it is populated with the system EC defaults.

 ### Support controller

@@ -236,6 +166,18 @@ Each object in the array can be one of:
      }
 ```

+##### AsusImage
+
+Virtually the same as `AsusAnimation` but for png files, typically created in the same "slanted" style using a template (`diagonal-template.png`) as the ASUS gifs for pixel perfection.
+
+```json
+      "AsusImage": {
+        "file": "<FILE_PATH>",
+        "time": <TIME>,
+        "brightness": <FLOAT>
+      }
+```
+
 ##### ImageAnimation

 `ImageAnimation` can play *any* gif of any size.
@@ -319,7 +261,7 @@ A cycle is how many gif loops to run:
          "Cycles": 2
        },
 ```
-`Infinite` means that this gif will never end: 
+`Infinite` means that this gif will never end:
 ```json
        "time": "Infinite",
 ```
@@ -414,4 +356,4 @@ 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.

---
+---
--- a/12
+++ b/12
@@ -16,8 +16,6 @@ BIN_D := asusd
 BIN_U := asusd-user
 BIN_N := asus-notify
 LEDCFG := asusd-ledmodes.toml
-X11CFG := 90-nvidia-screen-G05.conf
-PMRULES := 90-asusd-nvidia-pm.rules

 SRC := Cargo.toml Cargo.lock Makefile $(shell find -type f -wholename '**/src/*.rs')

@@ -45,14 +43,15 @@ install:
 	$(INSTALL_PROGRAM) "./target/release/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
 	$(INSTALL_PROGRAM) "./target/release/$(BIN_U)" "$(DESTDIR)$(bindir)/$(BIN_U)"
 	$(INSTALL_PROGRAM) "./target/release/$(BIN_N)" "$(DESTDIR)$(bindir)/$(BIN_N)"
-	$(INSTALL_DATA) "./data/$(PMRULES)" "$(DESTDIR)$(libdir)/udev/rules.d/$(PMRULES)"
+
 	$(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
 	$(INSTALL_DATA) "./data/$(LEDCFG)" "$(DESTDIR)/etc/asusd/$(LEDCFG)"
 	$(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
-	$(INSTALL_DATA) "./data/$(X11CFG)" "$(DESTDIR)$(datarootdir)/X11/xorg.conf.d/$(X11CFG)"
+
 	$(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
 	$(INSTALL_DATA) "./data/$(BIN_N).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_N).service"
 	$(INSTALL_DATA) "./data/$(BIN_U).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_U).service"
+
 	$(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"
 	$(INSTALL_DATA) "./data/icons/asus_notif_red.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_red.png"
@@ -63,19 +62,18 @@ install:
 	$(INSTALL_DATA) "./data/icons/scalable/gpu-nvidia.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/status/gpu-nvidia.svg"
 	$(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"
+
 	$(INSTALL_DATA) "./data/_asusctl" "$(DESTDIR)$(zshcpl)/_asusctl"
 	$(INSTALL_DATA) "./data/completions/asusctl.fish" "$(DESTDIR)$(datarootdir)/fish/vendor_completions.d/asusctl.fish"
-	cd data && find "./anime" -type f -exec install -Dm 755 "{}" "$(DESTDIR)$(datarootdir)/asusd/{}" \;
+	cd rog-anime/data && find "./anime" -type f -exec install -Dm 755 "{}" "$(DESTDIR)$(datarootdir)/asusd/{}" \;

 uninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_C)"
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_D)"
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_N)"
-	rm -f "$(DESTDIR)$(libdir)/udev/rules.d/$(PMRULES)"
 	rm -f "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
 	rm -f "$(DESTDIR)/etc/asusd/$(LEDCFG)"
 	rm -f "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
-	rm -f "$(DESTDIR)$(datarootdir)/X11/xorg.conf.d/$(X11CFG)"
 	rm -f "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
 	rm -r "$(DESTDIR)$(libdir)/systemd/user/$(BIN_N).service"
 	rm -r "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_yellow.png"
--- a/README.md
+++ b/README.md
@@ -5,6 +5,12 @@
 `asusd` 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.

+## Kernel support
+
+**The minimum supported kernel version is 5.15**
+
+Fan curve control on laptops with this feature require [this patch](https://lkml.org/lkml/2021/10/23/250) whcih has been merged for 5.17 upstream.
+
 ## Goals

 1. To provide an interface for rootless control of some system functions most users wish to control such as fan speeds, keyboard LEDs, graphics modes.
@@ -19,10 +25,6 @@ supported (while asusd might still run fine on them). For best support use fedor
 Point 4? asusd currently uses a tiny fraction of cpu time, and less than 1Mb of ram, the way
 a system-level daemon should.

-**NOTICE:**
-
-Various patches are required for keyboard support. See [this post](https://asus-linux.org/blog/updates-2021-05-06/) for details on status and which kernels will have which patches.
-
 ## Discord

 [Discord server link](https://discord.gg/4ZKGd7Un5t)
@@ -48,30 +50,33 @@ will probably suffer another rename once it becomes generic enough to do so.
 - [X] Per-key LED setting
 - [X] Fancy LED modes (See examples) (currently being reworked)
 - [X] Saving settings for reload
- [X] Logging - required for journalctl
- [X] AniMatrix display on G14 models that include it (currently being reworked)
+- [X] AniMatrix display on G14 models that include it
 - [X] Set battery charge limit (with kernel supporting this)
- [X] Fan curve control on G14 + G15 thanks to @Yarn1
- [X] Graphics mode switching between iGPU, dGPU, on-demand, and vfio (for VM pass-through)
-  + [X] Requires only a logout/login
+- [X] Fan curve control on G14 + G15. Requires kernel patch (should reach 5.15 kernel)
 - [X] Toggle bios setting for boot/POST sound
 - [X] Toggle bios setting for "dedicated gfx" mode on supported laptops (g-sync)

 # BUILDING

-Requirements are rust >= 1.47 installed from rustup.io if the distro provided version is too old, and `make`.
+Requirements are rust >= 1.57 installed from rustup.io if the distro provided version is too old, and `make`.

-**Ubuntu*:** `apt install libclang-dev libudev-dev`
+**Ubuntu (unsuported):**  
+    `apt install libclang-dev libudev-dev`
+    `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
+    `make`
+    `sudo make install`

-**fedora:** `dnf install clang-devel systemd-devel`
+**fedora:**  
+    `dnf install clang-devel systemd-devel`
+    `make`  
+    `sudo make install`  

 ## Installing
+- Fedora copr = https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/
+- openSUSE = https://download.opensuse.org/repositories/home:/luke_nukem:/asus/
+- Ubuntu = not supported due to packaging woes, but you can build and install on your own.

-Download repositories are available [here](https://download.opensuse.org/repositories/home:/luke_nukem:/asus/) for the latest versions of Fedora, Ubuntu, and openSUSE.
-
---
-
-Run `make` then `sudo make install` then reboot.
+=======

 The default init method is to use the udev rule, this ensures that the service is
 started when the device is initialised and ready.
@@ -84,11 +89,6 @@ $ systemctl daemon-reload && systemctl restart asusd

 You may also need to activate the service for debian install. If running Pop!_OS, I suggest disabling `system76-power` gnome-shell extension and systemd service.

-If you would like to run this daemon on another non-ASUS laptop you can. You'll
-have all features available except the LED and AniMe control (further controllers
-can be added on request). You will need to install the alternative service from
-`data/asusd-alt.service`.
-
 ## Uninstalling

 Run `sudo make uninstall` in the source repo, and remove `/etc/asusd/`.
--- a/asus-notify/Cargo.toml
+++ b/asus-notify/Cargo.toml
@@ -1,20 +1,21 @@
 [package]
 name = "asus-notify"
-version = "3.0.1"
+version = "3.0.2"
 authors = ["Luke D Jones <luke@ljones.dev>"]
 edition = "2018"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
+zbus = "^1.9"
 # serialisation
 serde_json = "^1.0"
 rog_dbus = { path = "../rog-dbus" }
 rog_aura = { path = "../rog-aura" }
-rog_types = { path = "../rog-types" }
+rog_supported = { path = "../rog-supported" }
 rog_profiles = { path = "../rog-profiles" }

 [dependencies.notify-rust]
 version = "^4.3"
 default-features = false
-features = ["z"]
+features = ["z"]
--- a/asus-notify/src/main.rs
+++ b/asus-notify/src/main.rs
@@ -1,11 +1,8 @@
 use notify_rust::{Hint, Notification, NotificationHandle};
 use rog_aura::AuraEffect;
 use rog_dbus::{DbusProxies, Signals};
-use rog_profiles::profiles::{FanLevel, Profile};
-use rog_types::gfx_vendors::GfxRequiredUserAction;
-use rog_types::gfx_vendors::GfxVendors;
+use rog_profiles::Profile;
 use std::error::Error;
-use std::process;
 use std::thread::sleep;
 use std::time::Duration;

@@ -43,6 +40,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

    let recv = proxies.setup_recv(conn);
    let mut err_count = 0;
+
    loop {
        sleep(Duration::from_millis(100));
        if let Err(err) = recv.next_signal() {
@@ -68,39 +66,21 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
        if let Ok(data) = signals.charge.try_recv() {
            notify!(do_charge_notif, last_notification, &data);
        }
-        if let Ok(data) = signals.gfx_vendor.try_recv() {
-            notify!(do_gfx_notif, last_notification, &data);
-        }
-        if let Ok(data) = signals.gfx_action.try_recv() {
-            match data {
-                GfxRequiredUserAction::Logout | GfxRequiredUserAction::Reboot => {
-                    do_gfx_action_notif(&data)?;
-                }
-                GfxRequiredUserAction::Integrated => {
-                    base_notification!(
-                        "You must be in integrated mode first to switch to the requested mode"
-                    )?;
-                }
-                GfxRequiredUserAction::None => {}
-            }
-        }
    }
 }

 fn do_thermal_notif(profile: &Profile) -> Result<NotificationHandle, Box<dyn Error>> {
-    let fan = profile.fan_preset;
-    let turbo = if profile.turbo { "enabled" } else { "disabled" };
-    let icon = match fan {
-        FanLevel::Normal => "asus_notif_yellow",
-        FanLevel::Boost => "asus_notif_red",
-        FanLevel::Silent => "asus_notif_green",
+    let icon = match profile {
+        Profile::Balanced => "asus_notif_yellow",
+        Profile::Performance => "asus_notif_red",
+        Profile::Quiet => "asus_notif_green",
    };
+    let profile: &str = (*profile).into();
    let x = Notification::new()
        .summary("ASUS ROG")
        .body(&format!(
-            "Thermal profile changed to {}, turbo {}",
-            profile.name.to_uppercase(),
-            turbo
+            "Thermal profile changed to {}",
+            profile.to_uppercase(),
        ))
        .hint(Hint::Resident(true))
        .timeout(2000)
@@ -121,52 +101,3 @@ fn do_led_notif(ledmode: &AuraEffect) -> Result<NotificationHandle, notify_rust:
 fn do_charge_notif(limit: &u8) -> Result<NotificationHandle, notify_rust::error::Error> {
    base_notification!(&format!("Battery charge limit changed to {}", limit))
 }
-
-fn do_gfx_notif(vendor: &GfxVendors) -> Result<NotificationHandle, notify_rust::error::Error> {
-    let icon = match vendor {
-        GfxVendors::Nvidia => "/usr/share/icons/hicolor/scalable/status/gpu-nvidia.svg",
-        GfxVendors::Integrated => "/usr/share/icons/hicolor/scalable/status/gpu-integrated.svg",
-        GfxVendors::Compute => "/usr/share/icons/hicolor/scalable/status/gpu-compute.svg",
-        GfxVendors::Vfio => "/usr/share/icons/hicolor/scalable/status/gpu-vfio.svg",
-        GfxVendors::Hybrid => "/usr/share/icons/hicolor/scalable/status/gpu-hybrid.svg",
-    };
-    Notification::new()
-        .summary(NOTIF_HEADER)
-        .body(&format!(
-            "Graphics mode changed to {}",
-            <&str>::from(vendor)
-        ))
-        .timeout(2000)
-        .icon(icon)
-        .show()
-}
-
-fn do_gfx_action_notif(vendor: &GfxRequiredUserAction) -> Result<(), notify_rust::error::Error> {
-    let mut notif = Notification::new()
-        .summary(NOTIF_HEADER)
-        .timeout(2000)
-        .urgency(notify_rust::Urgency::Critical)
-        .icon("/usr/share/icons/hicolor/scalable/status/notification-reboot.svg")
-        .finalize();
-
-    if matches!(vendor, GfxRequiredUserAction::Logout) {
-        notif.action("logout", "Logout now?");
-    } else if matches!(vendor, GfxRequiredUserAction::Reboot) {
-        notif.action("reboot", "Reboot now?");
-    }
-
-    notif.body("Graphics mode changed");
-    notif.show()?.wait_for_action(|action| match action {
-        "logout" => {
-            process::Command::new("gnome-session-quit").spawn().ok();
-        }
-        "reboot" => {
-            process::Command::new("systemctl")
-                .arg("reboot")
-                .spawn()
-                .ok();
-        }
-        _ => (),
-    });
-    Ok(())
-}
--- a/asusctl/Cargo.toml
+++ b/asusctl/Cargo.toml
@@ -1,24 +1,26 @@
 [package]
 name = "asusctl"
-version = "3.5.1"
+version = "4.0.7"
 authors = ["Luke D Jones <luke@ljones.dev>"]
 edition = "2018"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
+zbus = "^1.9.1"
 rog_anime = { path = "../rog-anime" }
 rog_aura = { path = "../rog-aura" }
 rog_dbus = { path = "../rog-dbus" }
 rog_profiles = { path = "../rog-profiles" }
-rog_types = { path = "../rog-types" }
+rog_supported = { path = "../rog-supported" }
 daemon = { path = "../daemon" }
-rog_fan_curve = { version = "^0.1", features = ["serde"] }
 gumdrop = "^0.8"
-yansi-term = "^0.1"
+toml = "^0.5.8"
+
+sysfs-class = "^0.1.2"

 [dev-dependencies]
 tinybmp = "^0.2.3"
 glam = "0.14.0"
 rog_dbus = { path = "../rog-dbus" }
-gif = "^0.11.2"
+gif = "^0.11.2"
--- a/asusctl/src/anime_cli.rs
+++ b/asusctl/src/anime_cli.rs
@@ -1,54 +1,4 @@
 use gumdrop::Options;
-use rog_aura::error::Error;
-use std::str::FromStr;
-
-#[derive(Copy, Clone, Debug)]
-pub enum AnimeStatusValue {
-    On,
-    Off,
-}
-impl FromStr for AnimeStatusValue {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let s = s.to_lowercase();
-        match s.as_str() {
-            "on" => Ok(AnimeStatusValue::On),
-            "off" => Ok(AnimeStatusValue::Off),
-            _ => {
-                print!("Invalid argument, must be one of: on, off");
-                Err(Error::ParseAnime)
-            }
-        }
-    }
-}
-impl From<AnimeStatusValue> for bool {
-    fn from(value: AnimeStatusValue) -> Self {
-        match value {
-            AnimeStatusValue::On => true,
-            AnimeStatusValue::Off => false,
-        }
-    }
-}
-
-#[derive(Options)]
-pub struct AnimeLeds {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(
-        no_long,
-        required,
-        short = "b",
-        meta = "",
-        help = "set all leds brightness value"
-    )]
-    led_brightness: u8,
-}
-impl AnimeLeds {
-    pub fn led_brightness(&self) -> u8 {
-        self.led_brightness
-    }
-}

 #[derive(Options)]
 pub struct AnimeCommand {
@@ -56,21 +6,30 @@ pub struct AnimeCommand {
    pub help: bool,
    #[options(
        meta = "",
-        help = "turn on/off the panel (accept/reject write requests)"
+        help = "enable/disable the panel LEDs (does not erase last image)"
    )]
-    pub turn: Option<AnimeStatusValue>,
-    #[options(meta = "", help = "turn on/off the panel at boot (with Asus effect)")]
-    pub boot: Option<AnimeStatusValue>,
+    pub enable: Option<bool>,
+    #[options(
+        meta = "",
+        help = "enable/disable system animations (boot/sleep/shutdown)"
+    )]
+    pub boot_enable: Option<bool>,
+    #[options(meta = "", help = "set global AniMe brightness value")]
+    pub brightness: Option<f32>,
    #[options(command)]
    pub command: Option<AnimeActions>,
 }

 #[derive(Options)]
 pub enum AnimeActions {
-    #[options(help = "change all leds brightness")]
-    Leds(AnimeLeds),
-    #[options(help = "display an 8bit greyscale png")]
+    #[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),
 }

 #[derive(Options)]
@@ -90,3 +49,53 @@ pub struct AnimeImage {
    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
    pub bright: f32,
 }
+
+#[derive(Options)]
+pub struct AnimeImageDiagonal {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
+    pub path: String,
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    pub bright: f32,
+}
+
+#[derive(Options)]
+pub struct AnimeGif {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
+    pub path: String,
+    #[options(meta = "", default = "1.0", help = "scale 1.0 == normal")]
+    pub scale: f32,
+    #[options(meta = "", default = "0.0", help = "x position (float)")]
+    pub x_pos: f32,
+    #[options(meta = "", default = "0.0", help = "y position (float)")]
+    pub y_pos: f32,
+    #[options(meta = "", default = "0.0", help = "the angle in radians")]
+    pub angle: f32,
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    pub bright: f32,
+    #[options(
+        meta = "",
+        default = "1",
+        help = "how many loops to play - 0 is infinite"
+    )]
+    pub loops: u32,
+}
+
+#[derive(Options)]
+pub struct AnimeGifDiagonal {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(meta = "", help = "full path to the png to display")]
+    pub path: String,
+    #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
+    pub bright: f32,
+    #[options(
+        meta = "",
+        default = "1",
+        help = "how many loops to play - 0 is infinite"
+    )]
+    pub loops: u32,
+}
--- a/asusctl/src/cli_opts.rs
+++ b/asusctl/src/cli_opts.rs
@@ -0,0 +1,92 @@
+use crate::{
+    anime_cli::AnimeCommand,
+    aura_cli::{LedBrightness, SetAuraBuiltin},
+    profiles_cli::{FanCurveCommand, ProfileCommand},
+};
+use gumdrop::Options;
+
+#[derive(Default, 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(command)]
+    pub command: Option<CliCommand>,
+}
+
+#[derive(Options)]
+pub enum CliCommand {
+    #[options(help = "Set the keyboard lighting from built-in modes")]
+    LedMode(LedModeCommand),
+    #[options(help = "Set or select platform_profile")]
+    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(help = "Change bios settings")]
+    Bios(BiosCommand),
+}
+
+#[derive(Options)]
+pub struct LedModeCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(help = "switch to next aura mode")]
+    pub next_mode: bool,
+    #[options(help = "switch to previous aura mode")]
+    pub prev_mode: bool,
+    #[options(
+        meta = "",
+        help = "set the keyboard LED to enabled while the device is awake"
+    )]
+    pub awake_enable: Option<bool>,
+    #[options(
+        meta = "",
+        help = "set the keyboard LED suspend animation to enabled while the device is suspended"
+    )]
+    pub sleep_enable: Option<bool>,
+    #[options(command)]
+    pub command: Option<SetAuraBuiltin>,
+}
+
+#[derive(Options)]
+pub struct GraphicsCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+}
+
+#[derive(Options, Debug)]
+pub struct BiosCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+    #[options(
+        meta = "",
+        no_long,
+        help = "set bios POST sound: asusctl -p <true/false>"
+    )]
+    pub post_sound_set: Option<bool>,
+    #[options(no_long, help = "read bios POST sound")]
+    pub post_sound_get: bool,
+    #[options(
+        meta = "",
+        no_long,
+        help = "activate dGPU dedicated/G-Sync: asusctl -d <true/false>, reboot required"
+    )]
+    pub dedicated_gfx_set: Option<bool>,
+    #[options(no_long, help = "get GPU mode")]
+    pub dedicated_gfx_get: bool,
+}
--- a/asusctl/src/main.rs
+++ b/asusctl/src/main.rs
@@ -1,111 +1,30 @@
-mod anime_cli;
-mod aura_cli;
-mod profiles_cli;
+use std::process::Command;
+use std::thread::sleep;
+use std::{env::args, path::Path};

-use crate::aura_cli::{LedBrightness, SetAuraBuiltin};
-use anime_cli::{AnimeActions, AnimeCommand};
 use gumdrop::{Opt, Options};
-use profiles_cli::ProfileCommand;
-use rog_anime::{AnimeDataBuffer, AnimeImage, Vec2, ANIME_DATA_LEN};
+
+use anime_cli::{AnimeActions, AnimeCommand};
+use profiles_cli::{FanCurveCommand, ProfileCommand};
+use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, Vec2};
 use rog_aura::{self, AuraEffect};
 use rog_dbus::RogDbusClient;
-use rog_profiles::profiles::Profile;
-use rog_types::{
-    gfx_vendors::{GfxRequiredUserAction, GfxVendors},
-    supported::{
-        FanCpuSupportedFunctions, LedSupportedFunctions, RogBiosSupportedFunctions,
-    },
+use rog_profiles::error::ProfileError;
+use rog_supported::SupportedFunctions;
+use rog_supported::{
+    AnimeSupportedFunctions, LedSupportedFunctions, PlatformProfileFunctions,
+    RogBiosSupportedFunctions,
 };
-use std::{env::args, path::Path};
-use yansi_term::Colour::Green;
-use yansi_term::Colour::Red;

-#[derive(Default, Options)]
-struct CliStart {
-    #[options(help_flag, help = "print help message")]
-    help: bool,
-    #[options(help = "show program version number")]
-    version: bool,
-    #[options(help = "show supported functions of this laptop")]
-    show_supported: bool,
-    #[options(meta = "", help = "<off, low, med, high>")]
-    kbd_bright: Option<LedBrightness>,
-    #[options(meta = "", help = "<20-100>")]
-    chg_limit: Option<u8>,
-    #[options(command)]
-    command: Option<CliCommand>,
-}
+use crate::aura_cli::{LedBrightness, SetAuraBuiltin};
+use crate::cli_opts::*;

-#[derive(Options)]
-enum CliCommand {
-    #[options(help = "Set the keyboard lighting from built-in modes")]
-    LedMode(LedModeCommand),
-    #[options(help = "Create and configure profiles")]
-    Profile(ProfileCommand),
-    #[options(help = "Set the graphics mode")]
-    Graphics(GraphicsCommand),
-    #[options(name = "anime", help = "Manage AniMe Matrix")]
-    Anime(AnimeCommand),
-    #[options(help = "Change bios settings")]
-    Bios(BiosCommand),
-}
+mod anime_cli;
+mod aura_cli;
+mod cli_opts;
+mod profiles_cli;

-#[derive(Options)]
-struct LedModeCommand {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(help = "switch to next aura mode")]
-    next_mode: bool,
-    #[options(help = "switch to previous aura mode")]
-    prev_mode: bool,
-    #[options(
-        meta = "",
-        help = "set the keyboard LED to enabled while the device is awake"
-    )]
-    awake_enable: Option<bool>,
-    #[options(
-        meta = "",
-        help = "set the keyboard LED suspend animation to enabled while the device is suspended"
-    )]
-    sleep_enable: Option<bool>,
-    #[options(command)]
-    command: Option<SetAuraBuiltin>,
-}
-
-#[derive(Options)]
-struct GraphicsCommand {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(
-        meta = "",
-        help = "Set graphics mode: <nvidia, hybrid, compute, integrated>"
-    )]
-    mode: Option<GfxVendors>,
-    #[options(help = "Get the current mode")]
-    get: bool,
-    #[options(help = "Get the current power status")]
-    pow: bool,
-    #[options(help = "Do not ask for confirmation")]
-    force: bool,
-}
-
-#[derive(Options, Debug)]
-struct BiosCommand {
-    #[options(help = "print help message")]
-    help: bool,
-    #[options(meta = "", no_long, help = "set bios POST sound <true/false>")]
-    post_sound_set: Option<bool>,
-    #[options(no_long, help = "read bios POST sound")]
-    post_sound_get: bool,
-    #[options(
-        meta = "",
-        no_long,
-        help = "activate dGPU dedicated/G-Sync <true/false>"
-    )]
-    dedicated_gfx_set: Option<bool>,
-    #[options(no_long, help = "get GPU mode")]
-    dedicated_gfx_get: bool,
-}
+const CONFIG_ADVICE: &str = "A config file need to be removed so a new one can be generated";

 fn main() -> Result<(), Box<dyn std::error::Error>> {
    let args: Vec<String> = args().skip(1).collect();
@@ -128,92 +47,131 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
        }
    }

-    let (dbus, _) = RogDbusClient::new()?;
+    let (dbus, _) = RogDbusClient::new()
+        .map_err(|e| {
+            print_error_help(Box::new(e), None);
+            std::process::exit(3);
+        })
+        .unwrap();

-    let supported = dbus.proxies().supported().get_supported_functions()?;
+    let supported = dbus
+        .proxies()
+        .supported()
+        .get_supported_functions()
+        .map_err(|e| {
+            print_error_help(Box::new(e), None);
+            std::process::exit(4);
+        })
+        .unwrap();

    if parsed.version {
-        println!("\nApp and daemon versions:");
-        println!("     asusctl v{}", env!("CARGO_PKG_VERSION"));
-        println!("       asusd v{}", daemon::VERSION);
-        println!("\nComponent crate versions:");
-        println!("   rog-anime v{}", rog_anime::VERSION);
-        println!("    rog-aura v{}", rog_aura::VERSION);
-        println!("    rog-dbus v{}", rog_dbus::VERSION);
-        println!("rog-profiles v{}", rog_profiles::VERSION);
-        println!("   rog-types v{}", rog_types::VERSION);
+        print_versions();
+        println!();
+        print_laptop_info();
        return Ok(());
    }

-    match parsed.command {
-        Some(CliCommand::LedMode(mode)) => handle_led_mode(&dbus, &supported.keyboard_led, &mode)?,
-        Some(CliCommand::Profile(cmd)) => handle_profile(&dbus, &supported.fan_cpu_ctrl, &cmd)?,
-        Some(CliCommand::Graphics(cmd)) => do_gfx(&dbus, &supported.rog_bios_ctrl, cmd)?,
-        Some(CliCommand::Anime(cmd)) => {
-            if (cmd.command.is_none() && cmd.boot.is_none() && cmd.turn.is_none()) || cmd.help {
-                println!("Missing arg or command\n\n{}", cmd.self_usage());
-                if let Some(lst) = cmd.self_command_list() {
-                    println!("\n{}", lst);
-                }
-            }
-            if let Some(anime_turn) = cmd.turn {
-                dbus.proxies().anime().set_led_power(anime_turn.into())?
-            }
-            if let Some(anime_boot) = cmd.boot {
-                dbus.proxies()
-                    .anime()
-                    .set_system_animations(anime_boot.into())?
-            }
-            if let Some(action) = cmd.command {
-                match action {
-                    AnimeActions::Leds(anime_leds) => {
-                        let data = AnimeDataBuffer::from_vec(
-                            [anime_leds.led_brightness(); ANIME_DATA_LEN].to_vec(),
-                        );
-                        dbus.proxies().anime().write(data)?;
-                    }
-                    AnimeActions::Image(image) => {
-                        if image.help_requested() {
-                            println!("Missing arg or command\n\n{}", image.self_usage());
-                            if let Some(lst) = image.self_command_list() {
-                                println!("\n{}", lst);
-                            }
-                            std::process::exit(1);
-                        }
+    if let Err(err) = do_parsed(&parsed, &supported, &dbus) {
+        print_error_help(err, Some(&supported));
+    }

-                        let matrix = AnimeImage::from_png(
-                            Path::new(&image.path),
-                            image.scale,
-                            image.angle,
-                            Vec2::new(image.x_pos, image.y_pos),
-                            image.bright,
-                        )?;
+    Ok(())
+}

-                        dbus.proxies()
-                            .anime()
-                            .write(<AnimeDataBuffer>::from(&matrix))
-                            .unwrap();
-                    }
-                }
-            }
+fn print_error_help(err: Box<dyn std::error::Error>, supported: Option<&SupportedFunctions>) {
+    if do_diagnose("asusd") {
+        println!("\nError: {}\n", err);
+        print_versions();
+        println!();
+        print_laptop_info();
+        if let Some(supported) = supported {
+            println!();
+            println!("Supported laptop functions:\n\n{}", supported);
        }
-        Some(CliCommand::Bios(cmd)) => handle_bios_option(&dbus, &supported.rog_bios_ctrl, &cmd)?,
+    }
+}
+
+fn print_versions() {
+    println!("App and daemon versions:");
+    println!("      asusctl v{}", env!("CARGO_PKG_VERSION"));
+    println!("        asusd v{}", daemon::VERSION);
+    println!("\nComponent crate versions:");
+    println!("    rog-anime v{}", rog_anime::VERSION);
+    println!("     rog-aura v{}", rog_aura::VERSION);
+    println!("     rog-dbus v{}", rog_dbus::VERSION);
+    println!(" rog-profiles v{}", rog_profiles::VERSION);
+    println!("rog-supported v{}", rog_supported::VERSION);
+}
+
+fn print_laptop_info() {
+    let dmi = sysfs_class::DmiId::default();
+    let board_name = dmi.board_name().expect("Could not get board_name");
+    let prod_family = dmi.product_family().expect("Could not get product_family");
+
+    println!("Product family: {}", prod_family.trim());
+    println!("Board name: {}", board_name.trim());
+}
+
+fn do_diagnose(name: &str) -> bool {
+    if name != "asusd" && !check_systemd_unit_enabled(name) {
+        println!(
+            "\n\x1b[0;31m{} is not enabled, enable it with `systemctl enable {}\x1b[0m",
+            name, name
+        );
+        return true;
+    } else if !check_systemd_unit_active(name) {
+        println!(
+            "\n\x1b[0;31m{} is not running, start it with `systemctl start {}\x1b[0m",
+            name, name
+        );
+        return true;
+    } else {
+        println!("\nSome error happened (sorry)");
+        println!(
+            "Please use `systemctl status {}` and `journalctl -b -u {}` for more information",
+            name, name
+        );
+        println!("{}", CONFIG_ADVICE);
+    }
+    false
+}
+
+fn do_parsed(
+    parsed: &CliStart,
+    supported: &SupportedFunctions,
+    dbus: &RogDbusClient,
+) -> Result<(), Box<dyn std::error::Error>> {
+    match &parsed.command {
+        Some(CliCommand::LedMode(mode)) => handle_led_mode(dbus, &supported.keyboard_led, mode)?,
+        Some(CliCommand::Profile(cmd)) => handle_profile(dbus, &supported.platform_profile, cmd)?,
+        Some(CliCommand::FanCurve(cmd)) => {
+            handle_fan_curve(dbus, &supported.platform_profile, cmd)?
+        }
+        Some(CliCommand::Graphics(_)) => do_gfx()?,
+        Some(CliCommand::Anime(cmd)) => handle_anime(dbus, &supported.anime_ctrl, cmd)?,
+        Some(CliCommand::Bios(cmd)) => handle_bios_option(dbus, &supported.rog_bios_ctrl, cmd)?,
        None => {
-            if (!parsed.show_supported && parsed.kbd_bright.is_none() && parsed.chg_limit.is_none())
+            if (!parsed.show_supported
+                && parsed.kbd_bright.is_none()
+                && parsed.chg_limit.is_none()
+                && !parsed.next_kbd_bright
+                && !parsed.prev_kbd_bright)
                || parsed.help
            {
                println!("{}", CliStart::usage());
                println!();
-                println!("{}", CliStart::command_list().unwrap());
+                if let Some(cmdlist) = CliStart::command_list() {
+                    println!("{}", cmdlist);
+                }
            }
        }
    }

-    if let Some(brightness) = parsed.kbd_bright {
+    if let Some(brightness) = &parsed.kbd_bright {
        match brightness.level() {
            None => {
                let level = dbus.proxies().led().get_led_brightness()?;
-                println!("Current keyboard led brightness: {}", level.to_string());
+                println!("Current keyboard led brightness: {}", level);
            }
            Some(level) => dbus
                .proxies()
@@ -222,6 +180,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
        }
    }

+    if parsed.next_kbd_bright {
+        dbus.proxies().led().next_led_brightness()?;
+    }
+
+    if parsed.prev_kbd_bright {
+        dbus.proxies().led().prev_led_brightness()?;
+    }
+
    if parsed.show_supported {
        println!("Supported laptop functions:\n\n{}", supported);
    }
@@ -233,60 +199,136 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
    Ok(())
 }

-fn do_gfx(
+fn do_gfx() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Please use supergfxctl for graphics switching. supergfxctl is the result of making asusctl graphics switching generic so all laptops can use it");
+    println!("This command will be removed in future");
+    Ok(())
+}
+
+fn handle_anime(
    dbus: &RogDbusClient,
-    supported: &RogBiosSupportedFunctions,
-    command: GraphicsCommand,
+    _supported: &AnimeSupportedFunctions,
+    cmd: &AnimeCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    if command.mode.is_none() && !command.get && !command.pow && !command.force || command.help {
-        println!("{}", command.self_usage());
-    }
-
-    if let Some(mode) = command.mode {
-        if supported.dedicated_gfx_toggle && dbus.proxies().rog_bios().get_dedicated_gfx()? == 1 {
-            println!("You can not change modes until you turn dedicated/G-Sync off and reboot");
-            std::process::exit(-1);
+    if (cmd.command.is_none()
+        && cmd.enable.is_none()
+        && cmd.boot_enable.is_none()
+        && cmd.brightness.is_none())
+        || cmd.help
+    {
+        println!("Missing arg or command\n\n{}", cmd.self_usage());
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
        }
-
-        println!("If anything fails check `journalctl -b -u asusd`\n");
-
-        dbus.proxies().gfx().gfx_write_mode(&mode).map_err(|err|{
-            println!("Graphics mode change error. You may be in an invalid state.");
-            println!("Check mode with `asusctl graphics -g` and switch to opposite\nmode to correct it, e.g: if integrated, switch to hybrid, or if nvidia, switch to integrated.\n");
-            err
-        })?;
-        let res = dbus.gfx_wait_changed()?;
-        match res {
-            GfxRequiredUserAction::Integrated => {
-                println!(
-                    "You must change to Integrated before you can change to {}",
-                    <&str>::from(mode)
-                );
-            }
-            GfxRequiredUserAction::Logout | GfxRequiredUserAction::Reboot => {
-                println!(
-                    "Graphics mode changed to {}. User action required is: {}",
-                    <&str>::from(mode),
-                    <&str>::from(&res)
-                );
-            }
-            GfxRequiredUserAction::None => {
-                println!("Graphics mode changed to {}", <&str>::from(mode));
-            }
-        }
-        std::process::exit(0)
    }
-    if command.get {
-        let res = dbus.proxies().gfx().gfx_get_mode()?;
-        println!("Current graphics mode: {}", <&str>::from(res));
+    if let Some(anime_turn) = cmd.enable {
+        dbus.proxies().anime().set_on_off(anime_turn)?
    }
-    if command.pow {
-        let res = dbus.proxies().gfx().gfx_get_pwr()?;
-        match res {
-            rog_types::gfx_vendors::GfxPower::Active => {
-                println!("Current power status: {}", Red.paint(<&str>::from(&res)))
+    if let Some(anime_boot) = cmd.boot_enable {
+        dbus.proxies().anime().set_boot_on_off(anime_boot)?
+    }
+    if let Some(bright) = cmd.brightness {
+        dbus.proxies().anime().set_brightness(bright as f32)?
+    }
+    if let Some(action) = cmd.command.as_ref() {
+        match action {
+            AnimeActions::Image(image) => {
+                if image.help_requested() || image.path.is_empty() {
+                    println!("Missing arg or command\n\n{}", image.self_usage());
+                    if let Some(lst) = image.self_command_list() {
+                        println!("\n{}", lst);
+                    }
+                    std::process::exit(1);
+                }
+
+                let matrix = AnimeImage::from_png(
+                    Path::new(&image.path),
+                    image.scale,
+                    image.angle,
+                    Vec2::new(image.x_pos, image.y_pos),
+                    image.bright,
+                )?;
+
+                dbus.proxies()
+                    .anime()
+                    .write(<AnimeDataBuffer>::from(&matrix))?;
+            }
+            AnimeActions::PixelImage(image) => {
+                if image.help_requested() || image.path.is_empty() {
+                    println!("Missing arg or command\n\n{}", image.self_usage());
+                    if let Some(lst) = image.self_command_list() {
+                        println!("\n{}", lst);
+                    }
+                    std::process::exit(1);
+                }
+
+                let matrix = AnimeDiagonal::from_png(Path::new(&image.path), None, image.bright)?;
+
+                dbus.proxies()
+                    .anime()
+                    .write(<AnimeDataBuffer>::from(&matrix))?;
+            }
+            AnimeActions::Gif(gif) => {
+                if gif.help_requested() || gif.path.is_empty() {
+                    println!("Missing arg or command\n\n{}", gif.self_usage());
+                    if let Some(lst) = gif.self_command_list() {
+                        println!("\n{}", lst);
+                    }
+                    std::process::exit(1);
+                }
+
+                let matrix = AnimeGif::from_gif(
+                    Path::new(&gif.path),
+                    gif.scale,
+                    gif.angle,
+                    Vec2::new(gif.x_pos, gif.y_pos),
+                    AnimTime::Count(1),
+                    gif.bright,
+                )?;
+
+                let mut loops = gif.loops as i32;
+                loop {
+                    for frame in matrix.frames() {
+                        dbus.proxies().anime().write(frame.frame().clone())?;
+                        sleep(frame.delay());
+                    }
+                    if loops >= 0 {
+                        loops -= 1;
+                    }
+                    if loops == 0 {
+                        break;
+                    }
+                }
+            }
+            AnimeActions::PixelGif(gif) => {
+                if gif.help_requested() || gif.path.is_empty() {
+                    println!("Missing arg or command\n\n{}", gif.self_usage());
+                    if let Some(lst) = gif.self_command_list() {
+                        println!("\n{}", lst);
+                    }
+                    std::process::exit(1);
+                }
+
+                let matrix = AnimeGif::from_diagonal_gif(
+                    Path::new(&gif.path),
+                    AnimTime::Count(1),
+                    gif.bright,
+                )?;
+
+                let mut loops = gif.loops as i32;
+                loop {
+                    for frame in matrix.frames() {
+                        dbus.proxies().anime().write(frame.frame().clone())?;
+                        sleep(frame.delay());
+                    }
+                    if loops >= 0 {
+                        loops -= 1;
+                    }
+                    if loops == 0 {
+                        break;
+                    }
+                }
            }
-            _ => println!("Current power status: {}", Green.paint(<&str>::from(&res))),
        }
    }
    Ok(())
@@ -309,23 +351,21 @@ fn handle_led_mode(
        println!("{}\n", mode.self_usage());
        println!("Commands available");

-        let commands: Vec<String> = LedModeCommand::command_list()
-            .unwrap()
-            .lines()
-            .map(|s| s.to_string())
-            .collect();
-        for command in commands.iter().filter(|command| {
-            for mode in &supported.stock_led_modes {
-                if command.contains(&<&str>::from(mode).to_lowercase()) {
+        if let Some(cmdlist) = LedModeCommand::command_list() {
+            let commands: Vec<String> = cmdlist.lines().map(|s| s.to_string()).collect();
+            for command in commands.iter().filter(|command| {
+                for mode in &supported.stock_led_modes {
+                    if command.contains(&<&str>::from(mode).to_lowercase()) {
+                        return true;
+                    }
+                }
+                if supported.multizone_led_mode {
                    return true;
                }
+                false
+            }) {
+                println!("{}", command);
            }
-            if supported.multizone_led_mode {
-                return true;
-            }
-            false
-        }) {
-            println!("{}", command);
        }

        println!("\nHelp can also be requested on modes, e.g: static --help");
@@ -372,118 +412,104 @@ fn handle_led_mode(

 fn handle_profile(
    dbus: &RogDbusClient,
-    supported: &FanCpuSupportedFunctions,
+    supported: &PlatformProfileFunctions,
    cmd: &ProfileCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    if !cmd.next
-        && !cmd.create // TODO
-        && !cmd.list
-        && cmd.profile.is_none()
-        && !cmd.active_name
-        && !cmd.active_data
-        && !cmd.profiles_data
-        && cmd.remove.is_none()
-        && cmd.curve.is_none() // TODO
-        && cmd.fan_preset.is_none() // TODO
-        && cmd.turbo.is_none() // TODO
-        && cmd.max_percentage.is_none() // TODO
-        && cmd.min_percentage.is_none()
-    // TODO
-    {
+    if !supported.platform_profile {
+        println!("Profiles not supported by either this kernel or by the laptop.");
+        return Err(ProfileError::NotSupported.into());
+    }
+
+    if !cmd.next && !cmd.list && cmd.profile_set.is_none() && !cmd.profile_get {
        if !cmd.help {
            println!("Missing arg or command\n");
        }
-        let usage: Vec<String> = ProfileCommand::usage()
-            .lines()
-            .map(|s| s.to_string())
-            .collect();
-        for line in usage
-            .iter()
-            .filter(|line| !line.contains("--curve") || supported.fan_curve_set)
-        {
-            println!("{}", line);
-        }
+        println!("{}", ProfileCommand::usage());

        if let Some(lst) = cmd.self_command_list() {
            println!("\n{}", lst);
        }
-
-        println!("Note: turbo, frequency, fan preset and fan curve options will apply to");
-        println!("      to the currently active profile unless a profile name is specified");
        std::process::exit(1);
    }

    if cmd.next {
-        dbus.proxies().profile().next_fan()?;
-    }
-    if let Some(profile) = &cmd.remove {
-        dbus.proxies().profile().remove(profile)?
+        dbus.proxies().profile().next_profile()?;
+    } else if let Some(profile) = cmd.profile_set {
+        dbus.proxies().profile().set_active_profile(profile)?;
    }
+
    if cmd.list {
-        let profile_names = dbus.proxies().profile().profile_names()?;
-        println!("Available profiles are {:?}", profile_names);
+        let res = dbus.proxies().profile().profiles()?;
+        res.iter().for_each(|p| println!("{:?}", p));
    }
-    if cmd.active_name {
+
+    if cmd.profile_get {
+        let res = dbus.proxies().profile().active_profile()?;
+        println!("Active profile is {:?}", res);
+    }
+
+    Ok(())
+}
+
+fn handle_fan_curve(
+    dbus: &RogDbusClient,
+    supported: &PlatformProfileFunctions,
+    cmd: &FanCurveCommand,
+) -> Result<(), Box<dyn std::error::Error>> {
+    if !supported.fan_curves {
+        println!("Fan-curves not supported by either this kernel or by the laptop.");
        println!(
-            "Active profile: {:?}",
-            dbus.proxies().profile().active_name()?
+            "This requires kernel 5.17 (unlreleased) or the fan curve patch listed in the readme."
        );
-    }
-    if cmd.active_data {
-        println!("Active profile:");
-        println!("{:?}", dbus.proxies().profile().active_data()?);
-    }
-    if cmd.profiles_data {
-        println!("Profiles:");
-        for s in dbus.proxies().profile().all_profile_data()? {
-            println!("{:?}", s);
-        }
+        return Err(ProfileError::NotSupported.into());
    }

-    let mut set_profile = false;
-    let mut profile = Profile::default();
-    if cmd.create {
-        set_profile = true;
-    } else if let Some(ref name) = cmd.profile {
-        let profiles = dbus.proxies().profile().all_profile_data()?;
-        for p in profiles {
-            if p.name == *name {
-                profile = p;
-                break;
-            }
+    if !cmd.get_enabled && !cmd.default && cmd.mod_profile.is_none() {
+        if !cmd.help {
+            println!("Missing arg or command\n");
        }
-        if profile.name != *name {
-            println!("The requested profile doesn't exist, you may need to create it");
-            std::process::exit(-1);
+        println!("{}", FanCurveCommand::usage());
+
+        if let Some(lst) = cmd.self_command_list() {
+            println!("\n{}", lst);
        }
+        std::process::exit(1);
    }

-    if let Some(turbo) = cmd.turbo {
-        set_profile = true;
-        profile.turbo = turbo;
+    if (cmd.enabled.is_some() || cmd.fan.is_some() || cmd.data.is_some())
+        && cmd.mod_profile.is_none()
+    {
+        println!("--enabled, --fan, and --data options require --mod-profile");
+        std::process::exit(666);
    }
-    if let Some(min) = cmd.min_percentage {
-        set_profile = true;
-        profile.min_percentage = min;
+
+    if cmd.get_enabled {
+        let res = dbus.proxies().profile().enabled_fan_profiles()?;
+        println!("{:?}", res);
    }
-    if let Some(max) = cmd.max_percentage {
-        set_profile = true;
-        profile.max_percentage = max;
+
+    if cmd.default {
+        dbus.proxies().profile().set_active_curve_to_defaults()?;
    }
-    if let Some(preset) = cmd.fan_preset {
-        set_profile = true;
-        profile.fan_preset = preset;
-    }
-    if let Some(ref curve) = cmd.curve {
-        set_profile = true;
-        profile.fan_curve = curve.as_config_string();
-    }
-    if let Some(ref name) = cmd.profile {
-        set_profile = true;
-        profile.name = name.clone();
-    }
-    if set_profile {
-        dbus.proxies().profile().new_or_modify(&profile)?;
+
+    if let Some(profile) = cmd.mod_profile {
+        if cmd.enabled.is_none() && cmd.data.is_none() {
+            let data = dbus.proxies().profile().fan_curve_data(profile)?;
+            let data = toml::to_string(&data)?;
+            println!("\nFan curves for {:?}\n\n{}", profile, data);
+        }
+
+        if let Some(enabled) = cmd.enabled {
+            dbus.proxies()
+                .profile()
+                .set_fan_curve_enabled(profile, enabled)?;
+        }
+
+        if let Some(mut curve) = cmd.data.clone() {
+            let fan = cmd.fan.unwrap_or_default();
+            curve.set_fan(fan);
+            dbus.proxies().profile().set_fan_curve(curve, profile)?;
+        }
    }

    Ok(())
@@ -509,8 +535,8 @@ fn handle_bios_option(
                .collect();

            for line in usage.iter().filter(|line| {
-                !line.contains("sound") && !supported.post_sound_toggle
-                    || !line.contains("GPU") && !supported.dedicated_gfx_toggle
+                line.contains("sound") && supported.post_sound_toggle
+                    || line.contains("GPU") && supported.dedicated_gfx_toggle
            }) {
                println!("{}", line);
            }
@@ -542,3 +568,27 @@ fn handle_bios_option(
    }
    Ok(())
 }
+
+fn check_systemd_unit_active(name: &str) -> bool {
+    if let Ok(out) = Command::new("systemctl")
+        .arg("is-active")
+        .arg(name)
+        .output()
+    {
+        let buf = String::from_utf8_lossy(&out.stdout);
+        return !buf.contains("inactive") && !buf.contains("failed");
+    }
+    false
+}
+
+fn check_systemd_unit_enabled(name: &str) -> bool {
+    if let Ok(out) = Command::new("systemctl")
+        .arg("is-enabled")
+        .arg(name)
+        .output()
+    {
+        let buf = String::from_utf8_lossy(&out.stdout);
+        return buf.contains("enabled");
+    }
+    false
+}
--- a/asusctl/src/profiles_cli.rs
+++ b/asusctl/src/profiles_cli.rs
@@ -1,6 +1,5 @@
 use gumdrop::Options;
-use rog_fan_curve::{Curve, Fan};
-use rog_profiles::profiles::FanLevel;
+use rog_profiles::{fan_curve_set::CurveData, FanCurvePU, Profile};

 #[derive(Debug, Clone, Options)]
 pub struct ProfileCommand {
@@ -8,46 +7,45 @@ pub struct ProfileCommand {
    pub help: bool,
    #[options(help = "toggle to next profile in list")]
    pub next: bool,
-    #[options(help = "create the profile if it doesn't exist")]
-    pub create: bool,
-    #[options(meta = "", help = "remove a profile by name")]
-    pub remove: Option<String>,
    #[options(help = "list available profiles")]
    pub list: bool,
-    #[options(help = "get active profile name")]
-    pub active_name: bool,
-    #[options(help = "get active profile data")]
-    pub active_data: bool,
-    #[options(help = "get all profile data")]
-    pub profiles_data: bool,

-    // Options for profile
-    #[options(meta = "", help = "enable or disable cpu turbo")]
-    pub turbo: Option<bool>,
-    #[options(meta = "", help = "set min cpu scaling (intel)")]
-    pub min_percentage: Option<u8>,
-    #[options(meta = "", help = "set max cpu scaling (intel)")]
-    pub max_percentage: Option<u8>,
+    #[options(help = "get profile")]
+    pub profile_get: bool,
+    #[options(meta = "", help = "set the active profile")]
+    pub profile_set: Option<Profile>,
+}
+
+#[derive(Debug, Clone, Options)]
+pub struct FanCurveCommand {
+    #[options(help = "print help message")]
+    pub help: bool,
+
+    #[options(help = "get enabled fan profiles")]
+    pub get_enabled: bool,
+    #[options(help = "set the active profile's fan curve to default")]
+    pub default: bool,

-    #[options(meta = "", help = "<silent, normal, boost>")]
-    pub fan_preset: Option<FanLevel>,
    #[options(
        meta = "",
-        parse(try_from_str = "parse_fan_curve"),
-        help = "set fan curve"
+        help = "profile to modify fan-curve for. Shows data if no options provided"
    )]
-    pub curve: Option<Curve>,
-    #[options(free)]
-    pub profile: Option<String>,
-}
+    pub mod_profile: Option<Profile>,
+    #[options(
+        meta = "",
+        help = "enable or disable <true/false> fan curve. `mod-profile` required"
+    )]
+    pub enabled: Option<bool>,
+    #[options(
+        meta = "",
+        help = "select fan <cpu/gpu> to modify. `mod-profile` required"
+    )]
+    pub fan: Option<FanCurvePU>,

-fn parse_fan_curve(data: &str) -> Result<Curve, String> {
-    let curve = Curve::from_config_str(data)?;
-    if let Err(err) = curve.check_safety(Fan::Cpu) {
-        return Err(format!("Unsafe curve {:?}", err));
-    }
-    if let Err(err) = curve.check_safety(Fan::Gpu) {
-        return Err(format!("Unsafe curve {:?}", err));
-    }
-    Ok(curve)
+    #[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"
+    )]
+    pub data: Option<CurveData>,
 }
--- a/daemon-user/Cargo.toml
+++ b/daemon-user/Cargo.toml
@@ -21,7 +21,7 @@ serde_derive = "^1.0"

 rog_anime = { path = "../rog-anime" }
 rog_dbus = { path = "../rog-dbus" }
-rog_types = { path = "../rog-types" }
+rog_supported = { path = "../rog-supported" }

 dirs = "3.0.1"

--- a/daemon-user/src/ctrl_anime.rs
+++ b/daemon-user/src/ctrl_anime.rs
@@ -1,3 +1,4 @@
+use rog_anime::error::AnimeError;
 use rog_anime::{ActionData, ActionLoader, AnimTime, Fade, Sequences, Vec2};
 use rog_dbus::RogDbusClient;
 use serde_derive::{Deserialize, Serialize};
@@ -91,16 +92,19 @@ impl<'a> CtrlAnimeInner<'static> {
            match action {
                ActionData::Animation(frames) => {
                    rog_anime::run_animation(frames, self.do_early_return.clone(), &|output| {
-                        self.client.proxies().anime().write(output).unwrap()
-                    })
-                    .unwrap();
+                        self.client
+                            .proxies()
+                            .anime()
+                            .write(output)
+                            .map_err(|e| AnimeError::Dbus(format!("{}", e)))
+                    })?;
                }
                ActionData::Image(image) => {
                    self.client
                        .proxies()
                        .anime()
                        .write(image.as_ref().clone())
-                        .unwrap();
+                        .ok();
                }
                ActionData::Pause(duration) => {
                    let start = Instant::now();
@@ -261,12 +265,12 @@ impl CtrlAnime<'static> {
        scale: f32,
        angle: f32,
        xy: (f32, f32),
-        time: Option<Timer>,
+        time: Timer,
        brightness: f32,
    ) -> zbus::fdo::Result<String> {
        if let Ok(mut config) = self.config.try_lock() {
            let file = Path::new(&file);
-            let time = time.map(|time| time.into());
+            let time = time.into();
            let action = ActionLoader::Image {
                file: file.into(),
                scale,
@@ -349,13 +353,13 @@ impl CtrlAnime<'static> {
    pub fn set_state(&mut self, on: bool) -> zbus::fdo::Result<()> {
        // Operations here need to be in specific order
        if on {
-            self.client.proxies().anime().set_led_power(on)?;
+            self.client.proxies().anime().set_on_off(on)?;
            // Let the inner loop run
            self.inner_early_return.store(false, Ordering::SeqCst);
        } else {
            // Must make the inner run loop return early
            self.inner_early_return.store(true, Ordering::SeqCst);
-            self.client.proxies().anime().set_led_power(on)?;
+            self.client.proxies().anime().set_on_off(on)?;
        }
        Ok(())
    }
--- a/daemon-user/src/daemon.rs
+++ b/daemon-user/src/daemon.rs
@@ -12,12 +12,12 @@ use zbus::{fdo, Connection};
 use std::sync::atomic::AtomicBool;

 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    println!(" user daemon v{}", rog_user::VERSION);
-    println!("   rog-anime v{}", rog_anime::VERSION);
-    println!("    rog-dbus v{}", rog_dbus::VERSION);
-    println!("   rog-types v{}", rog_types::VERSION);
+    println!("  user daemon v{}", rog_user::VERSION);
+    println!("    rog-anime v{}", rog_anime::VERSION);
+    println!("     rog-dbus v{}", rog_dbus::VERSION);
+    println!("rog-supported v{}", rog_supported::VERSION);

-    let (client, _) = RogDbusClient::new().unwrap();
+    let (client, _) = RogDbusClient::new()?;
    let supported = client.proxies().supported().get_supported_functions()?;

    let mut config = UserConfig::new();
@@ -44,7 +44,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
            early_return.clone(),
        )?));
        // Need new client object for dbus control part
-        let (client, _) = RogDbusClient::new().unwrap();
+        let (client, _) = RogDbusClient::new()?;
        let anime_control = CtrlAnime::new(anime_config, inner.clone(), client, early_return)?;
        anime_control.add_to_server(&mut server);
        // Thread using inner
@@ -52,7 +52,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
            .name("Anime User".into())
            .spawn(move || loop {
                if let Ok(inner) = inner.try_lock() {
-                    inner.run().unwrap();
+                    inner.run().ok();
                }
            })?;
    }
--- a/daemon-user/src/user_config.rs
+++ b/daemon-user/src/user_config.rs
@@ -95,6 +95,15 @@ impl Default for UserAnimeConfig {
        Self {
            name: "default".to_string(),
            anime: vec![
+                ActionLoader::AsusImage {
+                    file: "/usr/share/asusd/anime/custom/diagonal-template.png".into(),
+                    brightness: 1.0,
+                    time: AnimTime::Fade(Fade::new(
+                        Duration::from_secs(2),
+                        None,
+                        Duration::from_secs(2),
+                    )),
+                },
                ActionLoader::AsusAnimation {
                    file: "/usr/share/asusd/anime/asus/rog/Sunset.gif".into(),
                    brightness: 0.5,
@@ -121,11 +130,11 @@ impl Default for UserAnimeConfig {
                    scale: 1.0,
                    angle: 0.0,
                    translation: Vec2::default(),
-                    time: Some(AnimTime::Fade(Fade::new(
+                    time: AnimTime::Fade(Fade::new(
                        Duration::from_secs(2),
                        Some(Duration::from_secs(1)),
                        Duration::from_secs(2),
-                    ))),
+                    )),
                    brightness: 0.6,
                },
                ActionLoader::Pause(Duration::from_secs(1)),
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "daemon"
-version = "3.7.2"
+version = "4.0.7"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -20,7 +20,7 @@ path = "src/daemon.rs"
 [dependencies]
 rog_anime = { path = "../rog-anime" }
 rog_aura = { path = "../rog-aura" }
-rog_types = { path = "../rog-types" }
+rog_supported = { path = "../rog-supported" }
 rog_profiles = { path = "../rog-profiles" }
 rog_dbus = { path = "../rog-dbus" }
 rusb = "^0.8"
@@ -39,8 +39,7 @@ logind-zbus = "^0.7.1"
 serde = "^1.0"
 serde_derive = "^1.0"
 serde_json = "^1.0"
-toml = "^0.5"
+toml = "^0.5.8"

 # Device control
 sysfs-class = "^0.1.2" # used for backlight control and baord ID
-rog_fan_curve = { version = "0.1", features = ["serde"] }
--- a/daemon/src/config.rs
+++ b/daemon/src/config.rs
@@ -1,85 +1,23 @@
-use log::{error, info, warn};
-use rog_profiles::profiles::{FanLevel, Profile};
-use rog_types::gfx_vendors::GfxVendors;
+use log::{error, warn};
 use serde_derive::{Deserialize, Serialize};
-use std::collections::BTreeMap;
 use std::fs::{File, OpenOptions};
 use std::io::{Read, Write};

-use crate::config_old::*;
-use crate::VERSION;
-
 pub static CONFIG_PATH: &str = "/etc/asusd/asusd.conf";
-pub static AURA_CONFIG_PATH: &str = "/etc/asusd/asusd.conf";

 #[derive(Deserialize, Serialize)]
 pub struct Config {
-    pub gfx_mode: GfxVendors,
-    /// Only for informational purposes.
-    #[serde(skip)]
-    pub gfx_tmp_mode: Option<GfxVendors>,
-    pub gfx_managed: bool,
-    pub gfx_vfio_enable: bool,
-    pub active_profile: String,
-    pub toggle_profiles: Vec<String>,
-    #[serde(skip)]
-    pub curr_fan_mode: u8,
+    /// Save charge limit for restoring on boot
    pub bat_charge_limit: u8,
-    pub power_profiles: BTreeMap<String, Profile>,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        let mut pwr = BTreeMap::new();
-        pwr.insert(
-            "normal".into(),
-            Profile::new(
-                "normal".into(),
-                0,
-                100,
-                true,
-                FanLevel::Normal,
-                "".to_string(),
-            ),
-        );
-        pwr.insert(
-            "boost".into(),
-            Profile::new(
-                "boost".into(),
-                0,
-                100,
-                true,
-                FanLevel::Boost,
-                "".to_string(),
-            ),
-        );
-        pwr.insert(
-            "silent".into(),
-            Profile::new(
-                "silent".into(),
-                0,
-                100,
-                false,
-                FanLevel::Silent,
-                "".to_string(),
-            ),
-        );
-
-        Config {
-            gfx_mode: GfxVendors::Hybrid,
-            gfx_tmp_mode: None,
-            gfx_managed: true,
-            gfx_vfio_enable: false,
-            active_profile: "normal".into(),
-            toggle_profiles: vec!["normal".into(), "boost".into(), "silent".into()],
-            curr_fan_mode: 0,
-            bat_charge_limit: 100,
-            power_profiles: pwr,
-        }
-    }
 }

 impl Config {
+    fn new() -> Self {
+        Config {
+            bat_charge_limit: 100,
+        }
+    }
+
    /// `load` will attempt to read the config, and panic if the dir is missing
    pub fn load() -> Self {
        let mut file = OpenOptions::new()
@@ -89,46 +27,30 @@ impl Config {
            .open(&CONFIG_PATH)
            .unwrap_or_else(|_| panic!("The directory /etc/asusd/ is missing")); // okay to cause panic here
        let mut buf = String::new();
+        let config;
        if let Ok(read_len) = file.read_to_string(&mut buf) {
            if read_len == 0 {
-                return Config::create_default(&mut file);
+                config = Self::new();
+            } else if let Ok(data) = serde_json::from_str(&buf) {
+                config = data;
            } else {
-                if let Ok(data) = serde_json::from_str(&buf) {
-                    return data;
-                } else if let Ok(data) = serde_json::from_str::<ConfigV352>(&buf) {
-                    let config = data.into_current();
-                    config.write();
-                    info!("Updated config version to: {}", VERSION);
-                    return config;
-                } else if let Ok(data) = serde_json::from_str::<ConfigV341>(&buf) {
-                    let config = data.into_current();
-                    config.write();
-                    info!("Updated config version to: {}", VERSION);
-                    return config;
-                } else if let Ok(data) = serde_json::from_str::<ConfigV324>(&buf) {
-                    let config = data.into_current();
-                    config.write();
-                    info!("Updated config version to: {}", VERSION);
-                    return config;
-                } else if let Ok(data) = serde_json::from_str::<ConfigV317>(&buf) {
-                    let config = data.into_current();
-                    config.write();
-                    info!("Updated config version to: {}", VERSION);
-                    return config;
-                }
-                warn!("Could not deserialise {}", CONFIG_PATH);
-                panic!("Please remove {} then restart asusd", CONFIG_PATH);
+                warn!(
+                    "Could not deserialise {}.\nWill rename to {}-old and recreate config",
+                    CONFIG_PATH, CONFIG_PATH
+                );
+                let cfg_old = CONFIG_PATH.to_string() + "-old";
+                std::fs::rename(CONFIG_PATH, cfg_old).unwrap_or_else(|err| {
+                    panic!(
+                        "Could not rename. Please remove {} then restart service: Error {}",
+                        CONFIG_PATH, err
+                    )
+                });
+                config = Self::new();
            }
+        } else {
+            config = Self::new()
        }
-        Config::create_default(&mut file)
-    }
-
-    fn create_default(file: &mut File) -> Self {
-        let config = Config::default();
-        // Should be okay to unwrap this as is since it is a Default
-        let json = serde_json::to_string_pretty(&config).unwrap();
-        file.write_all(json.as_bytes())
-            .unwrap_or_else(|_| panic!("Could not write {}", CONFIG_PATH));
+        config.write();
        config
    }

@@ -142,12 +64,8 @@ impl Config {
            if l == 0 {
                warn!("File is empty {}", CONFIG_PATH);
            } else {
-                let mut x: Config = serde_json::from_str(&buf)
+                *self = serde_json::from_str(&buf)
                    .unwrap_or_else(|_| panic!("Could not deserialise {}", CONFIG_PATH));
-                // copy over serde skipped values
-                x.gfx_tmp_mode = self.gfx_tmp_mode;
-                x.curr_fan_mode = self.curr_fan_mode;
-                *self = x;
            }
        }
    }
--- a/daemon/src/config_old.rs
+++ b/daemon/src/config_old.rs
@@ -1,161 +0,0 @@
-use rog_fan_curve::Curve;
-use rog_profiles::profiles::Profile;
-use rog_types::gfx_vendors::GfxVendors;
-use serde_derive::{Deserialize, Serialize};
-use std::collections::BTreeMap;
-
-use crate::config::Config;
-
-/// for parsing old v3.1.7 config
-#[allow(dead_code)]
-#[derive(Deserialize)]
-pub(crate) struct ConfigV317 {
-    pub gfx_mode: GfxVendors,
-    pub gfx_managed: bool,
-    pub active_profile: String,
-    pub toggle_profiles: Vec<String>,
-    #[serde(skip)]
-    pub curr_fan_mode: u8,
-    pub bat_charge_limit: u8,
-    pub kbd_led_brightness: u8,
-    pub kbd_backlight_mode: u8,
-    #[serde(skip)]
-    pub kbd_backlight_modes: Option<bool>,
-    pub power_profiles: BTreeMap<String, ProfileV317>,
-}
-
-impl ConfigV317 {
-    pub(crate) fn into_current(self) -> Config {
-        Config {
-            gfx_mode: self.gfx_mode,
-            gfx_tmp_mode: None,
-            gfx_managed: self.gfx_managed,
-            gfx_vfio_enable: false,
-            active_profile: self.active_profile,
-            toggle_profiles: self.toggle_profiles,
-            curr_fan_mode: self.curr_fan_mode,
-            bat_charge_limit: self.bat_charge_limit,
-            power_profiles: ProfileV317::transform_map(self.power_profiles),
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct ConfigV324 {
-    pub gfx_mode: GfxVendors,
-    pub gfx_managed: bool,
-    pub active_profile: String,
-    pub toggle_profiles: Vec<String>,
-    #[serde(skip)]
-    pub curr_fan_mode: u8,
-    pub bat_charge_limit: u8,
-    pub power_profiles: BTreeMap<String, ProfileV317>,
-}
-
-impl ConfigV324 {
-    pub(crate) fn into_current(self) -> Config {
-        Config {
-            gfx_mode: GfxVendors::Hybrid,
-            gfx_tmp_mode: None,
-            gfx_managed: self.gfx_managed,
-            gfx_vfio_enable: false,
-            active_profile: self.active_profile,
-            toggle_profiles: self.toggle_profiles,
-            curr_fan_mode: self.curr_fan_mode,
-            bat_charge_limit: self.bat_charge_limit,
-            power_profiles: ProfileV317::transform_map(self.power_profiles),
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct ConfigV341 {
-    pub gfx_mode: GfxVendors,
-    pub gfx_managed: bool,
-    pub gfx_vfio_enable: bool,
-    pub active_profile: String,
-    pub toggle_profiles: Vec<String>,
-    #[serde(skip)]
-    pub curr_fan_mode: u8,
-    pub bat_charge_limit: u8,
-    pub power_profiles: BTreeMap<String, ProfileV317>,
-}
-
-impl ConfigV341 {
-    pub(crate) fn into_current(self) -> Config {
-        Config {
-            gfx_mode: GfxVendors::Hybrid,
-            gfx_tmp_mode: None,
-            gfx_managed: self.gfx_managed,
-            gfx_vfio_enable: false,
-            active_profile: self.active_profile,
-            toggle_profiles: self.toggle_profiles,
-            curr_fan_mode: self.curr_fan_mode,
-            bat_charge_limit: self.bat_charge_limit,
-            power_profiles: ProfileV317::transform_map(self.power_profiles),
-        }
-    }
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct ConfigV352 {
-    pub gfx_mode: GfxVendors,
-    pub gfx_last_mode: GfxVendors,
-    pub gfx_managed: bool,
-    pub gfx_vfio_enable: bool,
-    pub gfx_save_compute_vfio: bool,
-    pub active_profile: String,
-    pub toggle_profiles: Vec<String>,
-    #[serde(skip)]
-    pub curr_fan_mode: u8,
-    pub bat_charge_limit: u8,
-    pub power_profiles: BTreeMap<String, ProfileV317>,
-}
-
-impl ConfigV352 {
-    pub(crate) fn into_current(self) -> Config {
-        Config {
-            gfx_mode: GfxVendors::Hybrid,
-            gfx_tmp_mode: None,
-            gfx_managed: self.gfx_managed,
-            gfx_vfio_enable: false,
-            active_profile: self.active_profile,
-            toggle_profiles: self.toggle_profiles,
-            curr_fan_mode: self.curr_fan_mode,
-            bat_charge_limit: self.bat_charge_limit,
-            power_profiles: ProfileV317::transform_map(self.power_profiles),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct ProfileV317 {
-    pub min_percentage: u8,
-    pub max_percentage: u8,
-    pub turbo: bool,
-    pub fan_preset: u8,
-    pub fan_curve: Option<Curve>,
-}
-
-impl ProfileV317 {
-    fn into_current(self, name: String) -> Profile {
-        Profile {
-            name,
-            min_percentage: self.min_percentage,
-            max_percentage: self.max_percentage,
-            turbo: self.turbo,
-            fan_preset: self.fan_preset.into(),
-            fan_curve: self
-                .fan_curve
-                .map_or_else(|| "".to_string(), |c| c.as_config_string()),
-        }
-    }
-
-    fn transform_map(map: BTreeMap<String, ProfileV317>) -> BTreeMap<String, Profile> {
-        let mut new_map = BTreeMap::new();
-        map.iter().for_each(|(k, v)| {
-            new_map.insert(k.to_string(), v.clone().into_current(k.to_string()));
-        });
-        new_map
-    }
-}
--- a/daemon/src/ctrl_anime/config.rs
+++ b/daemon/src/ctrl_anime/config.rs
@@ -166,11 +166,17 @@ impl AnimeConfig {
                    info!("Updated config version to: {}", VERSION);
                    return config;
                }
-                AnimeConfig::write_backup(buf);
                warn!(
-                    "Could not deserialise {}. Backed up as *-old",
-                    ANIME_CONFIG_PATH
+                    "Could not deserialise {}.\nWill rename to {}-old and recreate config",
+                    ANIME_CONFIG_PATH, ANIME_CONFIG_PATH
                );
+                let cfg_old = ANIME_CONFIG_PATH.to_string() + "-old";
+                std::fs::rename(ANIME_CONFIG_PATH, cfg_old).unwrap_or_else(|err| {
+                    panic!(
+                        "Could not rename. Please remove {} then restart service: Error {}",
+                        ANIME_CONFIG_PATH, err
+                    )
+                });
            }
        }
        AnimeConfig::create_default(&mut file)
@@ -246,12 +252,4 @@ impl AnimeConfig {
        file.write_all(json.as_bytes())
            .unwrap_or_else(|err| error!("Could not write config: {}", err));
    }
-
-    fn write_backup(buf: String) {
-        let mut path = ANIME_CONFIG_PATH.to_string();
-        path.push_str("-old");
-        let mut file = File::create(&path).expect("Couldn't overwrite config");
-        file.write_all(buf.as_bytes())
-            .unwrap_or_else(|err| error!("Could not write config: {}", err));
-    }
 }
--- a/daemon/src/ctrl_anime/mod.rs
+++ b/daemon/src/ctrl_anime/mod.rs
@@ -1,15 +1,21 @@
+pub mod config;
+pub mod zbus;
+
+use ::zbus::Connection;
 use log::{error, info, warn};
 use logind_zbus::ManagerProxy;
 use rog_anime::{
+    error::AnimeError,
    usb::{
        pkt_for_apply, pkt_for_flush, pkt_for_set_boot, pkt_for_set_on, pkts_for_init, PROD_ID,
        VENDOR_ID,
    },
-    ActionData, AnimeDataBuffer, AnimePacketType, AnimePowerStates, ANIME_DATA_LEN,
+    ActionData, AnimeDataBuffer, AnimePacketType, ANIME_DATA_LEN,
 };
-use rog_types::supported::AnimeSupportedFunctions;
+use rog_supported::AnimeSupportedFunctions;
 use rusb::{Device, DeviceHandle};
 use std::{
+    cell::RefCell,
    error::Error,
    sync::{Arc, Mutex},
    thread::sleep,
@@ -18,14 +24,10 @@ use std::{
    sync::atomic::{AtomicBool, Ordering},
    time::Duration,
 };
-use zbus::{dbus_interface, Connection};
-use zvariant::ObjectPath;

-use crate::{
-    config_anime::{AnimeConfig, AnimeConfigCached},
-    error::RogError,
-    GetSupported,
-};
+use crate::{error::RogError, GetSupported};
+
+use self::config::{AnimeConfig, AnimeConfigCached};

 impl GetSupported for CtrlAnime {
    type A = AnimeSupportedFunctions;
@@ -36,7 +38,8 @@ impl GetSupported for CtrlAnime {
 }

 pub struct CtrlAnime {
-    handle: DeviceHandle<rusb::GlobalContext>,
+    _node: String,
+    handle: RefCell<DeviceHandle<rusb::GlobalContext>>,
    cache: AnimeConfigCached,
    config: AnimeConfig,
    // set to force thread to exit
@@ -48,6 +51,55 @@ pub struct CtrlAnime {
 impl CtrlAnime {
    #[inline]
    pub fn new(config: AnimeConfig) -> Result<CtrlAnime, Box<dyn Error>> {
+        let node = Self::find_node("193b")?;
+        let device = Self::get_dev_handle()?;
+
+        info!("Device has an AniMe Matrix display");
+        let mut cache = AnimeConfigCached::default();
+        cache.init_from_config(&config)?;
+
+        let ctrl = CtrlAnime {
+            _node: node,
+            handle: RefCell::new(device),
+            cache,
+            config,
+            thread_exit: Arc::new(AtomicBool::new(false)),
+            thread_running: Arc::new(AtomicBool::new(false)),
+        };
+        ctrl.do_initialization();
+
+        Ok(ctrl)
+    }
+
+    fn find_node(id_product: &str) -> Result<String, RogError> {
+        let mut enumerator = udev::Enumerator::new().map_err(|err| {
+            warn!("{}", err);
+            RogError::Udev("enumerator failed".into(), err)
+        })?;
+        enumerator.match_subsystem("usb").map_err(|err| {
+            warn!("{}", err);
+            RogError::Udev("match_subsystem failed".into(), err)
+        })?;
+
+        for device in enumerator.scan_devices().map_err(|err| {
+            warn!("{}", err);
+            RogError::Udev("scan_devices failed".into(), err)
+        })? {
+            if let Some(attr) = device.attribute_value("idProduct") {
+                if attr == id_product {
+                    if let Some(dev_node) = device.devnode() {
+                        info!("Using device at: {:?} for AniMe control", dev_node);
+                        return Ok(dev_node.to_string_lossy().to_string());
+                    }
+                }
+            }
+        }
+        Err(RogError::MissingFunction(
+            "ASUS AniMe device node not found".into(),
+        ))
+    }
+
+    fn get_dev_handle() -> Result<DeviceHandle<rusb::GlobalContext>, Box<dyn Error>> {
        // We don't expect this ID to ever change
        let device = CtrlAnime::get_device(0x0b05, 0x193b)?;

@@ -64,20 +116,7 @@ impl CtrlAnime {
            err
        })?;

-        info!("Device has an AniMe Matrix display");
-        let mut cache = AnimeConfigCached::default();
-        cache.init_from_config(&config)?;
-
-        let ctrl = CtrlAnime {
-            handle: device,
-            cache,
-            config,
-            thread_exit: Arc::new(AtomicBool::new(false)),
-            thread_running: Arc::new(AtomicBool::new(false)),
-        };
-        ctrl.do_initialization();
-
-        Ok(ctrl)
+        Ok(device)
    }

    fn get_device(vendor: u16, product: u16) -> Result<Device<rusb::GlobalContext>, rusb::Error> {
@@ -143,12 +182,22 @@ impl CtrlAnime {
                    for action in actions.iter() {
                        match action {
                            ActionData::Animation(frames) => {
-                                rog_anime::run_animation(frames, thread_exit.clone(), &|frame| {
-                                    if let Ok(lock) = inner.try_lock() {
-                                        lock.write_data_buffer(frame);
-                                    }
-                                })
-                                .unwrap();
+                                if let Err(err) = rog_anime::run_animation(
+                                    frames,
+                                    thread_exit.clone(),
+                                    &|frame| {
+                                        inner
+                                            .try_lock()
+                                            .map(|lock| lock.write_data_buffer(frame))
+                                            .map_err(|err| {
+                                                warn!("rog_anime::run_animation: {}", err);
+                                                AnimeError::NoFrames
+                                            })
+                                    },
+                                ) {
+                                    warn!("rog_anime::run_animation: {}", err);
+                                    break 'main;
+                                };

                                if thread_exit.load(Ordering::SeqCst) {
                                    break 'main;
@@ -186,7 +235,14 @@ impl CtrlAnime {
    }

    fn write_bytes(&self, message: &[u8]) {
-        match self.handle.write_control(
+        // if let Ok(mut file) = OpenOptions::new().write(true).open(&self.node) {
+        //     println!("write: {:02x?}", &message);
+        //     return file
+        //         .write_all(message).unwrap();
+        // }
+        let mut error = false;
+
+        match self.handle.borrow().write_control(
            0x21,  // request_type
            0x09,  // request
            0x35e, // value
@@ -197,9 +253,24 @@ impl CtrlAnime {
            Ok(_) => {}
            Err(err) => match err {
                rusb::Error::Timeout => {}
-                _ => error!("Failed to write to led interrupt: {}", err),
+                _ => {
+                    error = true;
+                    error!("Failed to write to led interrupt: {}", err);
+                }
            },
        }
+
+        if error {
+            warn!("Will attempt to get AniMe device handle again");
+            match Self::get_dev_handle() {
+                Ok(dev) => {
+                    self.handle.replace(dev);
+                }
+                Err(err) => {
+                    error!("Failed to get AniMe device: {}", err);
+                }
+            }
+        }
    }

    /// Write only a data packet. This will modify the leds brightness using the
@@ -234,9 +305,11 @@ pub struct CtrlAnimeTask<'a> {

 impl<'a> CtrlAnimeTask<'a> {
    pub fn new(inner: Arc<Mutex<CtrlAnime>>) -> Self {
-        let connection = Connection::new_system().unwrap();
+        let connection =
+            Connection::new_system().expect("CtrlAnimeTask could not create dbus connection");

-        let manager = ManagerProxy::new(&connection).unwrap();
+        let manager =
+            ManagerProxy::new(&connection).expect("CtrlAnimeTask could not create ManagerProxy");

        let c1 = inner.clone();
        // Run this action when the system starts shutting down
@@ -327,130 +400,3 @@ impl crate::Reloadable for CtrlAnimeReloader {
        Ok(())
    }
 }
-
-pub struct CtrlAnimeZbus(pub Arc<Mutex<CtrlAnime>>);
-
-/// The struct with the main dbus methods requires this trait
-impl crate::ZbusAdd for CtrlAnimeZbus {
-    fn add_to_server(self, server: &mut zbus::ObjectServer) {
-        server
-            .at(
-                &ObjectPath::from_str_unchecked("/org/asuslinux/Anime"),
-                self,
-            )
-            .map_err(|err| {
-                warn!("CtrlAnimeDisplay: add_to_server {}", err);
-                err
-            })
-            .ok();
-    }
-}
-
-// 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.
-#[dbus_interface(name = "org.asuslinux.Daemon")]
-impl CtrlAnimeZbus {
-    /// Writes a data stream of length. Will force system thread to exit until it is restarted
-    fn write(&self, input: AnimeDataBuffer) {
-        'outer: loop {
-            if let Ok(lock) = self.0.try_lock() {
-                lock.thread_exit.store(true, Ordering::SeqCst);
-                lock.write_data_buffer(input);
-                break 'outer;
-            }
-        }
-    }
-
-    /// Set the global AniMe brightness
-    fn set_brightness(&self, bright: f32) {
-        'outer: loop {
-            if let Ok(mut lock) = self.0.try_lock() {
-                let mut bright = bright;
-                if bright < 0.0 {
-                    bright = 0.0
-                } else if bright > 254.0 {
-                    bright = 254.0;
-                }
-                lock.config.brightness = bright;
-                lock.config.write();
-                break 'outer;
-            }
-        }
-    }
-
-    /// Set whether the AniMe is displaying images/data
-    fn set_on_off(&self, status: bool) {
-        'outer: loop {
-            if let Ok(mut lock) = self.0.try_lock() {
-                lock.write_bytes(&pkt_for_set_on(status));
-                lock.config.awake_enabled = status;
-                lock.config.write();
-
-                let states = AnimePowerStates {
-                    enabled: lock.config.awake_enabled,
-                    boot_anim_enabled: lock.config.boot_anim_enabled,
-                };
-                self.notify_power_states(&states)
-                    .unwrap_or_else(|err| warn!("{}", err));
-                break 'outer;
-            }
-        }
-    }
-
-    /// Set whether the AniMe will show boot, suspend, or off animations
-    fn set_boot_on_off(&self, on: bool) {
-        'outer: loop {
-            if let Ok(mut lock) = self.0.try_lock() {
-                lock.write_bytes(&pkt_for_set_boot(on));
-                lock.write_bytes(&pkt_for_apply());
-                lock.config.boot_anim_enabled = on;
-                lock.config.write();
-
-                let states = AnimePowerStates {
-                    enabled: lock.config.awake_enabled,
-                    boot_anim_enabled: lock.config.boot_anim_enabled,
-                };
-                self.notify_power_states(&states)
-                    .unwrap_or_else(|err| warn!("{}", err));
-                break 'outer;
-            }
-        }
-    }
-
-    /// The main loop is the base system set action if the user isn't running
-    /// the user daemon
-    fn run_main_loop(&self, start: bool) {
-        if start {
-            'outer: loop {
-                if let Ok(lock) = self.0.try_lock() {
-                    lock.thread_exit.store(true, Ordering::SeqCst);
-                    CtrlAnime::run_thread(self.0.clone(), lock.cache.system.clone(), false);
-                    break 'outer;
-                }
-            }
-        }
-    }
-
-    /// Get status of if the AniMe LEDs are on
-    #[dbus_interface(property)]
-    fn awake_enabled(&self) -> bool {
-        if let Ok(ctrl) = self.0.try_lock() {
-            return ctrl.config.awake_enabled;
-        }
-        true
-    }
-
-    /// Get the status of if factory system-status animations are enabled
-    #[dbus_interface(property)]
-    fn boot_enabled(&self) -> bool {
-        if let Ok(ctrl) = self.0.try_lock() {
-            return ctrl.config.boot_anim_enabled;
-        }
-        true
-    }
-
-    /// Notify listeners of the status of AniMe LED power and factory system-status animations
-    #[dbus_interface(signal)]
-    fn notify_power_states(&self, data: &AnimePowerStates) -> zbus::Result<()>;
-}
--- a/daemon/src/ctrl_anime/zbus.rs
+++ b/daemon/src/ctrl_anime/zbus.rs
@@ -0,0 +1,140 @@
+use std::sync::{Arc, Mutex};
+
+use log::warn;
+use rog_anime::{
+    usb::{pkt_for_apply, pkt_for_set_boot, pkt_for_set_on},
+    AnimeDataBuffer, AnimePowerStates,
+};
+use zbus::dbus_interface;
+use zvariant::ObjectPath;
+
+use std::sync::atomic::Ordering;
+
+use super::CtrlAnime;
+
+pub struct CtrlAnimeZbus(pub Arc<Mutex<CtrlAnime>>);
+
+/// The struct with the main dbus methods requires this trait
+impl crate::ZbusAdd for CtrlAnimeZbus {
+    fn add_to_server(self, server: &mut zbus::ObjectServer) {
+        server
+            .at(
+                &ObjectPath::from_str_unchecked("/org/asuslinux/Anime"),
+                self,
+            )
+            .map_err(|err| {
+                warn!("CtrlAnimeDisplay: add_to_server {}", err);
+                err
+            })
+            .ok();
+    }
+}
+
+// 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.
+#[dbus_interface(name = "org.asuslinux.Daemon")]
+impl CtrlAnimeZbus {
+    /// Writes a data stream of length. Will force system thread to exit until it is restarted
+    fn write(&self, input: AnimeDataBuffer) {
+        'outer: loop {
+            if let Ok(lock) = self.0.try_lock() {
+                lock.thread_exit.store(true, Ordering::SeqCst);
+                lock.write_data_buffer(input);
+                break 'outer;
+            }
+        }
+    }
+
+    /// Set the global AniMe brightness
+    fn set_brightness(&self, bright: f32) {
+        'outer: loop {
+            if let Ok(mut lock) = self.0.try_lock() {
+                let mut bright = bright;
+                if bright < 0.0 {
+                    bright = 0.0
+                } else if bright > 254.0 {
+                    bright = 254.0;
+                }
+                lock.config.brightness = bright;
+                lock.config.write();
+                break 'outer;
+            }
+        }
+    }
+
+    /// Set whether the AniMe is displaying images/data
+    fn set_on_off(&self, status: bool) {
+        'outer: loop {
+            if let Ok(mut lock) = self.0.try_lock() {
+                lock.write_bytes(&pkt_for_set_on(status));
+                lock.config.awake_enabled = status;
+                lock.config.write();
+
+                let states = AnimePowerStates {
+                    enabled: lock.config.awake_enabled,
+                    boot_anim_enabled: lock.config.boot_anim_enabled,
+                };
+                self.notify_power_states(&states)
+                    .unwrap_or_else(|err| warn!("{}", err));
+                break 'outer;
+            }
+        }
+    }
+
+    /// Set whether the AniMe will show boot, suspend, or off animations
+    fn set_boot_on_off(&self, on: bool) {
+        'outer: loop {
+            if let Ok(mut lock) = self.0.try_lock() {
+                lock.write_bytes(&pkt_for_set_boot(on));
+                lock.write_bytes(&pkt_for_apply());
+                lock.config.boot_anim_enabled = on;
+                lock.config.write();
+
+                let states = AnimePowerStates {
+                    enabled: lock.config.awake_enabled,
+                    boot_anim_enabled: lock.config.boot_anim_enabled,
+                };
+                self.notify_power_states(&states)
+                    .unwrap_or_else(|err| warn!("{}", err));
+                break 'outer;
+            }
+        }
+    }
+
+    /// The main loop is the base system set action if the user isn't running
+    /// the user daemon
+    fn run_main_loop(&self, start: bool) {
+        if start {
+            'outer: loop {
+                if let Ok(lock) = self.0.try_lock() {
+                    lock.thread_exit.store(true, Ordering::SeqCst);
+                    CtrlAnime::run_thread(self.0.clone(), lock.cache.system.clone(), false);
+                    break 'outer;
+                }
+            }
+        }
+    }
+
+    /// Get status of if the AniMe LEDs are on
+    #[dbus_interface(property)]
+    fn awake_enabled(&self) -> bool {
+        if let Ok(ctrl) = self.0.try_lock() {
+            return ctrl.config.awake_enabled;
+        }
+        true
+    }
+
+    /// Get the status of if factory system-status animations are enabled
+    #[dbus_interface(property)]
+    fn boot_enabled(&self) -> bool {
+        if let Ok(ctrl) = self.0.try_lock() {
+            return ctrl.config.boot_anim_enabled;
+        }
+        true
+    }
+
+    /// Notify listeners of the status of AniMe LED power and factory system-status animations
+    #[dbus_interface(signal)]
+    fn notify_power_states(&self, data: &AnimePowerStates) -> zbus::Result<()>;
+}
--- a/daemon/src/ctrl_aura/config.rs
+++ b/daemon/src/ctrl_aura/config.rs
@@ -105,8 +105,17 @@ impl AuraConfig {
                    info!("Updated AuraConfig version");
                    return config;
                }
-                warn!("Could not deserialise {}", AURA_CONFIG_PATH);
-                panic!("Please remove {} then restart asusd", AURA_CONFIG_PATH);
+                warn!(
+                    "Could not deserialise {}.\nWill rename to {}-old and recreate config",
+                    AURA_CONFIG_PATH, AURA_CONFIG_PATH
+                );
+                let cfg_old = AURA_CONFIG_PATH.to_string() + "-old";
+                std::fs::rename(AURA_CONFIG_PATH, cfg_old).unwrap_or_else(|err| {
+                    panic!(
+                        "Could not rename. Please remove {} then restart service: Error {}",
+                        AURA_CONFIG_PATH, err
+                    )
+                });
            }
        }
        AuraConfig::create_default(&mut file, supported_led_modes)
--- a/daemon/src/ctrl_aura/controller.rs
+++ b/daemon/src/ctrl_aura/controller.rs
@@ -2,7 +2,6 @@
 static KBD_BRIGHT_PATH: &str = "/sys/class/leds/asus::kbd_backlight/brightness";

 use crate::{
-    config_aura::AuraConfig,
    error::RogError,
    laptops::{LaptopLedData, ASUS_KEYBOARD_DEVICES},
    CtrlTask,
@@ -16,7 +15,7 @@ use rog_aura::{
    },
    AuraEffect, LedBrightness, LED_MSG_LEN,
 };
-use rog_types::supported::LedSupportedFunctions;
+use rog_supported::LedSupportedFunctions;
 use std::io::{Read, Write};
 use std::path::Path;
 use std::sync::Arc;
@@ -26,6 +25,8 @@ use zbus::Connection;

 use crate::GetSupported;

+use super::config::AuraConfig;
+
 impl GetSupported for CtrlKbdLed {
    type A = LedSupportedFunctions;

@@ -61,9 +62,11 @@ pub struct CtrlKbdLedTask<'a> {

 impl<'a> CtrlKbdLedTask<'a> {
    pub fn new(inner: Arc<Mutex<CtrlKbdLed>>) -> Self {
-        let connection = Connection::new_system().unwrap();
+        let connection =
+            Connection::new_system().expect("CtrlKbdLedTask could not create dbus connection");

-        let manager = ManagerProxy::new(&connection).unwrap();
+        let manager =
+            ManagerProxy::new(&connection).expect("CtrlKbdLedTask could not create ManagerProxy");

        let c1 = inner.clone();
        // Run this action when the system wakes up from sleep
@@ -238,6 +241,28 @@ impl CtrlKbdLed {
        Ok(())
    }

+    pub fn next_brightness(&mut self) -> Result<(), RogError> {
+        let mut bright = (self.config.brightness as u32) + 1;
+        if bright > 3 {
+            bright = 0;
+        }
+        self.config.brightness = <LedBrightness>::from(bright);
+        self.config.write();
+        self.set_brightness(self.config.brightness)
+    }
+
+    pub fn prev_brightness(&mut self) -> Result<(), RogError> {
+        let mut bright = self.config.brightness as u32;
+        if bright == 0 {
+            bright = 3;
+        } else {
+            bright -= 1;
+        }
+        self.config.brightness = <LedBrightness>::from(bright);
+        self.config.write();
+        self.set_brightness(self.config.brightness)
+    }
+
    /// Set if awake/on LED active, and/or sleep animation active
    pub(super) fn set_states_enabled(&self, awake: bool, sleep: bool) -> Result<(), RogError> {
        let bytes = if awake && sleep {
--- a/daemon/src/ctrl_aura/mod.rs
+++ b/daemon/src/ctrl_aura/mod.rs
@@ -1,2 +1,3 @@
+pub mod config;
 pub mod controller;
 pub mod zbus;
--- a/daemon/src/ctrl_aura/zbus.rs
+++ b/daemon/src/ctrl_aura/zbus.rs
@@ -105,6 +105,20 @@ impl CtrlKbdLedZbus {
        }
    }

+    fn next_led_brightness(&self) {
+        if let Ok(mut ctrl) = self.0.try_lock() {
+            ctrl.next_brightness()
+                .unwrap_or_else(|err| warn!("{}", err));
+        }
+    }
+
+    fn prev_led_brightness(&self) {
+        if let Ok(mut ctrl) = self.0.try_lock() {
+            ctrl.prev_brightness()
+                .unwrap_or_else(|err| warn!("{}", err));
+        }
+    }
+
    #[dbus_interface(property)]
    fn awake_enabled(&self) -> bool {
        if let Ok(ctrl) = self.0.try_lock() {
--- a/daemon/src/ctrl_charge.rs
+++ b/daemon/src/ctrl_charge.rs
@@ -1,7 +1,7 @@
 use crate::{config::Config, error::RogError, GetSupported};
 //use crate::dbus::DbusEvents;
 use log::{info, warn};
-use rog_types::supported::ChargeSupportedFunctions;
+use rog_supported::ChargeSupportedFunctions;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
@@ -10,7 +10,9 @@ use std::sync::Mutex;
 use zbus::dbus_interface;
 use zvariant::ObjectPath;

-static BAT_CHARGE_PATH: &str = "/sys/class/power_supply/BAT0/charge_control_end_threshold";
+static BAT_CHARGE_PATH0: &str = "/sys/class/power_supply/BAT0/charge_control_end_threshold";
+static BAT_CHARGE_PATH1: &str = "/sys/class/power_supply/BAT1/charge_control_end_threshold";
+static BAT_CHARGE_PATH2: &str = "/sys/class/power_supply/BAT2/charge_control_end_threshold";

 impl GetSupported for CtrlCharge {
    type A = ChargeSupportedFunctions;
@@ -28,7 +30,10 @@ pub struct CtrlCharge {

 #[dbus_interface(name = "org.asuslinux.Daemon")]
 impl CtrlCharge {
-    pub fn set_limit(&mut self, limit: u8) {
+    pub fn set_limit(&mut self, limit: u8) -> Result<(), RogError> {
+        if !(20..=100).contains(&limit) {
+            return Err(RogError::ChargeLimit(limit));
+        }
        if let Ok(mut config) = self.config.try_lock() {
            self.set(limit, &mut config)
                .map_err(|err| {
@@ -43,6 +48,7 @@ impl CtrlCharge {
                })
                .ok();
        }
+        Ok(())
    }

    pub fn limit(&self) -> i8 {
@@ -88,8 +94,12 @@ impl CtrlCharge {
    }

    fn get_battery_path() -> Result<&'static str, RogError> {
-        if Path::new(BAT_CHARGE_PATH).exists() {
-            Ok(BAT_CHARGE_PATH)
+        if Path::new(BAT_CHARGE_PATH0).exists() {
+            Ok(BAT_CHARGE_PATH0)
+        } else if Path::new(BAT_CHARGE_PATH1).exists() {
+            Ok(BAT_CHARGE_PATH1)
+        } else if Path::new(BAT_CHARGE_PATH2).exists() {
+            Ok(BAT_CHARGE_PATH2)
        } else {
            Err(RogError::MissingFunction(
                "Charge control not available, you may require a v5.8.10 series kernel or newer"
@@ -100,18 +110,17 @@ impl CtrlCharge {

    pub(super) fn set(&self, limit: u8, config: &mut Config) -> Result<(), RogError> {
        if !(20..=100).contains(&limit) {
-            warn!(
-                "Unable to set battery charge limit, must be between 20-100: requested {}",
-                limit
-            );
+            return Err(RogError::ChargeLimit(limit));
        }

+        let path = Self::get_battery_path()?;
+
        let mut file = OpenOptions::new()
            .write(true)
-            .open(BAT_CHARGE_PATH)
-            .map_err(|err| RogError::Path(BAT_CHARGE_PATH.into(), err))?;
+            .open(path)
+            .map_err(|err| RogError::Path(path.into(), err))?;
        file.write_all(limit.to_string().as_bytes())
-            .map_err(|err| RogError::Write(BAT_CHARGE_PATH.into(), err))?;
+            .map_err(|err| RogError::Write(path.into(), err))?;
        info!("Battery charge limit: {}", limit);

        config.read();
--- a/daemon/src/ctrl_gfx/controller.rs
+++ b/daemon/src/ctrl_gfx/controller.rs
@@ -1,702 +0,0 @@
-use ::zbus::Connection;
-use ctrl_gfx::error::GfxError;
-use ctrl_gfx::*;
-use ctrl_rog_bios::CtrlRogBios;
-use log::{error, info, warn};
-use logind_zbus::{
-    types::{SessionClass, SessionInfo, SessionState, SessionType},
-    ManagerProxy, SessionProxy,
-};
-use rog_types::gfx_vendors::{GfxPower, GfxRequiredUserAction, GfxVendors};
-use std::{io::Write, ops::Add, path::Path, time::Instant};
-use std::{process::Command, thread::sleep, time::Duration};
-use std::{str::FromStr, sync::mpsc};
-use std::{sync::Arc, sync::Mutex};
-use sysfs_class::RuntimePM;
-use sysfs_class::{PciDevice, SysClass};
-use system::{GraphicsDevice, PciBus};
-
-use crate::*;
-
-const THREAD_TIMEOUT_MSG: &str = "GFX: thread time exceeded 3 minutes, exiting";
-
-pub struct CtrlGraphics {
-    bus: PciBus,
-    _amd: Vec<GraphicsDevice>,
-    _intel: Vec<GraphicsDevice>,
-    nvidia: Vec<GraphicsDevice>,
-    #[allow(dead_code)]
-    other: Vec<GraphicsDevice>,
-    config: Arc<Mutex<Config>>,
-    thread_kill: Arc<Mutex<Option<mpsc::Sender<bool>>>>,
-}
-
-impl Reloadable for CtrlGraphics {
-    fn reload(&mut self) -> Result<(), RogError> {
-        self.auto_power()?;
-        info!("GFX: Reloaded gfx mode: {:?}", self.get_gfx_mode()?);
-        Ok(())
-    }
-}
-
-impl CtrlGraphics {
-    pub fn new(config: Arc<Mutex<Config>>) -> std::io::Result<CtrlGraphics> {
-        let bus = PciBus::new()?;
-        info!("GFX: Rescanning PCI bus");
-        bus.rescan()?;
-        let devs = PciDevice::all()?;
-
-        let functions = |parent: &PciDevice| -> Vec<PciDevice> {
-            let mut functions = Vec::new();
-            if let Some(parent_slot) = parent.id().split('.').next() {
-                for func in devs.iter() {
-                    if let Some(func_slot) = func.id().split('.').next() {
-                        if func_slot == parent_slot {
-                            info!("GFX: {}: Function for {}", func.id(), parent.id());
-                            functions.push(func.clone());
-                        }
-                    }
-                }
-            }
-            functions
-        };
-
-        let mut amd = Vec::new();
-        let mut intel = Vec::new();
-        let mut nvidia = Vec::new();
-        let mut other = Vec::new();
-        for dev in devs.iter() {
-            let c = dev.class().map_err(|err| {
-                error!(
-                    "GFX: device error: {}, {}",
-                    dev.path().to_string_lossy(),
-                    err
-                );
-                err
-            })?;
-            if 0x03 == (c >> 16) & 0xFF {
-                match dev.vendor()? {
-                    0x1002 => {
-                        info!("GFX: {}: AMD graphics", dev.id());
-                        amd.push(GraphicsDevice::new(dev.id().to_owned(), functions(dev)));
-                    }
-                    0x10DE => {
-                        info!("GFX: {}: NVIDIA graphics", dev.id());
-                        dev.set_runtime_pm(sysfs_class::RuntimePowerManagement::On)?;
-                        nvidia.push(GraphicsDevice::new(dev.id().to_owned(), functions(dev)));
-                    }
-                    0x8086 => {
-                        info!("GFX: {}: Intel graphics", dev.id());
-                        intel.push(GraphicsDevice::new(dev.id().to_owned(), functions(dev)));
-                    }
-                    vendor => {
-                        info!("GFX: {}: Other({:X}) graphics", dev.id(), vendor);
-                        other.push(GraphicsDevice::new(dev.id().to_owned(), functions(dev)));
-                    }
-                }
-            }
-        }
-
-        Ok(CtrlGraphics {
-            bus,
-            _amd: amd,
-            _intel: intel,
-            nvidia,
-            other,
-            config,
-            thread_kill: Arc::new(Mutex::new(None)),
-        })
-    }
-
-    pub fn bus(&self) -> PciBus {
-        self.bus.clone()
-    }
-
-    pub fn devices(&self) -> Vec<GraphicsDevice> {
-        self.nvidia.clone()
-    }
-
-    /// Save the selected `Vendor` mode to config
-    fn save_gfx_mode(vendor: GfxVendors, config: Arc<Mutex<Config>>) {
-        if let Ok(mut config) = config.lock() {
-            config.gfx_mode = vendor;
-            config.write();
-        }
-    }
-
-    /// Associated method to get which vendor mode is set
-    pub(super) fn get_gfx_mode(&self) -> Result<GfxVendors, RogError> {
-        if let Ok(config) = self.config.lock() {
-            if let Some(mode) = config.gfx_tmp_mode {
-                return Ok(mode);
-            }
-            return Ok(config.gfx_mode);
-        }
-        // TODO: Error here
-        Ok(GfxVendors::Hybrid)
-    }
-
-    pub(super) fn get_runtime_status() -> Result<GfxPower, RogError> {
-        let path = Path::new("/sys/bus/pci/devices/0000:01:00.0/power/runtime_status");
-        if path.exists() {
-            let buf = std::fs::read_to_string(path).map_err(|err| {
-                RogError::Read(
-                    "/sys/bus/pci/devices/0000:01:00.0/power/runtime_status".to_string(),
-                    err,
-                )
-            })?;
-            Ok(GfxPower::from_str(&buf)?)
-        } else {
-            Ok(GfxPower::Off)
-        }
-    }
-
-    /// Some systems have a fallback service to load nouveau if nvidia fails
-    fn toggle_fallback_service(vendor: GfxVendors) -> Result<(), RogError> {
-        let action = if vendor == GfxVendors::Nvidia {
-            info!("GFX: Enabling nvidia-fallback.service");
-            "enable"
-        } else {
-            info!("GFX: Disabling nvidia-fallback.service");
-            "disable"
-        };
-
-        let status = Command::new("systemctl")
-            .arg(action)
-            .arg("nvidia-fallback.service")
-            .status()
-            .map_err(|err| RogError::Command("systemctl".into(), err))?;
-
-        if !status.success() {
-            // Error is ignored in case this service is removed
-            warn!(
-                "systemctl: {} (ignore warning if service does not exist!)",
-                status
-            );
-        }
-
-        Ok(())
-    }
-
-    /// Write the appropriate xorg config for the chosen mode
-    fn write_xorg_conf(vendor: GfxVendors) -> Result<(), RogError> {
-        let text = if vendor == GfxVendors::Nvidia {
-            [PRIMARY_GPU_BEGIN, PRIMARY_GPU_NVIDIA, PRIMARY_GPU_END].concat()
-        } else {
-            [PRIMARY_GPU_BEGIN, PRIMARY_GPU_END].concat()
-        };
-
-        if !Path::new(XORG_PATH).exists() {
-            std::fs::create_dir(XORG_PATH).map_err(|err| RogError::Write(XORG_PATH.into(), err))?;
-        }
-
-        let file = XORG_PATH.to_string().add(XORG_FILE);
-        info!("GFX: Writing {}", file);
-        let mut file = std::fs::OpenOptions::new()
-            .create(true)
-            .truncate(true)
-            .write(true)
-            .open(&file)
-            .map_err(|err| RogError::Write(file, err))?;
-
-        file.write_all(&text)
-            .and_then(|_| file.sync_all())
-            .map_err(|err| RogError::Write(MODPROBE_PATH.into(), err))?;
-        Ok(())
-    }
-
-    /// Creates the full modprobe.conf required for vfio pass-through
-    fn get_vfio_conf(devices: &[GraphicsDevice]) -> Vec<u8> {
-        let mut vifo = MODPROBE_VFIO.to_vec();
-        for (d_count, dev) in devices.iter().enumerate() {
-            for (f_count, func) in dev.functions().iter().enumerate() {
-                let vendor = func.vendor().unwrap();
-                let device = func.device().unwrap();
-                unsafe {
-                    vifo.append(format!("{:x}", vendor).as_mut_vec());
-                }
-                vifo.append(&mut vec![b':']);
-                unsafe {
-                    vifo.append(format!("{:x}", device).as_mut_vec());
-                }
-                if f_count < dev.functions().len() - 1 {
-                    vifo.append(&mut vec![b',']);
-                }
-            }
-            if d_count < dev.functions().len() - 1 {
-                vifo.append(&mut vec![b',']);
-            }
-        }
-        let mut conf = MODPROBE_INTEGRATED.to_vec();
-        conf.append(&mut vifo);
-        conf
-    }
-
-    fn write_modprobe_conf(vendor: GfxVendors, devices: &[GraphicsDevice]) -> Result<(), RogError> {
-        info!("GFX: Writing {}", MODPROBE_PATH);
-        let content = match vendor {
-            GfxVendors::Nvidia | GfxVendors::Hybrid => {
-                let mut base = MODPROBE_BASE.to_vec();
-                base.append(&mut MODPROBE_DRM_MODESET.to_vec());
-                base
-            }
-            GfxVendors::Vfio => Self::get_vfio_conf(devices),
-            GfxVendors::Integrated => MODPROBE_INTEGRATED.to_vec(),
-            GfxVendors::Compute => MODPROBE_BASE.to_vec(),
-        };
-
-        let mut file = std::fs::OpenOptions::new()
-            .create(true)
-            .truncate(true)
-            .write(true)
-            .open(MODPROBE_PATH)
-            .map_err(|err| RogError::Path(MODPROBE_PATH.into(), err))?;
-
-        file.write_all(&content)
-            .and_then(|_| file.sync_all())
-            .map_err(|err| RogError::Write(MODPROBE_PATH.into(), err))?;
-
-        Ok(())
-    }
-
-    fn unbind_remove_nvidia(devices: &[GraphicsDevice]) -> Result<(), RogError> {
-        // Unbind NVIDIA graphics devices and their functions
-        let unbinds = devices.iter().map(|dev| dev.unbind());
-        // Remove NVIDIA graphics devices and their functions
-        let removes = devices.iter().map(|dev| dev.remove());
-        unbinds.chain(removes).collect::<Result<_, _>>()
-            .map_err(|err| RogError::Command("device unbind error".into(), err))
-    }
-
-    fn unbind_only(devices: &[GraphicsDevice]) -> Result<(), RogError> {
-        let unbinds = devices.iter().map(|dev| dev.unbind());
-        unbinds.collect::<Result<_, _>>()
-            .map_err(|err| RogError::Command("device unbind error".into(), err))
-    }
-
-    /// Add or remove driver modules
-    fn do_driver_action(driver: &str, action: &str) -> Result<(), GfxError> {
-        let mut cmd = Command::new(action);
-        cmd.arg(driver);
-
-        let mut count = 0;
-        const MAX_TRIES: i32 = 6;
-        loop {
-            if count > MAX_TRIES {
-                let msg = format!("{} {} failed for unknown reason", action, driver);
-                error!("GFX: {}", msg);
-                return Ok(()); //Err(RogError::Modprobe(msg));
-            }
-
-            let output = cmd
-                .output()
-                .map_err(|err| GfxError::Command(format!("{:?}", cmd), err))?;
-            if !output.status.success() {
-                if output
-                    .stderr
-                    .ends_with("is not currently loaded\n".as_bytes())
-                {
-                    return Ok(());
-                }
-                if output.stderr.ends_with("is builtin.\n".as_bytes()) {
-                    return Err(GfxError::VfioBuiltin);
-                }
-                if output.stderr.ends_with("Permission denied\n".as_bytes()) {
-                    warn!(
-                        "{} {} failed: {:?}",
-                        action,
-                        driver,
-                        String::from_utf8_lossy(&output.stderr)
-                    );
-                    warn!("GFX: It may be safe to ignore the above error, run `lsmod |grep {}` to confirm modules loaded", driver);
-                    return Ok(());
-                }
-                if String::from_utf8_lossy(&output.stderr)
-                    .contains(&format!("Module {} not found", driver))
-                {
-                    return Err(GfxError::MissingModule(driver.into()));
-                }
-                if count >= MAX_TRIES {
-                    let msg = format!(
-                        "{} {} failed: {:?}",
-                        action,
-                        driver,
-                        String::from_utf8_lossy(&output.stderr)
-                    );
-                    return Err(GfxError::Modprobe(msg));
-                }
-            } else if output.status.success() {
-                return Ok(());
-            }
-
-            count += 1;
-            std::thread::sleep(std::time::Duration::from_millis(50));
-        }
-    }
-
-    fn do_display_manager_action(action: &str) -> Result<(), RogError> {
-        let mut cmd = Command::new("systemctl");
-        cmd.arg(action);
-        cmd.arg(DISPLAY_MANAGER);
-
-        let status = cmd
-            .status()
-            .map_err(|err| RogError::Command(format!("{:?}", cmd), err))?;
-        if !status.success() {
-            let msg = format!(
-                "systemctl {} {} failed: {:?}",
-                action, DISPLAY_MANAGER, status
-            );
-            return Err(GfxError::DisplayManagerAction(msg, status).into());
-        }
-        Ok(())
-    }
-
-    fn wait_display_manager_state(state: &str) -> Result<(), RogError> {
-        let mut cmd = Command::new("systemctl");
-        cmd.arg("is-active");
-        cmd.arg(DISPLAY_MANAGER);
-
-        let mut count = 0;
-
-        while count <= (4 * 3) {
-            // 3 seconds max
-            let output = cmd
-                .output()
-                .map_err(|err| RogError::Command(format!("{:?}", cmd), err))?;
-            if output.stdout.starts_with(state.as_bytes()) {
-                return Ok(());
-            }
-            std::thread::sleep(std::time::Duration::from_millis(250));
-            count += 1;
-        }
-        Err(GfxError::DisplayManagerTimeout(state.into()).into())
-    }
-
-    /// Determine if we need to logout/thread. Integrated<->Vfio mode does not
-    /// require logout.
-    fn is_logout_required(&self, vendor: GfxVendors) -> GfxRequiredUserAction {
-        if let Ok(config) = self.config.lock() {
-            let current = config.gfx_mode;
-            // Modes that can switch without logout
-            if matches!(
-                current,
-                GfxVendors::Integrated | GfxVendors::Vfio | GfxVendors::Compute
-            ) && matches!(
-                vendor,
-                GfxVendors::Integrated | GfxVendors::Vfio | GfxVendors::Compute
-            ) {
-                return GfxRequiredUserAction::None;
-            }
-            // Modes that require a switch to integrated first
-            if matches!(current, GfxVendors::Nvidia | GfxVendors::Hybrid)
-                && matches!(vendor, GfxVendors::Compute | GfxVendors::Vfio)
-            {
-                return GfxRequiredUserAction::Integrated;
-            }
-        }
-        GfxRequiredUserAction::Logout
-    }
-
-    /// Do a full setup flow for the chosen mode:
-    ///
-    /// Tasks:
-    /// - rescan for devices
-    /// - write xorg config
-    /// - write modprobe config
-    ///   + add drivers
-    ///   + or remove drivers and devices
-    ///
-    /// The daemon needs direct access to this function when it detects that the
-    /// bios has G-Sync switch is enabled
-    pub fn do_mode_setup_tasks(
-        vendor: GfxVendors,
-        vfio_enable: bool,
-        devices: &[GraphicsDevice],
-        bus: &PciBus,
-    ) -> Result<(), RogError> {
-        // Rescan before doing remove or add drivers
-        bus.rescan()?;
-        // Make sure the power management is set to auto for nvidia devices
-        let devs = PciDevice::all()?;
-        for dev in devs.iter() {
-            let c = dev.class().map_err(|err| {
-                error!(
-                    "GFX: device error: {}, {}",
-                    dev.path().to_string_lossy(),
-                    err
-                );
-                err
-            })?;
-            if 0x03 == (c >> 16) & 0xFF && dev.vendor()? == 0x10DE {
-                info!("GFX: {}: NVIDIA graphics, setting PM to auto", dev.id());
-                dev.set_runtime_pm(sysfs_class::RuntimePowerManagement::On)?;
-            }
-        }
-        // Only these modes should have xorg config
-        if matches!(
-            vendor,
-            GfxVendors::Nvidia | GfxVendors::Hybrid | GfxVendors::Integrated
-        ) {
-            Self::write_xorg_conf(vendor)?;
-        }
-
-        // Write different modprobe to enable boot control to work
-        Self::write_modprobe_conf(vendor, devices)?;
-
-        match vendor {
-            GfxVendors::Nvidia | GfxVendors::Hybrid | GfxVendors::Compute => {
-                if vfio_enable {
-                    for driver in VFIO_DRIVERS.iter() {
-                        Self::do_driver_action(driver, "rmmod")?;
-                    }
-                }
-                for driver in NVIDIA_DRIVERS.iter() {
-                    Self::do_driver_action(driver, "modprobe")?;
-                }
-            }
-            GfxVendors::Vfio => {
-                if vfio_enable {
-                    Self::do_driver_action("nouveau", "rmmod")?;
-                    for driver in NVIDIA_DRIVERS.iter() {
-                        Self::do_driver_action(driver, "rmmod")?;
-                    }
-                    Self::unbind_only(devices)?;
-                    Self::do_driver_action("vfio-pci", "modprobe")?;
-                } else {
-                    return Err(GfxError::VfioDisabled.into());
-                }
-            }
-            GfxVendors::Integrated => {
-                Self::do_driver_action("nouveau", "rmmod")?;
-                if vfio_enable {
-                    for driver in VFIO_DRIVERS.iter() {
-                        Self::do_driver_action(driver, "rmmod")?;
-                    }
-                }
-                for driver in NVIDIA_DRIVERS.iter() {
-                    Self::do_driver_action(driver, "rmmod")?;
-                }
-                Self::unbind_remove_nvidia(devices)?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Check if the user has any graphical uiser sessions that are active or online
-    fn graphical_user_sessions_exist(
-        connection: &Connection,
-        sessions: &[SessionInfo],
-    ) -> Result<bool, RogError> {
-        for session in sessions {
-            let session_proxy = SessionProxy::new(connection, session)?;
-            if session_proxy.get_class()? == SessionClass::User {
-                match session_proxy.get_type()? {
-                    SessionType::X11 | SessionType::Wayland | SessionType::MIR => {
-                        match session_proxy.get_state()? {
-                            SessionState::Online | SessionState::Active => return Ok(true),
-                            SessionState::Closing | SessionState::Invalid => {}
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-        Ok(false)
-    }
-
-    /// Spools until all user sessions are ended then switches to requested mode
-    fn create_mode_change_thread(
-        vendor: GfxVendors,
-        devices: Vec<GraphicsDevice>,
-        bus: PciBus,
-        thread_stop: mpsc::Receiver<bool>,
-        config: Arc<Mutex<Config>>,
-    ) -> Result<String, RogError> {
-        info!("GFX: display-manager thread started");
-
-        const SLEEP_PERIOD: Duration = Duration::from_millis(100);
-        let start_time = Instant::now();
-
-        let connection = Connection::new_system()?;
-        let manager = ManagerProxy::new(&connection)?;
-        let mut sessions = manager.list_sessions()?;
-
-        loop {
-            let tmp = manager.list_sessions()?;
-            if !tmp.iter().eq(&sessions) {
-                info!("GFX thread: Sessions list changed");
-                sessions = tmp;
-            }
-
-            if !Self::graphical_user_sessions_exist(&connection, &sessions)? {
-                break;
-            }
-
-            if let Ok(stop) = thread_stop.try_recv() {
-                if stop {
-                    return Ok("Graphics mode change was cancelled".into());
-                }
-            }
-            // exit if 3 minutes pass
-            if Instant::now().duration_since(start_time).as_secs() > 180 {
-                warn!("{}", THREAD_TIMEOUT_MSG);
-                return Ok(THREAD_TIMEOUT_MSG.into());
-            }
-
-            // Don't spin at max speed
-            sleep(SLEEP_PERIOD);
-        }
-
-        info!("GFX thread: all graphical user sessions ended, continuing");
-        Self::do_display_manager_action("stop")?;
-        Self::wait_display_manager_state("inactive")?;
-
-        let mut mode_to_save = vendor;
-        // Need to change to integrated before we can change to vfio or compute
-        if let Ok(mut config) = config.try_lock() {
-            // Since we have a lock, reset tmp to none. This thread should only ever run
-            // for Integrated, Hybrid, or Nvidia. Tmp is also only for informational
-            config.gfx_tmp_mode = None;
-            //
-            let vfio_enable = config.gfx_vfio_enable;
-
-            // Failsafe. In the event this loop is run with a switch from nvidia in use
-            // to vfio or compute do a forced switch to integrated instead to prevent issues
-            if matches!(vendor, GfxVendors::Compute | GfxVendors::Vfio)
-                && matches!(config.gfx_mode, GfxVendors::Nvidia | GfxVendors::Hybrid)
-            {
-                Self::do_mode_setup_tasks(GfxVendors::Integrated, vfio_enable, &devices, &bus)?;
-                Self::do_display_manager_action("restart")?;
-                mode_to_save = GfxVendors::Integrated;
-            } else {
-                Self::do_mode_setup_tasks(vendor, vfio_enable, &devices, &bus)?;
-                Self::do_display_manager_action("restart")?;
-            }
-        }
-
-        // Save selected mode in case of reboot
-        Self::save_gfx_mode(mode_to_save, config);
-        info!("GFX thread: display-manager started");
-
-        let v: &str = vendor.into();
-        info!("GFX thread: Graphics mode changed to {} successfully", v);
-        Ok(format!("Graphics mode changed to {} successfully", v))
-    }
-
-    /// Before starting a new thread the old one *must* be cancelled
-    fn cancel_mode_change_thread(&self) {
-        if let Ok(lock) = self.thread_kill.lock() {
-            if let Some(tx) = lock.as_ref() {
-                // Cancel the running thread
-                info!("GFX: Cancelling previous thread");
-                tx.send(true)
-                    .map_err(|err| {
-                        warn!("GFX thread: {}", err);
-                    })
-                    .ok();
-            }
-        }
-    }
-
-    /// The thread is used only in cases where a logout is required
-    fn setup_mode_change_thread(&mut self, vendor: GfxVendors) {
-        let config = self.config.clone();
-        let devices = self.nvidia.clone();
-        let bus = self.bus.clone();
-        let (tx, rx) = mpsc::channel();
-        if let Ok(mut lock) = self.thread_kill.lock() {
-            *lock = Some(tx);
-        }
-        let thread_kill = self.thread_kill.clone();
-
-        std::thread::spawn(move || {
-            Self::create_mode_change_thread(vendor, devices, bus, rx, config)
-                .map_err(|err| {
-                    error!("GFX: {}", err);
-                })
-                .ok();
-            // clear the tx/rx when done
-            if let Ok(mut lock) = thread_kill.try_lock() {
-                *lock = None;
-            }
-        });
-    }
-
-    /// Initiates a mode change by starting a thread that will wait until all
-    /// graphical sessions are exited before performing the tasks required
-    /// to switch modes.
-    ///
-    /// For manually calling (not on boot/startup) via dbus
-    pub fn set_gfx_mode(&mut self, vendor: GfxVendors) -> Result<GfxRequiredUserAction, RogError> {
-        if let Ok(gsync) = CtrlRogBios::get_gfx_mode() {
-            if gsync == 1 {
-                return Err(GfxError::GsyncModeActive.into());
-            }
-        }
-
-        let vfio_enable = if let Ok(config) = self.config.try_lock() {
-            config.gfx_vfio_enable
-        } else {
-            false
-        };
-
-        if !vfio_enable && matches!(vendor, GfxVendors::Vfio) {
-            return Err(GfxError::VfioDisabled.into());
-        }
-
-        // Must always cancel any thread running
-        self.cancel_mode_change_thread();
-        // determine which method we need here
-        let action_required = self.is_logout_required(vendor);
-
-        match action_required {
-            GfxRequiredUserAction::Logout => {
-                info!("GFX: mode change requires a logout to complete");
-                self.setup_mode_change_thread(vendor);
-            }
-            GfxRequiredUserAction::Reboot => {
-                info!("GFX: mode change requires reboot");
-                let devices = self.nvidia.clone();
-                let bus = self.bus.clone();
-                Self::do_mode_setup_tasks(vendor, vfio_enable, &devices, &bus)?;
-                info!("GFX: Graphics mode changed to {}", <&str>::from(vendor));
-            }
-            GfxRequiredUserAction::Integrated => {
-                info!("GFX: mode change requires user to be in Integrated mode first");
-            }
-            GfxRequiredUserAction::None => {
-                info!("GFX: mode change does not require logout");
-                let devices = self.nvidia.clone();
-                let bus = self.bus.clone();
-                Self::do_mode_setup_tasks(vendor, vfio_enable, &devices, &bus)?;
-                info!("GFX: Graphics mode changed to {}", <&str>::from(vendor));
-                if let Ok(mut config) = self.config.try_lock() {
-                    config.gfx_tmp_mode = None;
-                    if matches!(vendor, GfxVendors::Vfio | GfxVendors::Compute) {
-                        config.gfx_tmp_mode = Some(vendor);
-                    }
-                }
-            }
-        }
-
-        Ok(action_required)
-    }
-
-    /// Used only on boot to set correct mode
-    fn auto_power(&mut self) -> Result<(), RogError> {
-        let vendor = self.get_gfx_mode()?;
-        let devices = self.nvidia.clone();
-        let bus = self.bus.clone();
-
-        let vfio_enable = if let Ok(config) = self.config.try_lock() {
-            config.gfx_vfio_enable
-        } else {
-            false
-        };
-
-        Self::do_mode_setup_tasks(vendor, vfio_enable, &devices, &bus)?;
-        Self::toggle_fallback_service(vendor)?;
-        Ok(())
-    }
-}
--- a/daemon/src/ctrl_gfx/error.rs
+++ b/daemon/src/ctrl_gfx/error.rs
@@ -1,58 +0,0 @@
-use std::fmt;
-use std::{error, process::ExitStatus};
-
-use crate::error::RogError;
-
-#[derive(Debug)]
-pub enum GfxError {
-    ParseVendor,
-    ParsePower,
-    Bus(String, std::io::Error),
-    DisplayManagerAction(String, ExitStatus),
-    DisplayManagerTimeout(String),
-    GsyncModeActive,
-    VfioBuiltin,
-    VfioDisabled,
-    MissingModule(String),
-    Modprobe(String),
-    Command(String, std::io::Error),
-}
-
-impl fmt::Display for GfxError {
-    // This trait requires `fmt` with this exact signature.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            GfxError::ParseVendor => write!(f, "Could not parse vendor name"),
-            GfxError::ParsePower => write!(f, "Could not parse dGPU power status"),
-            GfxError::Bus(func, error) => write!(f, "Bus error: {}: {}", func, error),
-            GfxError::DisplayManagerAction(action, status) => {
-                write!(f, "Display-manager action {} failed: {}", action, status)
-            }
-            GfxError::DisplayManagerTimeout(state) => {
-                write!(f, "Timed out waiting for display-manager {} state", state)
-            }
-            GfxError::GsyncModeActive => write!(
-                f,
-                "Can not switch gfx modes when dedicated/G-Sync mode is active"
-            ),
-            GfxError::VfioBuiltin => write!(
-                f,
-                "Can not switch to vfio mode if the modules are built in to kernel"
-            ),
-            GfxError::VfioDisabled => {
-                write!(f, "Can not switch to vfio mode if disabled in config file")
-            }
-            GfxError::MissingModule(m) => write!(f, "The module {} is missing", m),
-            GfxError::Modprobe(detail) => write!(f, "Modprobe error: {}", detail),
-            GfxError::Command(func, error) => write!(f, "Command exec error: {}: {}", func, error),
-        }
-    }
-}
-
-impl error::Error for GfxError {}
-
-impl From<GfxError> for RogError {
-    fn from(err: GfxError) -> Self {
-        RogError::GfxSwitching(err)
-    }
-}
--- a/daemon/src/ctrl_gfx/mod.rs
+++ b/daemon/src/ctrl_gfx/mod.rs
@@ -1,62 +0,0 @@
-pub mod error;
-
-pub mod controller;
-
-pub mod system;
-
-pub mod zbus_gfx;
-
-const NVIDIA_DRIVERS: [&str; 4] = ["nvidia_drm", "nvidia_modeset", "nvidia_uvm", "nvidia"];
-
-const VFIO_DRIVERS: [&str; 5] = [
-    "vfio-pci",
-    "vfio_iommu_type1",
-    "vfio_virqfd",
-    "vfio_mdev",
-    "vfio",
-];
-
-const DISPLAY_MANAGER: &str = "display-manager.service";
-
-const MODPROBE_PATH: &str = "/etc/modprobe.d/asusd.conf";
-
-static MODPROBE_BASE: &[u8] = br#"# Automatically generated by asusd
-# If you have issues with i2c_nvidia_gpu, copy the 2 lines below to a
-# new blacklist file and uncomment
-#blacklist i2c_nvidia_gpu
-#alias i2c_nvidia_gpu off
-blacklist nouveau
-alias nouveau off
-options nvidia NVreg_DynamicPowerManagement=0x02
-"#;
-
-static MODPROBE_DRM_MODESET: &[u8] = br#"
-options nvidia-drm modeset=1
-"#;
-
-static MODPROBE_INTEGRATED: &[u8] = br#"# Automatically generated by asusd
-blacklist i2c_nvidia_gpu
-blacklist nvidia
-blacklist nvidia-drm
-blacklist nvidia-modeset
-blacklist nouveau
-alias nouveau off
-"#;
-
-static MODPROBE_VFIO: &[u8] = br#"options vfio-pci ids="#;
-
-const XORG_FILE: &str = "90-nvidia-primary.conf";
-const XORG_PATH: &str = "/etc/X11/xorg.conf.d/";
-
-static PRIMARY_GPU_BEGIN: &[u8] = br#"# Automatically generated by asusd
-Section "OutputClass"
-    Identifier "nvidia"
-    MatchDriver "nvidia-drm"
-    Driver "nvidia"
-    Option "AllowEmptyInitialConfiguration" "true""#;
-
-static PRIMARY_GPU_NVIDIA: &[u8] = br#"
-    Option "PrimaryGPU" "true""#;
-
-static PRIMARY_GPU_END: &[u8] = br#"
-EndSection"#;
--- a/daemon/src/ctrl_gfx/system.rs
+++ b/daemon/src/ctrl_gfx/system.rs
@@ -1,160 +0,0 @@
-use log::{error, info, warn};
-use std::fs::read_to_string;
-use std::{fs::write, io, path::PathBuf};
-use sysfs_class::{PciDevice, SysClass};
-
-pub struct Module {
-    pub name: String,
-}
-
-impl Module {
-    fn parse(line: &str) -> io::Result<Module> {
-        let mut parts = line.split(' ');
-
-        let name = parts
-            .next()
-            .ok_or_else(|| io::Error::new(io::ErrorKind::InvalidData, "module name not found"))?;
-
-        Ok(Module {
-            name: name.to_string(),
-        })
-    }
-
-    pub fn all() -> io::Result<Vec<Module>> {
-        let mut modules = Vec::new();
-
-        let data = read_to_string("/proc/modules")?;
-        for line in data.lines() {
-            let module = Module::parse(line)?;
-            modules.push(module);
-        }
-
-        Ok(modules)
-    }
-}
-
-#[derive(Clone)]
-pub struct PciBus {
-    path: PathBuf,
-}
-
-impl PciBus {
-    pub fn new() -> io::Result<PciBus> {
-        let path = PathBuf::from("/sys/bus/pci");
-        if path.is_dir() {
-            Ok(PciBus { path })
-        } else {
-            Err(io::Error::new(
-                io::ErrorKind::NotFound,
-                "pci directory not found",
-            ))
-        }
-    }
-
-    /// Will rescan the device tree, which adds all removed devices back
-    pub fn rescan(&self) -> io::Result<()> {
-        write(self.path.join("rescan"), "1")
-    }
-}
-
-#[derive(Clone)]
-pub struct GraphicsDevice {
-    _id: String,
-    functions: Vec<PciDevice>,
-}
-
-impl GraphicsDevice {
-    pub fn new(id: String, functions: Vec<PciDevice>) -> GraphicsDevice {
-        GraphicsDevice { _id: id, functions }
-    }
-
-    pub fn exists(&self) -> bool {
-        self.functions.iter().any(|func| func.path().exists())
-    }
-
-    pub fn functions(&self) -> &[PciDevice] {
-        &self.functions
-    }
-
-    pub fn unbind(&self) -> Result<(), std::io::Error> {
-        for func in self.functions.iter() {
-            if func.path().exists() {
-                match func.driver() {
-                    Ok(driver) => {
-                        info!("{}: Unbinding {}", driver.id(), func.id());
-                        unsafe {
-                            driver.unbind(func).map_err(|err| {
-                                error!("gfx unbind: {}", err);
-                                err
-                            })?;
-                        }
-                    }
-                    Err(err) => match err.kind() {
-                        io::ErrorKind::NotFound => (),
-                        _ => {
-                            error!("gfx driver: {:?}, {}", func.path(), err);
-                            return Err(err);
-                        }
-                    },
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn rebind(&self) -> Result<(), std::io::Error> {
-        for func in self.functions.iter() {
-            if func.path().exists() {
-                match func.driver() {
-                    Ok(driver) => {
-                        info!("{}: Binding {}", driver.id(), func.id());
-                        unsafe {
-                            driver.bind(func).map_err(|err| {
-                                error!("gfx bind: {}", err);
-                                err
-                            })?;
-                        }
-                    }
-                    Err(err) => match err.kind() {
-                        io::ErrorKind::NotFound => (),
-                        _ => {
-                            error!("gfx driver: {:?}, {}", func.path(), err);
-                            return Err(err);
-                        }
-                    },
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn remove(&self) -> Result<(), std::io::Error> {
-        for func in self.functions.iter() {
-            if func.path().exists() {
-                match func.driver() {
-                    Ok(driver) => {
-                        error!("{}: in use by {}", func.id(), driver.id());
-                    }
-                    Err(why) => match why.kind() {
-                        std::io::ErrorKind::NotFound => {
-                            info!("{}: Removing", func.id());
-                            unsafe {
-                                // ignore errors and carry on
-                                if let Err(err) = func.remove() {
-                                    error!("gfx remove: {}", err);
-                                }
-                            }
-                        }
-                        _ => {
-                            error!("Remove device failed");
-                        }
-                    },
-                }
-            } else {
-                warn!("{}: Already removed", func.id());
-            }
-        }
-        info!("Removed all gfx devices");
-        Ok(())
-    }
-}
--- a/daemon/src/ctrl_gfx/zbus_gfx.rs
+++ b/daemon/src/ctrl_gfx/zbus_gfx.rs
@@ -1,56 +0,0 @@
-use ::zbus::dbus_interface;
-use log::{error, info, warn};
-use rog_types::gfx_vendors::{GfxPower, GfxRequiredUserAction, GfxVendors};
-use zvariant::ObjectPath;
-
-use crate::ZbusAdd;
-
-use super::controller::CtrlGraphics;
-
-#[dbus_interface(name = "org.asuslinux.Daemon")]
-impl CtrlGraphics {
-    fn vendor(&self) -> zbus::fdo::Result<GfxVendors> {
-        self.get_gfx_mode().map_err(|err| {
-            error!("GFX: {}", err);
-            zbus::fdo::Error::Failed(format!("GFX fail: {}", err))
-        })
-    }
-
-    fn power(&self) -> zbus::fdo::Result<GfxPower> {
-        Self::get_runtime_status().map_err(|err| {
-            error!("GFX: {}", err);
-            zbus::fdo::Error::Failed(format!("GFX fail: {}", err))
-        })
-    }
-
-    fn set_vendor(&mut self, vendor: GfxVendors) -> zbus::fdo::Result<GfxRequiredUserAction> {
-        info!("GFX: Switching gfx mode to {}", <&str>::from(vendor));
-        let msg = self.set_gfx_mode(vendor).map_err(|err| {
-            error!("GFX: {}", err);
-            zbus::fdo::Error::Failed(format!("GFX fail: {}", err))
-        })?;
-        self.notify_gfx(&vendor)
-            .unwrap_or_else(|err| warn!("GFX: {}", err));
-        self.notify_action(&msg)
-            .unwrap_or_else(|err| warn!("GFX: {}", err));
-        Ok(msg)
-    }
-
-    #[dbus_interface(signal)]
-    fn notify_gfx(&self, vendor: &GfxVendors) -> zbus::Result<()> {}
-
-    #[dbus_interface(signal)]
-    fn notify_action(&self, action: &GfxRequiredUserAction) -> zbus::Result<()> {}
-}
-
-impl ZbusAdd for CtrlGraphics {
-    fn add_to_server(self, server: &mut zbus::ObjectServer) {
-        server
-            .at(&ObjectPath::from_str_unchecked("/org/asuslinux/Gfx"), self)
-            .map_err(|err| {
-                warn!("GFX: CtrlGraphics: add_to_server {}", err);
-                err
-            })
-            .ok();
-    }
-}
--- a/daemon/src/ctrl_profiles/config.rs
+++ b/daemon/src/ctrl_profiles/config.rs
@@ -0,0 +1,101 @@
+use log::{error, warn};
+use rog_profiles::{FanCurveProfiles, Profile};
+use serde_derive::{Deserialize, Serialize};
+use std::fs::{File, OpenOptions};
+use std::io::{Read, Write};
+
+#[derive(Deserialize, Serialize, Debug)]
+pub struct ProfileConfig {
+    #[serde(skip)]
+    config_path: String,
+    /// For restore on boot
+    pub active_profile: Profile,
+    /// States to restore
+    pub fan_curves: Option<FanCurveProfiles>,
+}
+
+impl ProfileConfig {
+    fn new(config_path: String) -> Self {
+        Self {
+            config_path,
+            active_profile: Profile::Balanced,
+            fan_curves: None,
+        }
+    }
+
+    pub fn set_defaults_and_save(&mut self) {
+        self.active_profile = Profile::get_active_profile().unwrap_or(Profile::Balanced);
+        if let Ok(res) = FanCurveProfiles::is_supported() {
+            if res {
+                let curves = FanCurveProfiles::default();
+                self.fan_curves = Some(curves);
+            }
+        }
+        self.write();
+    }
+
+    pub fn load(config_path: String) -> Self {
+        let mut file = OpenOptions::new()
+            .read(true)
+            .write(true)
+            .create(true)
+            .open(&config_path)
+            .unwrap_or_else(|_| panic!("The directory /etc/asusd/ is missing")); // okay to cause panic here
+        let mut buf = String::new();
+        let mut config;
+        if let Ok(read_len) = file.read_to_string(&mut buf) {
+            if read_len == 0 {
+                config = Self::new(config_path);
+                config.set_defaults_and_save();
+            } else if let Ok(data) = toml::from_str(&buf) {
+                config = data;
+                config.config_path = config_path;
+            } else {
+                warn!(
+                    "Could not deserialise {}.\nWill rename to {}-old and recreate config",
+                    config_path, config_path
+                );
+                let cfg_old = config_path.clone() + "-old";
+                std::fs::rename(config_path.clone(), cfg_old).unwrap_or_else(|err| {
+                    panic!(
+                        "Could not rename. Please remove {} then restart service: Error {}",
+                        config_path, err
+                    )
+                });
+                config = Self::new(config_path);
+                config.set_defaults_and_save();
+            }
+        } else {
+            config = Self::new(config_path);
+            config.set_defaults_and_save();
+        }
+        config
+    }
+
+    pub fn read(&mut self) {
+        let mut file = OpenOptions::new()
+            .read(true)
+            .open(&self.config_path)
+            .unwrap_or_else(|err| panic!("Error reading {}: {}", self.config_path, err));
+
+        let mut buf = String::new();
+        if let Ok(l) = file.read_to_string(&mut buf) {
+            if l == 0 {
+                warn!("File is empty {}", self.config_path);
+            } else {
+                let mut data: ProfileConfig = toml::from_str(&buf)
+                    .unwrap_or_else(|_| panic!("Could not deserialise {}", self.config_path));
+                // copy over serde skipped values
+                data.config_path = self.config_path.clone();
+                *self = data;
+            }
+        }
+    }
+
+    pub fn write(&self) {
+        let mut file = File::create(&self.config_path).expect("Couldn't overwrite config");
+        let data = toml::to_string(self).expect("Parse config to toml failed");
+        file.write_all(data.as_bytes())
+            .unwrap_or_else(|err| error!("Could not write config: {}", err));
+    }
+}
--- a/daemon/src/ctrl_profiles/controller.rs
+++ b/daemon/src/ctrl_profiles/controller.rs
@@ -1,118 +1,150 @@
-use crate::error::RogError;
-use crate::{config::Config, GetSupported};
-use log::{info, warn};
-use rog_profiles::profiles::Profile;
-use rog_types::supported::FanCpuSupportedFunctions;
-use std::sync::Arc;
-use std::sync::Mutex;
+use std::sync::{Arc, Mutex};

-pub struct CtrlFanAndCpu {
-    pub config: Arc<Mutex<Config>>,
+use crate::error::RogError;
+use crate::{CtrlTask, GetSupported};
+use log::{info, warn};
+use rog_profiles::error::ProfileError;
+use rog_profiles::{FanCurveProfiles, Profile};
+use rog_supported::PlatformProfileFunctions;
+
+use super::config::ProfileConfig;
+
+pub struct CtrlPlatformProfile {
+    pub config: ProfileConfig,
 }

-impl GetSupported for CtrlFanAndCpu {
-    type A = FanCpuSupportedFunctions;
+impl GetSupported for CtrlPlatformProfile {
+    type A = PlatformProfileFunctions;

    fn get_supported() -> Self::A {
-        FanCpuSupportedFunctions {
-            stock_fan_modes: Profile::get_fan_path().is_ok(),
-            min_max_freq: Profile::get_intel_supported(),
-            fan_curve_set: rog_fan_curve::Board::from_board_name().is_some(),
+        if !Profile::is_platform_profile_supported() {
+            warn!(
+                r#"
+platform_profile kernel interface not found, your laptop does not support this, or the interface is missing.
+To enable profile support you require a kernel version 5.15.2 minimum.
+"#
+            );
+        }
+
+        let res = FanCurveProfiles::is_supported();
+        let mut fan_curve_supported = res.is_err();
+        if let Ok(r) = res {
+            fan_curve_supported = r;
+        };
+
+        if !fan_curve_supported {
+            info!(
+                r#"
+fan curves kernel interface not found, your laptop does not support this, or the interface is missing.
+To enable fan-curve support you require a kernel with the following patch applied:
+https://lkml.org/lkml/2021/10/23/250
+This patch has been accepted upstream for 5.17 kernel release.
+"#
+            );
+        }
+
+        PlatformProfileFunctions {
+            platform_profile: Profile::is_platform_profile_supported(),
+            fan_curves: fan_curve_supported,
        }
    }
 }

-impl crate::Reloadable for CtrlFanAndCpu {
-    /// Fetcht he active profile and use that to set all related components up
+impl crate::Reloadable for CtrlPlatformProfile {
+    /// Fetch the active profile and use that to set all related components up
    fn reload(&mut self) -> Result<(), RogError> {
-        if let Ok(mut cfg) = self.config.clone().try_lock() {
-            let active = cfg.active_profile.clone();
-            if let Some(existing) = cfg.power_profiles.get_mut(&active) {
-                existing.set_system_all()?;
+        if let Some(curves) = &mut self.config.fan_curves {
+            if let Ok(mut device) = FanCurveProfiles::get_device() {
+                // There is a possibility that the curve was default zeroed, so this call initialises
+                // the data from system read and we need to save it after
+                curves.write_profile_curve_to_platform(self.config.active_profile, &mut device)?;
+                self.config.write();
            }
        }
        Ok(())
    }
 }

-impl CtrlFanAndCpu {
-    pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> {
-        Profile::get_fan_path()?;
-        info!("Device has fan control available");
-        Ok(CtrlFanAndCpu { config })
-    }
+impl CtrlPlatformProfile {
+    pub fn new(config: ProfileConfig) -> Result<Self, RogError> {
+        if Profile::is_platform_profile_supported() {
+            info!("Device has profile control available");

-    /// Toggle to next profile in list
-    pub(super) fn do_next_profile(&mut self) -> Result<(), RogError> {
-        if let Ok(mut config) = self.config.clone().try_lock() {
-            // Read first just incase the user has modified the config before calling this
-            config.read();
-
-            let mut toggle_index = config
-                .toggle_profiles
-                .binary_search(&config.active_profile)
-                .unwrap_or(0)
-                + 1;
-            if toggle_index >= config.toggle_profiles.len() {
-                toggle_index = 0;
+            if FanCurveProfiles::get_device().is_ok() {
+                info!("Device has fan curves available");
            }

-            let profile = config.toggle_profiles[toggle_index].clone();
+            return Ok(CtrlPlatformProfile { config });
+        }

-            if let Some(existing) = config.power_profiles.get(&profile) {
-                existing.set_system_all()?;
-                config.active_profile = existing.name.clone();
-                config.write();
-                info!("Profile was changed to: {}", &profile);
-            } else {
-                warn!(
-                    "toggle_profile {} does not exist in power_profiles",
-                    &profile
-                );
-                return Err(RogError::MissingProfile(profile.to_string()));
+        Err(ProfileError::NotSupported.into())
+    }
+
+    pub fn save_config(&self) {
+        self.config.write();
+    }
+
+    /// Toggle to next profile in list. This will first read the config, switch, then write out
+    pub(super) fn set_next_profile(&mut self) -> Result<(), RogError> {
+        // Read first just incase the user has modified the config before calling this
+        match self.config.active_profile {
+            Profile::Balanced => {
+                Profile::set_profile(Profile::Performance)?;
+                self.config.active_profile = Profile::Performance;
+            }
+            Profile::Performance => {
+                Profile::set_profile(Profile::Quiet)?;
+                self.config.active_profile = Profile::Quiet;
+            }
+            Profile::Quiet => {
+                Profile::set_profile(Profile::Balanced)?;
+                self.config.active_profile = Profile::Balanced;
+            }
+        }
+        self.write_profile_curve_to_platform()?;
+        Ok(())
+    }
+
+    /// Set the curve for the active profile active
+    pub(super) fn write_profile_curve_to_platform(&mut self) -> Result<(), RogError> {
+        if let Some(curves) = &mut self.config.fan_curves {
+            if let Ok(mut device) = FanCurveProfiles::get_device() {
+                curves.write_profile_curve_to_platform(self.config.active_profile, &mut device)?;
            }
        }
        Ok(())
    }

-    pub(super) fn set_active(&mut self, profile: &str) -> Result<(), RogError> {
-        if let Ok(mut config) = self.config.clone().try_lock() {
-            // Read first just incase the user has modified the config before calling this
-            config.read();
-            if let Some(existing) = config.power_profiles.get(profile) {
-                existing.set_system_all()?;
-                config.active_profile = existing.name.clone();
-                config.write();
-                info!("Profile was changed to: {}", profile);
-            } else {
-                warn!(
-                    "toggle_profile {} does not exist in power_profiles",
-                    profile
-                );
-                return Err(RogError::MissingProfile(profile.to_string()));
+    pub(super) fn set_active_curve_to_defaults(&mut self) -> Result<(), RogError> {
+        if let Some(curves) = self.config.fan_curves.as_mut() {
+            if let Ok(mut device) = FanCurveProfiles::get_device() {
+                curves.set_active_curve_to_defaults(self.config.active_profile, &mut device)?;
+            }
+        }
+        Ok(())
+    }
+}
+
+pub struct CtrlProfileTask {
+    ctrl: Arc<Mutex<CtrlPlatformProfile>>,
+}
+
+impl CtrlProfileTask {
+    pub fn new(ctrl: Arc<Mutex<CtrlPlatformProfile>>) -> Self {
+        Self { ctrl }
+    }
+}
+
+impl CtrlTask for CtrlProfileTask {
+    fn do_task(&self) -> Result<(), RogError> {
+        if let Ok(ref mut lock) = self.ctrl.try_lock() {
+            let new_profile = Profile::get_active_profile().unwrap();
+            if new_profile != lock.config.active_profile {
+                lock.config.active_profile = new_profile;
+                lock.write_profile_curve_to_platform()?;
+                lock.save_config();
            }
        }
        Ok(())
    }
-
-    /// Create a new profile if the requested name doesn't exist, or modify existing
-    pub(super) fn new_or_modify(&mut self, profile: &Profile) -> Result<(), RogError> {
-        if let Ok(mut config) = self.config.clone().try_lock() {
-            config.read();
-
-            if let Some(existing) = config.power_profiles.get_mut(&profile.name) {
-                *existing = profile.clone();
-                existing.set_system_all()?;
-            } else {
-                config
-                    .power_profiles
-                    .insert(profile.name.clone(), profile.clone());
-                profile.set_system_all()?;
-            }
-
-            config.active_profile = profile.name.clone();
-            config.write();
-        }
-        Ok(())
-    }
 }
--- a/daemon/src/ctrl_profiles/mod.rs
+++ b/daemon/src/ctrl_profiles/mod.rs
@@ -1,3 +1,3 @@
-pub mod zbus;
-
+pub mod config;
 pub mod controller;
+pub mod zbus;
--- a/daemon/src/ctrl_profiles/zbus.rs
+++ b/daemon/src/ctrl_profiles/zbus.rs
@@ -1,153 +1,179 @@
 use log::warn;
-use rog_profiles::profiles::Profile;
+use rog_profiles::fan_curve_set::CurveData;
+use rog_profiles::fan_curve_set::FanCurveSet;
+use rog_profiles::Profile;

 use std::sync::Arc;
 use std::sync::Mutex;
 use zbus::{dbus_interface, fdo::Error};
 use zvariant::ObjectPath;

-use super::controller::CtrlFanAndCpu;
+use super::controller::CtrlPlatformProfile;

-pub struct FanAndCpuZbus {
-    inner: Arc<Mutex<CtrlFanAndCpu>>,
+static UNSUPPORTED_MSG: &str =
+    "Fan curves are not supported on this laptop or you require a patched kernel";
+
+pub struct ProfileZbus {
+    inner: Arc<Mutex<CtrlPlatformProfile>>,
 }

-impl FanAndCpuZbus {
-    pub fn new(inner: Arc<Mutex<CtrlFanAndCpu>>) -> Self {
+impl ProfileZbus {
+    pub fn new(inner: Arc<Mutex<CtrlPlatformProfile>>) -> Self {
        Self { inner }
    }
 }

 #[dbus_interface(name = "org.asuslinux.Daemon")]
-impl FanAndCpuZbus {
-    /// Create new profile and make active
-    fn set_profile(&self, profile: String) {
-        if let Ok(mut ctrl) = self.inner.try_lock() {
-            ctrl.set_active(&profile)
-                .unwrap_or_else(|err| warn!("{}", err));
-        }
-        self.do_notification();
-    }
-
-    /// New or modify profile details and make active, will create if it does not exist
-    fn new_or_modify(&self, profile: Profile) {
-        if let Ok(mut ctrl) = self.inner.try_lock() {
-            ctrl.new_or_modify(&profile)
-                .unwrap_or_else(|err| warn!("{}", err));
-        }
-        self.do_notification();
-    }
-
-    /// Fetch the active profile name
-    fn next_profile(&mut self) {
-        if let Ok(mut ctrl) = self.inner.try_lock() {
-            ctrl.do_next_profile()
-                .unwrap_or_else(|err| warn!("{}", err));
-        }
-        self.do_notification();
-    }
-
-    /// Fetch the active profile name
-    fn active_name(&mut self) -> zbus::fdo::Result<String> {
-        if let Ok(ctrl) = self.inner.try_lock() {
-            if let Ok(mut cfg) = ctrl.config.try_lock() {
-                cfg.read();
-                return Ok(cfg.active_profile.clone());
-            }
-        }
-        Err(Error::Failed(
-            "Failed to get active profile name".to_string(),
-        ))
-    }
-
-    // TODO: Profile can't implement Type because of Curve
-    /// Fetch the active profile details
-    fn active_data(&mut self) -> zbus::fdo::Result<Profile> {
-        if let Ok(ctrl) = self.inner.try_lock() {
-            if let Ok(mut cfg) = ctrl.config.try_lock() {
-                cfg.read();
-                if let Some(profile) = cfg.power_profiles.get(&cfg.active_profile) {
-                    return Ok(profile.clone());
-                }
-            }
-        }
-        Err(Error::Failed(
-            "Failed to get active profile details".to_string(),
-        ))
-    }
-
-    /// Fetch all profile data
+impl ProfileZbus {
+    /// Fetch profile names
    fn profiles(&mut self) -> zbus::fdo::Result<Vec<Profile>> {
-        if let Ok(ctrl) = self.inner.try_lock() {
-            if let Ok(mut cfg) = ctrl.config.try_lock() {
-                cfg.read();
-                return Ok(cfg.power_profiles.values().cloned().collect());
-            }
+        if let Ok(profiles) = Profile::get_profile_names() {
+            return Ok(profiles);
        }
        Err(Error::Failed(
            "Failed to get all profile details".to_string(),
        ))
    }

-    fn profile_names(&self) -> zbus::fdo::Result<Vec<String>> {
-        if let Ok(ctrl) = self.inner.try_lock() {
-            if let Ok(mut cfg) = ctrl.config.try_lock() {
-                cfg.read();
-                let profile_names = cfg.power_profiles.keys().cloned().collect::<Vec<String>>();
-                return Ok(profile_names);
-            }
+    /// Toggle to next platform_profile. Names provided by `Profiles`.
+    /// If fan-curves are supported will also activate a fan curve for profile.
+    fn next_profile(&mut self) {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            ctrl.set_next_profile()
+                .unwrap_or_else(|err| warn!("{}", err));
+            ctrl.save_config();
        }
-
-        Err(Error::Failed("Failed to get all profile names".to_string()))
+        self.do_notification();
    }

-    fn remove(&self, profile: &str) -> zbus::fdo::Result<()> {
-        if let Ok(ctrl) = self.inner.try_lock() {
-            if let Ok(mut cfg) = ctrl.config.try_lock() {
-                cfg.read();
-
-                if !cfg.power_profiles.contains_key(profile) {
-                    return Err(Error::Failed("Invalid profile specified".to_string()));
-                }
-
-                if cfg.power_profiles.keys().len() == 1 {
-                    return Err(Error::Failed("Cannot delete the last profile".to_string()));
-                }
-
-                if cfg.active_profile == *profile {
-                    return Err(Error::Failed(
-                        "Cannot delete the active profile".to_string(),
-                    ));
-                }
-
-                cfg.power_profiles.remove(profile);
-                cfg.write();
-
-                return Ok(());
-            }
+    /// Fetch the active profile name
+    fn active_profile(&mut self) -> zbus::fdo::Result<Profile> {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            ctrl.config.read();
+            return Ok(ctrl.config.active_profile);
        }
+        Err(Error::Failed(
+            "Failed to get active profile name".to_string(),
+        ))
+    }

-        Err(Error::Failed("Failed to lock configuration".to_string()))
+    /// Set this platform_profile name as active
+    fn set_active_profile(&self, profile: Profile) {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            // Read first just incase the user has modified the config before calling this
+            ctrl.config.read();
+            Profile::set_profile(profile)
+                .map_err(|e| warn!("set_profile, {}", e))
+                .ok();
+            ctrl.config.active_profile = profile;
+            ctrl.write_profile_curve_to_platform()
+                .map_err(|e| warn!("write_profile_curve_to_platform, {}", e))
+                .ok();
+
+            ctrl.save_config();
+        }
+        self.do_notification();
+    }
+
+    /// Get a list of profiles that have fan-curves enabled.
+    fn enabled_fan_profiles(&mut self) -> zbus::fdo::Result<Vec<Profile>> {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            ctrl.config.read();
+            if let Some(curves) = &ctrl.config.fan_curves {
+                return Ok(curves.get_enabled_curve_profiles().to_vec());
+            }
+            return Err(Error::Failed(UNSUPPORTED_MSG.to_string()));
+        }
+        Err(Error::Failed(
+            "Failed to get enabled fan curve names".to_string(),
+        ))
+    }
+
+    /// Set a profile fan curve enabled status. Will also activate a fan curve if in the
+    /// same profile mode
+    fn set_fan_curve_enabled(&mut self, profile: Profile, enabled: bool) -> zbus::fdo::Result<()> {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            ctrl.config.read();
+            return if let Some(curves) = &mut ctrl.config.fan_curves {
+                curves.set_profile_curve_enabled(profile, enabled);
+
+                ctrl.write_profile_curve_to_platform()
+                    .map_err(|e| warn!("write_profile_curve_to_platform, {}", e))
+                    .ok();
+
+                ctrl.save_config();
+                Ok(())
+            } else {
+                Err(Error::Failed(UNSUPPORTED_MSG.to_string()))
+            };
+        }
+        Err(Error::Failed(
+            "Failed to get enabled fan curve names".to_string(),
+        ))
+    }
+
+    /// Get the fan-curve data for the currently active Profile
+    fn fan_curve_data(&mut self, profile: Profile) -> zbus::fdo::Result<FanCurveSet> {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            ctrl.config.read();
+            if let Some(curves) = &ctrl.config.fan_curves {
+                let curve = curves.get_fan_curves_for(profile);
+                return Ok(curve.clone());
+            }
+            return Err(Error::Failed(UNSUPPORTED_MSG.to_string()));
+        }
+        Err(Error::Failed("Failed to get fan curve data".to_string()))
+    }
+
+    /// Set the fan curve for the specified profile.
+    /// Will also activate the fan curve if the user is in the same mode.
+    fn set_fan_curve(&self, profile: Profile, curve: CurveData) -> zbus::fdo::Result<()> {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            ctrl.config.read();
+            if let Some(curves) = &mut ctrl.config.fan_curves {
+                curves
+                    .save_fan_curve(curve, profile)
+                    .map_err(|err| zbus::fdo::Error::Failed(err.to_string()))?;
+            } else {
+                return Err(Error::Failed(UNSUPPORTED_MSG.to_string()));
+            }
+            ctrl.write_profile_curve_to_platform()
+                .map_err(|e| warn!("Profile::set_profile, {}", e))
+                .ok();
+            ctrl.save_config();
+        }
+        Ok(())
+    }
+
+    /// Reset the stored (self) and device curve to the defaults of the platform.
+    ///
+    /// Each platform_profile has a different default and the defualt can be read
+    /// only for the currently active profile.
+    fn set_active_curve_to_defaults(&self) -> zbus::fdo::Result<()> {
+        if let Ok(mut ctrl) = self.inner.try_lock() {
+            ctrl.config.read();
+            ctrl.set_active_curve_to_defaults()
+                .map_err(|e| warn!("Profile::set_active_curve_to_defaults, {}", e))
+                .ok();
+            ctrl.save_config();
+        }
+        Ok(())
    }

    #[dbus_interface(signal)]
    fn notify_profile(&self, profile: &Profile) -> zbus::Result<()> {}
 }

-impl FanAndCpuZbus {
+impl ProfileZbus {
    fn do_notification(&self) {
        if let Ok(ctrl) = self.inner.try_lock() {
-            if let Ok(cfg) = ctrl.config.clone().try_lock() {
-                if let Some(profile) = cfg.power_profiles.get(&cfg.active_profile) {
-                    self.notify_profile(profile)
-                        .unwrap_or_else(|err| warn!("{}", err));
-                }
-            }
+            self.notify_profile(&ctrl.config.active_profile)
+                .unwrap_or_else(|err| warn!("{}", err));
        }
    }
 }

-impl crate::ZbusAdd for FanAndCpuZbus {
+impl crate::ZbusAdd for ProfileZbus {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
            .at(
--- a/daemon/src/ctrl_rog_bios.rs
+++ b/daemon/src/ctrl_rog_bios.rs
@@ -1,6 +1,6 @@
 use crate::{config::Config, error::RogError, GetSupported};
 use log::{error, info, warn};
-use rog_types::supported::RogBiosSupportedFunctions;
+use rog_supported::RogBiosSupportedFunctions;
 use std::fs::OpenOptions;
 use std::io::BufRead;
 use std::io::{Read, Write};
@@ -168,7 +168,7 @@ impl CtrlRogBios {
            .map_err(|err| RogError::Path(path.into(), err))?;

        let mut data = Vec::new();
-        file.read_to_end(&mut data).unwrap();
+        file.read_to_end(&mut data)?;

        let idx = data.len() - 1;
        if dedicated {
@@ -269,7 +269,7 @@ impl CtrlRogBios {
                            RogError::Write(module_include.to_string_lossy().to_string(), err)
                        })?;
                    // add nvidia modules to module_include
-                    file.write_all(modules.concat().as_bytes()).unwrap();
+                    file.write_all(modules.concat().as_bytes())?;
                } else {
                    let file = std::fs::OpenOptions::new()
                        .read(true)
@@ -292,7 +292,7 @@ impl CtrlRogBios {
                        .map_err(|err| {
                            RogError::Write(module_include.to_string_lossy().to_string(), err)
                        })?;
-                    std::io::BufWriter::new(file).write_all(&buf).unwrap();
+                    std::io::BufWriter::new(file).write_all(&buf)?;
                }
            }

--- a/daemon/src/ctrl_supported.rs
+++ b/daemon/src/ctrl_supported.rs
@@ -5,20 +5,20 @@ use zvariant::ObjectPath;
 use zvariant_derive::Type;

 use crate::{
-    ctrl_anime::CtrlAnime, ctrl_charge::CtrlCharge, ctrl_leds::controller::CtrlKbdLed,
-    ctrl_profiles::controller::CtrlFanAndCpu, ctrl_rog_bios::CtrlRogBios, GetSupported,
+    ctrl_anime::CtrlAnime, ctrl_aura::controller::CtrlKbdLed, ctrl_charge::CtrlCharge,
+    ctrl_profiles::controller::CtrlPlatformProfile, ctrl_rog_bios::CtrlRogBios, GetSupported,
 };

-use rog_types::supported::{
-    AnimeSupportedFunctions, ChargeSupportedFunctions, FanCpuSupportedFunctions,
-    LedSupportedFunctions, RogBiosSupportedFunctions,
+use rog_supported::{
+    AnimeSupportedFunctions, ChargeSupportedFunctions, LedSupportedFunctions,
+    PlatformProfileFunctions, RogBiosSupportedFunctions,
 };

 #[derive(Serialize, Deserialize, Type)]
 pub struct SupportedFunctions {
    pub anime_ctrl: AnimeSupportedFunctions,
    pub charge_ctrl: ChargeSupportedFunctions,
-    pub fan_cpu_ctrl: FanCpuSupportedFunctions,
+    pub platform_profile: PlatformProfileFunctions,
    pub keyboard_led: LedSupportedFunctions,
    pub rog_bios_ctrl: RogBiosSupportedFunctions,
 }
@@ -53,7 +53,7 @@ impl GetSupported for SupportedFunctions {
            anime_ctrl: CtrlAnime::get_supported(),
            keyboard_led: CtrlKbdLed::get_supported(),
            charge_ctrl: CtrlCharge::get_supported(),
-            fan_cpu_ctrl: CtrlFanAndCpu::get_supported(),
+            platform_profile: CtrlPlatformProfile::get_supported(),
            rog_bios_ctrl: CtrlRogBios::get_supported(),
        }
    }
--- a/daemon/src/daemon.rs
+++ b/daemon/src/daemon.rs
@@ -1,32 +1,39 @@
-use daemon::ctrl_leds::controller::{
-    CtrlKbdLed, CtrlKbdLedReloader, CtrlKbdLedTask, CtrlKbdLedZbus,
-};
-use daemon::{
-    config::Config, ctrl_supported::SupportedFunctions, laptops::print_board_info, GetSupported,
-};
-use daemon::{config_anime::AnimeConfig, config_aura::AuraConfig, ctrl_charge::CtrlCharge};
-use daemon::{ctrl_anime::*, ctrl_gfx::controller::CtrlGraphics};
-use daemon::{
-    ctrl_profiles::{controller::CtrlFanAndCpu, zbus::FanAndCpuZbus},
-    laptops::LaptopLedData,
-};
-
-use daemon::{CtrlTask, Reloadable, ZbusAdd};
-use log::LevelFilter;
-use log::{error, info, warn};
-use rog_dbus::DBUS_NAME;
-use rog_types::gfx_vendors::GfxVendors;
 use std::error::Error;
 use std::io::Write;
 use std::sync::Arc;
 use std::sync::Mutex;
-use std::env;
+use std::thread::sleep;
+use std::time::Duration;
+use std::{env, thread};

+use ::zbus::{fdo, Connection, ObjectServer};
+use log::LevelFilter;
+use log::{error, info, warn};
+
+use daemon::ctrl_anime::config::AnimeConfig;
+use daemon::ctrl_anime::zbus::CtrlAnimeZbus;
+use daemon::ctrl_anime::*;
+use daemon::ctrl_aura::config::AuraConfig;
+use daemon::ctrl_aura::controller::{
+    CtrlKbdLed, CtrlKbdLedReloader, CtrlKbdLedTask, CtrlKbdLedZbus,
+};
+use daemon::ctrl_charge::CtrlCharge;
+use daemon::ctrl_profiles::config::ProfileConfig;
+use daemon::ctrl_profiles::controller::CtrlProfileTask;
 use daemon::ctrl_rog_bios::CtrlRogBios;
-use std::convert::Into;
-use zbus::fdo;
-use zbus::Connection;
-use zvariant::ObjectPath;
+use daemon::error::RogError;
+use daemon::{
+    config::Config, ctrl_supported::SupportedFunctions, laptops::print_board_info, GetSupported,
+};
+use daemon::{
+    ctrl_profiles::{controller::CtrlPlatformProfile, zbus::ProfileZbus},
+    laptops::LaptopLedData,
+};
+use daemon::{CtrlTask, Reloadable, ZbusAdd};
+use rog_dbus::DBUS_NAME;
+use rog_profiles::Profile;
+
+static PROFILE_CONFIG_PATH: &str = "/etc/asusd/profile.conf";

 pub fn main() -> Result<(), Box<dyn std::error::Error>> {
    let mut logger = env_logger::Builder::new();
@@ -43,17 +50,19 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {

    if !is_service {
        println!("asusd schould be only run from the right systemd service");
-        println!("do not run in your terminal, if you need an logs please use journalctl -b -u asusd");
+        println!(
+            "do not run in your terminal, if you need an logs please use journalctl -b -u asusd"
+        );
        println!("asusd will now exit");
        return Ok(());
    }

-    info!("      daemon v{}", daemon::VERSION);
-    info!("   rog-anime v{}", rog_anime::VERSION);
-    info!("    rog-aura v{}", rog_aura::VERSION);
-    info!("    rog-dbus v{}", rog_dbus::VERSION);
-    info!("rog-profiles v{}", rog_profiles::VERSION);
-    info!("   rog-types v{}", rog_types::VERSION);
+    info!("       daemon v{}", daemon::VERSION);
+    info!("    rog-anime v{}", rog_anime::VERSION);
+    info!("     rog-aura v{}", rog_aura::VERSION);
+    info!("     rog-dbus v{}", rog_dbus::VERSION);
+    info!(" rog-profiles v{}", rog_profiles::VERSION);
+    info!("rog-supported v{}", rog_supported::VERSION);

    start_daemon()?;
    Ok(())
@@ -63,18 +72,14 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 fn start_daemon() -> Result<(), Box<dyn Error>> {
    let supported = SupportedFunctions::get_supported();
    print_board_info();
-    println!("{}", serde_json::to_string_pretty(&supported).unwrap());
+    println!("{}", serde_json::to_string_pretty(&supported)?);

-    // Collect tasks for task thread
-    let mut tasks: Vec<Box<dyn CtrlTask + Send>> = Vec::new();
    // Start zbus server
    let connection = Connection::new_system()?;
-    fdo::DBusProxy::new(&connection)?
-        .request_name(DBUS_NAME, fdo::RequestNameFlags::ReplaceExisting.into())?;
-    let mut object_server = zbus::ObjectServer::new(&connection);
+    let fdo_connection = fdo::DBusProxy::new(&connection)?;
+    let mut object_server = ObjectServer::new(&connection);

    let config = Config::load();
-    let enable_gfx_switching = config.gfx_managed;
    let config = Arc::new(Mutex::new(config));

    supported.add_to_server(&mut object_server);
@@ -92,7 +97,7 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
        }
    }

-    match CtrlCharge::new(config.clone()) {
+    match CtrlCharge::new(config) {
        Ok(mut ctrl) => {
            // Do a reload of any settings
            ctrl.reload()
@@ -105,16 +110,32 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
        }
    }

-    match CtrlFanAndCpu::new(config.clone()) {
-        Ok(mut ctrl) => {
-            ctrl.reload()
-                .unwrap_or_else(|err| warn!("Profile control: {}", err));
-            let tmp = Arc::new(Mutex::new(ctrl));
-            FanAndCpuZbus::new(tmp).add_to_server(&mut object_server);
-        }
-        Err(err) => {
-            error!("Profile control: {}", err);
+    if Profile::is_platform_profile_supported() {
+        let profile_config = ProfileConfig::load(PROFILE_CONFIG_PATH.into());
+        match CtrlPlatformProfile::new(profile_config) {
+            Ok(mut ctrl) => {
+                ctrl.reload()
+                    .unwrap_or_else(|err| warn!("Profile control: {}", err));
+
+                let tmp = Arc::new(Mutex::new(ctrl));
+                ProfileZbus::new(tmp.clone()).add_to_server(&mut object_server);
+
+                let task = CtrlProfileTask::new(tmp);
+                thread::Builder::new().name("profile tasks".into()).spawn(
+                    move || -> Result<(), RogError> {
+                        loop {
+                            task.do_task()?;
+                            sleep(Duration::from_millis(100));
+                        }
+                    },
+                )?;
+            }
+            Err(err) => {
+                error!("Profile control: {}", err);
+            }
        }
+    } else {
+        warn!("platform_profile support not found. This requires kernel 5.15.x or the patch applied: https://lkml.org/lkml/2021/8/18/1022");
    }

    match CtrlAnime::new(AnimeConfig::load()) {
@@ -129,7 +150,14 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
            let zbus = CtrlAnimeZbus(inner.clone());
            zbus.add_to_server(&mut object_server);

-            tasks.push(Box::new(CtrlAnimeTask::new(inner)));
+            let task = CtrlAnimeTask::new(inner);
+            thread::Builder::new().name("anime tasks".into()).spawn(
+                move || -> Result<(), RogError> {
+                    loop {
+                        task.do_task()?;
+                    }
+                },
+            )?;
        }
        Err(err) => {
            error!("AniMe control: {}", err);
@@ -148,92 +176,26 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
                .unwrap_or_else(|err| warn!("Keyboard LED control: {}", err));

            CtrlKbdLedZbus::new(inner.clone()).add_to_server(&mut object_server);
+
            let task = CtrlKbdLedTask::new(inner);
-            tasks.push(Box::new(task));
+            thread::Builder::new().name("keyboard tasks".into()).spawn(
+                move || -> Result<(), RogError> {
+                    loop {
+                        task.do_task()?;
+                    }
+                },
+            )?;
        }
        Err(err) => {
            error!("Keyboard control: {}", err);
        }
    }

-    // Graphics switching requires some checks on boot specifically for g-sync capable laptops
-    if enable_gfx_switching {
-        match CtrlGraphics::new(config.clone()) {
-            Ok(mut ctrl) => {
-                // Need to check if a laptop has the dedicated gfx switch
-                if CtrlRogBios::has_dedicated_gfx_toggle() {
-                    if let Ok(ded) = CtrlRogBios::get_gfx_mode() {
-                        if let Ok(config) = config.lock() {
-                            if ded == 1 {
-                                warn!("Dedicated GFX toggle is on but driver mode is not nvidia \nSetting to nvidia driver mode");
-                                let devices = ctrl.devices();
-                                let bus = ctrl.bus();
-                                CtrlGraphics::do_mode_setup_tasks(
-                                    GfxVendors::Nvidia,
-                                    false,
-                                    &devices,
-                                    &bus,
-                                )?;
-                            } else if ded == 0 {
-                                info!("Dedicated GFX toggle is off");
-                                let devices = ctrl.devices();
-                                let bus = ctrl.bus();
-                                CtrlGraphics::do_mode_setup_tasks(
-                                    config.gfx_mode,
-                                    false,
-                                    &devices,
-                                    &bus,
-                                )?;
-                            }
-                        }
-                    }
-                }
-                ctrl.reload()
-                    .unwrap_or_else(|err| error!("Gfx controller: {}", err));
-                ctrl.add_to_server(&mut object_server);
-            }
-            Err(err) => {
-                error!("Gfx control: {}", err);
-            }
-        }
-    }
-
-    // TODO: implement messaging between threads to check fails
-
-    // Run tasks
-    let handle = std::thread::Builder::new()
-        .name("asusd watch".to_string())
-        .spawn(move || loop {
-            std::thread::sleep(std::time::Duration::from_millis(100));
-
-            for ctrl in tasks.iter() {
-                ctrl.do_task()
-                    .map_err(|err| {
-                        warn!("do_task error: {}", err);
-                    })
-                    .ok();
-            }
-        });
-
-    // Run zbus server
-    object_server
-        .with(
-            &ObjectPath::from_str_unchecked("/org/asuslinux/Charge"),
-            |obj: &CtrlCharge| {
-                let x = obj.limit();
-                obj.notify_charge(x as u8)
-            },
-        )
-        .map_err(|err| {
-            warn!("object_server notify_charge error: {}", err);
-        })
-        .ok();
+    // Request dbus name after finishing initalizing all functions
+    fdo_connection.request_name(DBUS_NAME, fdo::RequestNameFlags::ReplaceExisting.into())?;

    // Loop to check errors and iterate zbus server
    loop {
-        if let Err(err) = &handle {
-            error!("{}", err);
-        }
        if let Err(err) = object_server.try_handle_next() {
            error!("{}", err);
        }
--- a/daemon/src/error.rs
+++ b/daemon/src/error.rs
@@ -1,11 +1,7 @@
-use rog_fan_curve::CurveError;
 use rog_profiles::error::ProfileError;
-use rog_types::error::GraphicsError;
 use std::convert::From;
 use std::fmt;

-use crate::ctrl_gfx::error::GfxError;
-
 #[derive(Debug)]
 pub enum RogError {
    ParseVendor,
@@ -17,18 +13,16 @@ pub enum RogError {
    Write(String, std::io::Error),
    NotSupported,
    NotFound(String),
-    FanCurve(CurveError),
    DoTask(String),
    MissingFunction(String),
    MissingLedBrightNode(String, std::io::Error),
    ReloadFail(String),
-    GfxSwitching(GfxError),
    Profiles(ProfileError),
    Initramfs(String),
    Modprobe(String),
-    Command(String, std::io::Error),
    Io(std::io::Error),
    Zbus(zbus::Error),
+    ChargeLimit(u8),
 }

 impl fmt::Display for RogError {
@@ -44,39 +38,22 @@ impl fmt::Display for RogError {
            RogError::Write(path, error) => write!(f, "Write {}: {}", path, error),
            RogError::NotSupported => write!(f, "Not supported"),
            RogError::NotFound(deets) => write!(f, "Not found: {}", deets),
-            RogError::FanCurve(err) => write!(f, "Custom fan-curve error: {}", err),
            RogError::DoTask(deets) => write!(f, "Task error: {}", deets),
            RogError::MissingFunction(deets) => write!(f, "Missing functionality: {}", deets),
            RogError::MissingLedBrightNode(path, error) => write!(f, "Led node at {} is missing, please check you have the required patch or dkms module installed: {}", path, error),
            RogError::ReloadFail(deets) => write!(f, "Task error: {}", deets),
-            RogError::GfxSwitching(deets) => write!(f, "Graphics switching error: {}", deets),
            RogError::Profiles(deets) => write!(f, "Profile error: {}", deets),
            RogError::Initramfs(detail) => write!(f, "Initiramfs error: {}", detail),
            RogError::Modprobe(detail) => write!(f, "Modprobe error: {}", detail),
-            RogError::Command(func, error) => write!(f, "Command exec error: {}: {}", func, error),
            RogError::Io(detail) => write!(f, "std::io error: {}", detail),
            RogError::Zbus(detail) => write!(f, "Zbus error: {}", detail),
+            RogError::ChargeLimit(value) => write!(f, "Invalid charging limit, not in range 20-100%: {}", value),
        }
    }
 }

 impl std::error::Error for RogError {}

-impl From<CurveError> for RogError {
-    fn from(err: CurveError) -> Self {
-        RogError::FanCurve(err)
-    }
-}
-
-impl From<GraphicsError> for RogError {
-    fn from(err: GraphicsError) -> Self {
-        match err {
-            GraphicsError::ParseVendor => RogError::GfxSwitching(GfxError::ParseVendor),
-            GraphicsError::ParsePower => RogError::GfxSwitching(GfxError::ParsePower),
-        }
-    }
-}
-
 impl From<ProfileError> for RogError {
    fn from(err: ProfileError) -> Self {
        RogError::Profiles(err)
--- a/daemon/src/laptops.rs
+++ b/daemon/src/laptops.rs
@@ -10,10 +10,8 @@ pub const ASUS_KEYBOARD_DEVICES: [&str; 4] = ["1866", "1869", "1854", "19b6"];
 pub fn print_board_info() {
    let dmi = sysfs_class::DmiId::default();
    let board_name = dmi.board_name().expect("Could not get board_name");
-    let prod_name = dmi.product_name().expect("Could not get product_name");
    let prod_family = dmi.product_family().expect("Could not get product_family");

-    info!("Product name: {}", prod_name.trim());
    info!("Product family: {}", prod_family.trim());
    info!("Board name: {}", board_name.trim());
 }
--- a/daemon/src/lib.rs
+++ b/daemon/src/lib.rs
@@ -1,17 +1,12 @@
 #![deny(unused_must_use)]
 /// Configuration loading, saving
 pub mod config;
-pub mod config_anime;
-pub mod config_aura;
-pub(crate) mod config_old;
 /// Control of AniMe matrix display
 pub mod ctrl_anime;
+/// Keyboard LED brightness control, RGB, and LED display modes
+pub mod ctrl_aura;
 /// Control of battery charge level
 pub mod ctrl_charge;
-/// GPU switching and power
-pub mod ctrl_gfx;
-/// Keyboard LED brightness control, RGB, and LED display modes
-pub mod ctrl_leds;
 /// Control CPU min/max freq and turbo, fan mode, fan curves
 ///
 /// Intel machines can control:
@@ -32,7 +27,7 @@ pub mod laptops;
 /// Fetch all supported functions for the laptop
 pub mod ctrl_supported;

-mod error;
+pub mod error;

 use crate::error::RogError;
 use config::Config;
--- a/data/90-asusd-nvidia-pm.rules
+++ b/data/90-asusd-nvidia-pm.rules
@@ -1,7 +0,0 @@
-# Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
-ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
-ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto"
-
-# Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind
-ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on"
-ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on"
--- a/data/90-nvidia-screen-G05.conf
+++ b/data/90-nvidia-screen-G05.conf
@@ -1,4 +0,0 @@
-Section "ServerLayout"
-  Identifier "layout"
-  Option "AllowNVIDIAGPUScreens"
-EndSection
--- a/data/asusd-ledmodes.toml
+++ b/data/asusd-ledmodes.toml
@@ -42,14 +42,14 @@ per_key = false

 [[led_data]]
 prod_family = "ROG Strix"
-board_names = ["G531GW", "G533QR", "G733QS", "G733QR"]
+board_names = ["G531GW", "G533QR", "G533QS", "G733QS", "G733QR", "G513QR", "G713QR"]
 standard = ["Static", "Breathe", "Strobe", "Rainbow", "Star", "Rain", "Highlight", "Laser", "Ripple", "Pulse", "Comet", "Flash"]
 multizone = false
 per_key = true

 [[led_data]]
 prod_family = "ROG Strix"
-board_names = ["GX531", "G512LV", "G712LV", "G712LW", "G513QY"]
+board_names = ["G513QE", "GX531", "G512LV", "G712LV", "G712LW", "G513IH", "G513QY", "G713QM"]
 standard = ["Static", "Breathe", "Strobe", "Rainbow", "Pulse"]
 multizone = true
 per_key = false
@@ -61,13 +61,6 @@ standard = ["Static", "Breathe", "Strobe", "Rainbow", "Pulse"]
 multizone = false
 per_key = false

-[[led_data]]
-prod_family = "ROG Strix"
-board_names = ["G513IH"]
-standard = ["Static", "Breathe", "Strobe", "Rainbow", "Star", "Pulse"]
-multizone = true
-per_key = false
-
 [[led_data]]
 prod_family = "Strix"
 board_names = ["G731GV", "G731GW", "G531GV"]
@@ -103,6 +96,14 @@ standard = ["Static", "Breathe", "Pulse"]
 multizone = false
 per_key = false

+# GA503QE at higher priority (first match) than GA503Q
+[[led_data]]
+prod_family = "ROG Zephyrus G15"
+board_names = ["GA503QE"]
+standard = ["Static", "Breathe", "Pulse"]
+multizone = false
+per_key = false
+
 [[led_data]]
 prod_family = "ROG Zephyrus G15"
 board_names = ["GA503Q"]
@@ -116,3 +117,17 @@ board_names = ["GX550L"]
 standard = ["Static", "Breathe", "Strobe", "Rainbow", "Star", "Rain", "Highlight", "Laser", "Ripple", "Pulse", "Comet", "Flash"]
 multizone = false
 per_key = true
+
+[[led_data]]
+prod_family = "ROG Zephyrus Duo 15 SE"
+board_names = ["GX551Q"]
+standard = ["Static", "Breathe", "Strobe", "Rainbow", "Pulse"]
+multizone = false
+per_key = true
+
+[[led_data]]
+prod_family = "ROG Flow X13"
+board_names = ["GV301QH", "GV301QE"]
+standard = ["Static", "Breathe", "Pulse"]
+multizone = false
+per_key = false
--- a/data/asusd.service
+++ b/data/asusd.service
@@ -2,7 +2,7 @@
 Description=ASUS Notebook Control
 StartLimitInterval=200
 StartLimitBurst=2
-Before=display-manager.service
+Before=multi-user.target

 [Service]
 Environment=IS_SERVICE=1
--- a/data/user-example.json
+++ b/data/user-example.json
@@ -1,64 +0,0 @@
-{
-  "anime": [
-    {
-      "AsusAnimation": {
-        "file": "/usr/share/asusd/anime/asus/rog/Sunset.gif",
-        "time": {
-          "Cycles": 1
-        },
-        "brightness": 0.5
-      }
-    },
-    {
-      "ImageAnimation": {
-        "file": "/usr/share/asusd/anime/custom/sonic-run.gif",
-        "scale": 0.9,
-        "angle": 0.65,
-        "translation": [
-          0.0,
-          0.0
-        ],
-        "time": {
-          "Time": {
-            "secs": 5,
-            "nanos": 0
-          }
-        },
-        "brightness": 0.5
-      }
-    },
-    {
-      "Image": {
-        "file": "/usr/share/asusd/anime/custom/rust.png",
-        "scale": 1.0,
-        "angle": 0.0,
-        "translation": [
-          0.0,
-          0.0
-        ],
-        "brightness": 0.6
-      }
-    },
-    {
-      "Pause": {
-        "secs": 6,
-        "nanos": 0
-      }
-    },
-    {
-      "ImageAnimation": {
-        "file": "/usr/share/asusd/anime/custom/sonic-wait.gif",
-        "scale": 0.9,
-        "angle": 0.0,
-        "translation": [
-          3.0,
-          2.0
-        ],
-        "time": {
-          "Cycles": 2
-        },
-        "brightness": 0.5
-      }
-    }
-  ]
-}
--- a/rog-anime/Cargo.toml
+++ b/rog-anime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rog_anime"
-version = "1.0.5"
+version = "1.3.0"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
--- a/rog-anime/data/anime/asus/festive/Cupid.gif
+++ b/rog-anime/data/anime/asus/festive/Cupid.gif
--- a/rog-anime/data/anime/asus/festive/Firework.gif
+++ b/rog-anime/data/anime/asus/festive/Firework.gif
--- a/rog-anime/data/anime/asus/festive/Halloween.gif
+++ b/rog-anime/data/anime/asus/festive/Halloween.gif
--- a/rog-anime/data/anime/asus/festive/Happy
+++ b/rog-anime/data/anime/asus/festive/Happy
--- a/rog-anime/data/anime/asus/festive/Happy
+++ b/rog-anime/data/anime/asus/festive/Happy
--- a/rog-anime/data/anime/asus/festive/Lantern.gif
+++ b/rog-anime/data/anime/asus/festive/Lantern.gif
--- a/rog-anime/data/anime/asus/festive/Love
+++ b/rog-anime/data/anime/asus/festive/Love
--- a/rog-anime/data/anime/asus/festive/Mother's
+++ b/rog-anime/data/anime/asus/festive/Mother's
--- a/rog-anime/data/anime/asus/festive/Valentine's
+++ b/rog-anime/data/anime/asus/festive/Valentine's
--- a/rog-anime/data/anime/asus/festive/Year
+++ b/rog-anime/data/anime/asus/festive/Year
--- a/rog-anime/data/anime/asus/gaming/Bird.gif
+++ b/rog-anime/data/anime/asus/gaming/Bird.gif
--- a/rog-anime/data/anime/asus/gaming/Controller.gif
+++ b/rog-anime/data/anime/asus/gaming/Controller.gif
--- a/rog-anime/data/anime/asus/gaming/FPS.gif
+++ b/rog-anime/data/anime/asus/gaming/FPS.gif
--- a/rog-anime/data/anime/asus/gaming/Fight.gif
+++ b/rog-anime/data/anime/asus/gaming/Fight.gif
--- a/rog-anime/data/anime/asus/gaming/Keyboard.gif
+++ b/rog-anime/data/anime/asus/gaming/Keyboard.gif
--- a/rog-anime/data/anime/asus/gaming/MOBA.gif
+++ b/rog-anime/data/anime/asus/gaming/MOBA.gif
--- a/rog-anime/data/anime/asus/gaming/UFO.gif
+++ b/rog-anime/data/anime/asus/gaming/UFO.gif
--- a/rog-anime/data/anime/asus/music/DJ.gif
+++ b/rog-anime/data/anime/asus/music/DJ.gif
--- a/rog-anime/data/anime/asus/music/Diamond.gif
+++ b/rog-anime/data/anime/asus/music/Diamond.gif
--- a/rog-anime/data/anime/asus/music/Music-player.gif
+++ b/rog-anime/data/anime/asus/music/Music-player.gif
--- a/rog-anime/data/anime/asus/rog/For-those-who-dare.gif
+++ b/rog-anime/data/anime/asus/rog/For-those-who-dare.gif
--- a/rog-anime/data/anime/asus/rog/For-those-who-dare_2.gif
+++ b/rog-anime/data/anime/asus/rog/For-those-who-dare_2.gif
--- a/rog-anime/data/anime/asus/rog/Fragment.gif
+++ b/rog-anime/data/anime/asus/rog/Fragment.gif
--- a/rog-anime/data/anime/asus/rog/Infinite-triangle.gif
+++ b/rog-anime/data/anime/asus/rog/Infinite-triangle.gif
--- a/rog-anime/data/anime/asus/rog/Kaleidoscope1.gif
+++ b/rog-anime/data/anime/asus/rog/Kaleidoscope1.gif
--- a/rog-anime/data/anime/asus/rog/Kaleidoscope2.gif
+++ b/rog-anime/data/anime/asus/rog/Kaleidoscope2.gif
--- a/rog-anime/data/anime/asus/rog/Kaleidoscope2.png
+++ b/rog-anime/data/anime/asus/rog/Kaleidoscope2.png
--- a/rog-anime/data/anime/asus/rog/ROG
+++ b/rog-anime/data/anime/asus/rog/ROG
--- a/rog-anime/data/anime/asus/rog/ROG
+++ b/rog-anime/data/anime/asus/rog/ROG
--- a/rog-anime/data/anime/asus/rog/Sunset.gif
+++ b/rog-anime/data/anime/asus/rog/Sunset.gif
--- a/rog-anime/data/anime/asus/trend/Dog.gif
+++ b/rog-anime/data/anime/asus/trend/Dog.gif
--- a/rog-anime/data/anime/asus/trend/Hero.gif
+++ b/rog-anime/data/anime/asus/trend/Hero.gif
--- a/rog-anime/data/anime/asus/trend/Ski.gif
+++ b/rog-anime/data/anime/asus/trend/Ski.gif
--- a/rog-anime/data/anime/asus/trend/The
+++ b/rog-anime/data/anime/asus/trend/The
--- a/rog-anime/data/anime/asus/trend/Wave.gif
+++ b/rog-anime/data/anime/asus/trend/Wave.gif
--- a/rog-anime/data/anime/custom/nyancat_zombie.gif
+++ b/rog-anime/data/anime/custom/nyancat_zombie.gif
--- a/rog-anime/data/anime/custom/rust.png
+++ b/rog-anime/data/anime/custom/rust.png
--- a/rog-anime/data/anime/custom/sonic-run.gif
+++ b/rog-anime/data/anime/custom/sonic-run.gif
--- a/rog-anime/data/anime/custom/sonic-wait.gif
+++ b/rog-anime/data/anime/custom/sonic-wait.gif
--- a/rog-anime/src/data.rs
+++ b/rog-anime/src/data.rs
@@ -95,18 +95,19 @@ impl From<AnimeDataBuffer> for AnimePacketType {
 pub fn run_animation(
    frames: &AnimeGif,
    do_early_return: Arc<AtomicBool>,
-    callback: &dyn Fn(AnimeDataBuffer),
+    callback: &dyn Fn(AnimeDataBuffer) -> Result<(), AnimeError>,
 ) -> Result<(), AnimeError> {
    let mut count = 0;
    let start = Instant::now();

    let mut timed = false;
    let mut run_time = frames.total_frame_time();
-    println!("Real gif run length = {:?}", run_time);
    if let AnimTime::Fade(time) = frames.duration() {
        if let Some(middle) = time.show_for() {
            run_time = middle + time.total_fade_time();
        }
+        // add a small buffer
+        run_time += Duration::from_millis(250);
        timed = true;
    } else if let AnimTime::Time(time) = frames.duration() {
        run_time = time;
@@ -163,7 +164,7 @@ pub fn run_animation(
                }
            }

-            callback(output);
+            callback(output)?;

            if timed && Instant::now().duration_since(start) > run_time {
                break 'animation;
--- a/rog-anime/src/diagonal.rs
+++ b/rog-anime/src/diagonal.rs
@@ -48,7 +48,6 @@ impl AnimeDiagonal {
        duration: Option<Duration>,
        bright: f32,
    ) -> Result<Self, AnimeError> {
-        use pix::el::Pixel;
        let data = std::fs::read(path)?;
        let data = std::io::Cursor::new(data);
        let decoder = png_pong::Decoder::new(data)?.into_steps();
@@ -56,22 +55,78 @@ impl AnimeDiagonal {

        let mut matrix = AnimeDiagonal::new(duration);

-        let width;
        match raster {
+            png_pong::PngRaster::Gray8(ras) => {
+                Self::pixels_from_8bit(ras, &mut matrix, bright, true)
+            }
            png_pong::PngRaster::Graya8(ras) => {
-                width = ras.width();
-                for (y, row) in ras.pixels().chunks(width as usize).enumerate() {
-                    for (x, px) in row.iter().enumerate() {
-                        let v = <u8>::from(px.one() * bright);
-                        matrix.0[y][x] = v;
-                    }
-                }
+                Self::pixels_from_8bit(ras, &mut matrix, bright, true)
+            }
+            png_pong::PngRaster::Rgb8(ras) => {
+                Self::pixels_from_8bit(ras, &mut matrix, bright, false)
+            }
+            png_pong::PngRaster::Rgba8(ras) => {
+                Self::pixels_from_8bit(ras, &mut matrix, bright, false)
+            }
+            png_pong::PngRaster::Gray16(ras) => {
+                Self::pixels_from_16bit(ras, &mut matrix, bright, true)
+            }
+            png_pong::PngRaster::Rgb16(ras) => {
+                Self::pixels_from_16bit(ras, &mut matrix, bright, false)
+            }
+            png_pong::PngRaster::Graya16(ras) => {
+                Self::pixels_from_16bit(ras, &mut matrix, bright, true)
+            }
+            png_pong::PngRaster::Rgba16(ras) => {
+                Self::pixels_from_16bit(ras, &mut matrix, bright, false)
            }
            _ => return Err(AnimeError::Format),
        };

        Ok(matrix)
    }
+
+    fn pixels_from_8bit<P>(ras: pix::Raster<P>, matrix: &mut AnimeDiagonal, bright: f32, grey: bool)
+    where
+        P: pix::el::Pixel<Chan = pix::chan::Ch8>,
+    {
+        let width = ras.width();
+        for (y, row) in ras.pixels().chunks(width as usize).enumerate() {
+            for (x, px) in row.iter().enumerate() {
+                let v = if grey {
+                    <u8>::from(px.one()) as f32
+                } else {
+                    (<u8>::from(px.one()) / 3) as f32
+                        + (<u8>::from(px.two()) / 3) as f32
+                        + (<u8>::from(px.three()) / 3) as f32
+                };
+                matrix.0[y][x] = (v * bright) as u8;
+            }
+        }
+    }
+
+    fn pixels_from_16bit<P>(
+        ras: pix::Raster<P>,
+        matrix: &mut AnimeDiagonal,
+        bright: f32,
+        grey: bool,
+    ) where
+        P: pix::el::Pixel<Chan = pix::chan::Ch16>,
+    {
+        let width = ras.width();
+        for (y, row) in ras.pixels().chunks(width as usize).enumerate() {
+            for (x, px) in row.iter().enumerate() {
+                let v = if grey {
+                    (<u16>::from(px.one()) >> 8) as f32
+                } else {
+                    ((<u16>::from(px.one()) / 3) >> 8) as f32
+                        + ((<u16>::from(px.two()) / 3) >> 8) as f32
+                        + ((<u16>::from(px.three()) / 3) >> 8) as f32
+                };
+                matrix.0[y][x] = (v * bright) as u8;
+            }
+        }
+    }
 }

 impl From<&AnimeDiagonal> for AnimeDataBuffer {
--- a/rog-anime/src/error.rs
+++ b/rog-anime/src/error.rs
@@ -12,6 +12,7 @@ pub enum AnimeError {
    Format,
    /// The input was incorrect size, expected size is `IncorrectSize(width, height)`
    IncorrectSize(u32, u32),
+    Dbus(String),
 }

 impl fmt::Display for AnimeError {
@@ -28,6 +29,7 @@ impl fmt::Display for AnimeError {
                "The input image size is incorrect, expected {}x{}",
                width, height
            ),
+            AnimeError::Dbus(detail) => write!(f, "{}", detail),
        }
    }
 }
--- a/rog-anime/src/gif.rs
+++ b/rog-anime/src/gif.rs
@@ -88,7 +88,7 @@ pub struct AnimeGif(Vec<AnimeFrame>, AnimTime);
 impl AnimeGif {
    /// Create an animation using the 74x36 ASUS gif format
    #[inline]
-    pub fn create_diagonal_gif(
+    pub fn from_diagonal_gif(
        file_name: &Path,
        duration: AnimTime,
        brightness: f32,
@@ -128,10 +128,38 @@ impl AnimeGif {
        Ok(Self(frames, duration))
    }

+    /// Create an animation using the 74x36 ASUS gif format from a png
+    #[inline]
+    pub fn from_diagonal_png(
+        file_name: &Path,
+        duration: AnimTime,
+        brightness: f32,
+    ) -> Result<Self, AnimeError> {
+        let image = AnimeDiagonal::from_png(file_name, None, brightness)?;
+
+        let mut total = Duration::from_millis(1000);
+        if let AnimTime::Fade(fade) = duration {
+            total = fade.total_fade_time();
+            if let Some(middle) = fade.show_for {
+                total += middle;
+            }
+        }
+        // Make frame delay 30ms, and find frame count
+        let frame_count = total.as_millis() / 30;
+
+        let single = AnimeFrame {
+            data: <AnimeDataBuffer>::from(&image),
+            delay: Duration::from_millis(30),
+        };
+        let frames = vec![single; frame_count as usize];
+
+        Ok(Self(frames, duration))
+    }
+
    /// Create an animation using a gif of any size. This method must precompute the
    /// result.
    #[inline]
-    pub fn create_png_gif(
+    pub fn from_gif(
        file_name: &Path,
        scale: f32,
        angle: f32,
@@ -203,7 +231,7 @@ impl AnimeGif {
    /// will be 1 second long. If `AnimTime::Cycles` is specified for `duration` then this can
    /// be considered how many seconds the image will show for.
    #[inline]
-    pub fn create_png_static(
+    pub fn from_png(
        file_name: &Path,
        scale: f32,
        angle: f32,
--- a/rog-anime/src/image.rs
+++ b/rog-anime/src/image.rs
@@ -249,7 +249,6 @@ impl AnimeImage {
        translation: Vec2,
        bright: f32,
    ) -> Result<Self, AnimeError> {
-        use pix::el::Pixel;
        let data = std::fs::read(path)?;
        let data = std::io::Cursor::new(data);
        let decoder = png_pong::Decoder::new(data)?.into_steps();
@@ -257,15 +256,37 @@ impl AnimeImage {

        let width;
        let pixels = match raster {
+            png_pong::PngRaster::Gray8(ras) => {
+                width = ras.width();
+                Self::pixels_from_8bit(ras, true)
+            }
            png_pong::PngRaster::Graya8(ras) => {
                width = ras.width();
-                ras.pixels()
-                    .iter()
-                    .map(|px| crate::image::Pixel {
-                        color: <u8>::from(px.one()) as u32,
-                        alpha: <f32>::from(px.alpha()),
-                    })
-                    .collect()
+                Self::pixels_from_8bit(ras, true)
+            }
+            png_pong::PngRaster::Rgb8(ras) => {
+                width = ras.width();
+                Self::pixels_from_8bit(ras, false)
+            }
+            png_pong::PngRaster::Rgba8(ras) => {
+                width = ras.width();
+                Self::pixels_from_8bit(ras, false)
+            }
+            png_pong::PngRaster::Gray16(ras) => {
+                width = ras.width();
+                Self::pixels_from_16bit(ras, true)
+            }
+            png_pong::PngRaster::Rgb16(ras) => {
+                width = ras.width();
+                Self::pixels_from_16bit(ras, false)
+            }
+            png_pong::PngRaster::Graya16(ras) => {
+                width = ras.width();
+                Self::pixels_from_16bit(ras, true)
+            }
+            png_pong::PngRaster::Rgba16(ras) => {
+                width = ras.width();
+                Self::pixels_from_16bit(ras, false)
            }
            _ => return Err(AnimeError::Format),
        };
@@ -282,10 +303,48 @@ impl AnimeImage {
        matrix.update();
        Ok(matrix)
    }
+
+    fn pixels_from_8bit<P>(ras: pix::Raster<P>, grey: bool) -> Vec<Pixel>
+    where
+        P: pix::el::Pixel<Chan = pix::chan::Ch8>,
+    {
+        ras.pixels()
+            .iter()
+            .map(|px| crate::image::Pixel {
+                color: if grey {
+                    <u8>::from(px.one()) as u32
+                } else {
+                    (<u8>::from(px.one()) / 3) as u32
+                        + (<u8>::from(px.two()) / 3) as u32
+                        + (<u8>::from(px.three()) / 3) as u32
+                },
+                alpha: <f32>::from(px.alpha()),
+            })
+            .collect()
+    }
+
+    fn pixels_from_16bit<P>(ras: pix::Raster<P>, grey: bool) -> Vec<Pixel>
+    where
+        P: pix::el::Pixel<Chan = pix::chan::Ch16>,
+    {
+        ras.pixels()
+            .iter()
+            .map(|px| crate::image::Pixel {
+                color: if grey {
+                    (<u16>::from(px.one()) >> 8) as u32
+                } else {
+                    ((<u16>::from(px.one()) / 3) >> 8) as u32
+                        + ((<u16>::from(px.two()) / 3) >> 8) as u32
+                        + ((<u16>::from(px.three()) / 3) >> 8) as u32
+                },
+                alpha: <f32>::from(px.alpha()),
+            })
+            .collect()
+    }
 }

 impl From<&AnimeImage> for AnimeDataBuffer {
-    /// Do conversion from the nested Vec in AniMeMatrix to the two required
+    /// Do conversion from the nested Vec in AnimeDataBuffer to the two required
    /// packets suitable for sending over USB
    #[inline]
    fn from(leds: &AnimeImage) -> Self {
--- a/rog-anime/src/sequencer.rs
+++ b/rog-anime/src/sequencer.rs
@@ -3,7 +3,7 @@ use std::{path::PathBuf, time::Duration};
 use glam::Vec2;
 use serde_derive::{Deserialize, Serialize};

-use crate::{error::AnimeError, AnimTime, AnimeDataBuffer, AnimeGif, AnimeImage};
+use crate::{error::AnimeError, AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage};

 /// All the possible AniMe actions that can be used. This enum is intended to be
 /// a helper for loading up `ActionData`.
@@ -15,6 +15,12 @@ pub enum ActionLoader {
        time: AnimTime,
        brightness: f32,
    },
+    /// Image designed to be pixel perfect using the slanted template
+    AsusImage {
+        file: PathBuf,
+        time: AnimTime,
+        brightness: f32,
+    },
    /// Animated gif. If the file is a png a static gif is created using the `time` properties
    ImageAnimation {
        file: PathBuf,
@@ -29,7 +35,7 @@ pub enum ActionLoader {
        scale: f32,
        angle: f32,
        translation: Vec2,
-        time: Option<AnimTime>,
+        time: AnimTime,
        brightness: f32,
    },
    /// A pause to be used between sequences
@@ -61,39 +67,47 @@ impl ActionData {
        let a = match action {
            ActionLoader::AsusAnimation {
                file,
-                time: duration,
+                time,
                brightness,
-            } => ActionData::Animation(AnimeGif::create_diagonal_gif(
+            } => ActionData::Animation(AnimeGif::from_diagonal_gif(file, *time, *brightness)?),
+            ActionLoader::AsusImage {
                file,
-                *duration,
-                *brightness,
-            )?),
+                time,
+                brightness,
+            } => match time {
+                AnimTime::Infinite => {
+                    let image = AnimeDiagonal::from_png(file, None, *brightness)?;
+                    let data = <AnimeDataBuffer>::from(&image);
+                    ActionData::Image(Box::new(data))
+                }
+                _ => ActionData::Animation(AnimeGif::from_diagonal_png(file, *time, *brightness)?),
+            },
            ActionLoader::ImageAnimation {
                file,
                scale,
                angle,
                translation,
-                time: duration,
+                time,
                brightness,
            } => {
                if let Some(ext) = file.extension() {
                    if ext.to_string_lossy().to_lowercase() == "png" {
-                        return Ok(ActionData::Animation(AnimeGif::create_png_static(
+                        return Ok(ActionData::Animation(AnimeGif::from_png(
                            file,
                            *scale,
                            *angle,
                            *translation,
-                            *duration,
+                            *time,
                            *brightness,
                        )?));
                    }
                }
-                ActionData::Animation(AnimeGif::create_png_gif(
+                ActionData::Animation(AnimeGif::from_gif(
                    file,
                    *scale,
                    *angle,
                    *translation,
-                    *duration,
+                    *time,
                    *brightness,
                )?)
            }
@@ -105,20 +119,23 @@ impl ActionData {
                brightness,
                time,
            } => {
-                if let Some(time) = time {
-                    return Ok(ActionData::Animation(AnimeGif::create_png_static(
+                match time {
+                    AnimTime::Infinite => {
+                        // If no time then create a plain static image
+                        let image =
+                            AnimeImage::from_png(file, *scale, *angle, *translation, *brightness)?;
+                        let data = <AnimeDataBuffer>::from(&image);
+                        ActionData::Image(Box::new(data))
+                    }
+                    _ => ActionData::Animation(AnimeGif::from_png(
                        file,
                        *scale,
                        *angle,
                        *translation,
                        *time,
                        *brightness,
-                    )?));
+                    )?),
                }
-                // If no time then create a plain static image
-                let image = AnimeImage::from_png(file, *scale, *angle, *translation, *brightness)?;
-                let data = <AnimeDataBuffer>::from(&image);
-                ActionData::Image(Box::new(data))
            }
            ActionLoader::Pause(duration) => ActionData::Pause(*duration),
        };
--- a/rog-aura/src/builtin_modes.rs
+++ b/rog-aura/src/builtin_modes.rs
@@ -29,7 +29,8 @@ pub enum LedBrightness {

 impl LedBrightness {
    pub fn as_char_code(&self) -> u8 {
-        std::char::from_digit(*self as u32, 10).unwrap() as u8
+        std::char::from_digit(*self as u32, 10)
+            .expect("LedBrightness.as_char_code failed to convert") as u8
    }
 }

--- a/rog-dbus/Cargo.toml
+++ b/rog-dbus/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rog_dbus"
-version = "3.5.1"
+version = "4.0.2"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -13,7 +13,7 @@ edition = "2018"
 rog_anime = { path = "../rog-anime" }
 rog_aura = { path = "../rog-aura" }
 rog_profiles = { path = "../rog-profiles" }
-rog_types = { path = "../rog-types" }
+rog_supported = { path = "../rog-supported" }
 zbus = "^1.9"
 zbus_macros = "^1.9"
-zvariant = "^2.5"
+zvariant = "^2.8"
--- a/rog-dbus/src/lib.rs
+++ b/rog-dbus/src/lib.rs
@@ -4,7 +4,6 @@ pub static DBUS_IFACE: &str = "org.asuslinux.Daemon";

 pub mod zbus_anime;
 pub mod zbus_charge;
-pub mod zbus_gfx;
 pub mod zbus_led;
 pub mod zbus_profile;
 pub mod zbus_rogbios;
@@ -12,8 +11,7 @@ pub mod zbus_supported;

 use rog_anime::AnimePowerStates;
 use rog_aura::{AuraEffect, LedPowerStates};
-use rog_profiles::profiles::Profile;
-use rog_types::gfx_vendors::{GfxRequiredUserAction, GfxVendors};
+use rog_profiles::Profile;
 use std::sync::mpsc::{channel, Receiver};
 use zbus::{Connection, Result, SignalReceiver};

@@ -21,7 +19,6 @@ pub static VERSION: &str = env!("CARGO_PKG_VERSION");
 pub struct DbusProxies<'a> {
    anime: zbus_anime::AnimeProxy<'a>,
    charge: zbus_charge::ChargeProxy<'a>,
-    gfx: zbus_gfx::GfxProxy<'a>,
    led: zbus_led::LedProxy<'a>,
    profile: zbus_profile::ProfileProxy<'a>,
    rog_bios: zbus_rogbios::RogBiosProxy<'a>,
@@ -38,7 +35,6 @@ impl<'a> DbusProxies<'a> {
                anime: zbus_anime::AnimeProxy::new(&conn)?,
                led: zbus_led::LedProxy::new(&conn)?,
                charge: zbus_charge::ChargeProxy::new(&conn)?,
-                gfx: zbus_gfx::GfxProxy::new(&conn)?,
                profile: zbus_profile::ProfileProxy::new(&conn)?,
                rog_bios: zbus_rogbios::RogBiosProxy::new(&conn)?,
                supported: zbus_supported::SupportProxy::new(&conn)?,
@@ -52,7 +48,6 @@ impl<'a> DbusProxies<'a> {
        recv.receive_for(self.anime.proxy());
        recv.receive_for(self.led.proxy());
        recv.receive_for(self.charge.proxy());
-        recv.receive_for(self.gfx.proxy());
        recv.receive_for(self.profile.proxy());
        recv.receive_for(self.rog_bios.proxy());
        recv.receive_for(self.supported.proxy());
@@ -67,10 +62,6 @@ impl<'a> DbusProxies<'a> {
        &self.charge
    }

-    pub fn gfx(&self) -> &zbus_gfx::GfxProxy<'a> {
-        &self.gfx
-    }
-
    pub fn led(&self) -> &zbus_led::LedProxy<'a> {
        &self.led
    }
@@ -90,8 +81,6 @@ impl<'a> DbusProxies<'a> {

 // Signals separated out
 pub struct Signals {
-    pub gfx_vendor: Receiver<GfxVendors>,
-    pub gfx_action: Receiver<GfxRequiredUserAction>,
    pub profile: Receiver<Profile>,
    pub led_mode: Receiver<AuraEffect>,
    pub led_power_state: Receiver<LedPowerStates>,
@@ -105,16 +94,6 @@ impl Signals {
    #[inline]
    pub fn new(proxies: &DbusProxies) -> Result<Self> {
        Ok(Signals {
-            gfx_vendor: {
-                let (tx, rx) = channel();
-                proxies.gfx.connect_notify_gfx(tx)?;
-                rx
-            },
-            gfx_action: {
-                let (tx, rx) = channel();
-                proxies.gfx.connect_notify_action(tx)?;
-                rx
-            },
            profile: {
                let (tx, rx) = channel();
                proxies.profile.connect_notify_profile(tx)?;
@@ -182,26 +161,9 @@ impl<'a> RogDbusClient<'a> {
        recv.receive_for(self.proxies.anime.proxy());
        recv.receive_for(self.proxies.led.proxy());
        recv.receive_for(self.proxies.charge.proxy());
-        recv.receive_for(self.proxies.gfx.proxy());
        recv.receive_for(self.proxies.profile.proxy());
        recv.receive_for(self.proxies.rog_bios.proxy());
        recv.receive_for(self.proxies.supported.proxy());
        recv
    }
-
-    /*
-     * GFX
-     */
-    pub fn gfx_wait_changed(&self) -> Result<GfxRequiredUserAction> {
-        loop {
-            if let Ok(res) = self.proxies.gfx.proxy().next_signal() {
-                if res.is_none() {
-                    if let Ok(stuff) = self.signals.gfx_action.try_recv() {
-                        return Ok(stuff);
-                    }
-                    // return Ok("Failed for unknown reason".to_owned());
-                }
-            }
-        }
-    }
 }
--- a/rog-dbus/src/zbus_anime.rs
+++ b/rog-dbus/src/zbus_anime.rs
@@ -45,18 +45,23 @@ impl<'a> AnimeProxy<'a> {
        &self.0
    }

-    /// Set whether the AniMe will show boot, suspend, or off animations
-    #[inline]
-    pub fn set_system_animations(&self, on: bool) -> Result<()> {
-        self.0.set_boot_on_off(on)
-    }
-
    /// Set whether the AniMe is displaying images/data
    #[inline]
-    pub fn set_led_power(&self, on: bool) -> Result<()> {
+    pub fn set_on_off(&self, on: bool) -> Result<()> {
        self.0.set_on_off(on)
    }

+    /// Set the global AniMe brightness
+    pub fn set_brightness(&self, bright: f32) -> Result<()> {
+        self.0.set_brightness(bright)
+    }
+
+    /// Set whether the AniMe will show boot, suspend, or off animations
+    #[inline]
+    pub fn set_boot_on_off(&self, on: bool) -> Result<()> {
+        self.0.set_boot_on_off(on)
+    }
+
    /// Writes a data stream of length. Will force system thread to exit until it is restarted
    #[inline]
    pub fn write(&self, input: AnimeDataBuffer) -> Result<()> {
--- a/rog-dbus/src/zbus_gfx.rs
+++ b/rog-dbus/src/zbus_gfx.rs
@@ -1,98 +0,0 @@
-//! # DBus interface proxy for: `org.asuslinux.Gfx`
-//!
-//! This code was generated by `zbus-xmlgen` `1.0.0` from DBus introspection data.
-//! Source: `Interface '/org/asuslinux/Gfx' from service 'org.asuslinux.Daemon' on system bus`.
-//!
-//! You may prefer to adapt it, instead of using it verbatim.
-//!
-//! More information can be found in the
-//! [Writing a client proxy](https://zeenix.pages.freedesktop.org/zbus/client.html)
-//! section of the zbus documentation.
-//!
-//! This DBus object implements
-//! [standard DBus interfaces](https://dbus.freedesktop.org/doc/dbus-specification.html),
-//! (`org.freedesktop.DBus.*`) for which the following zbus proxies can be used:
-//!
-//! * [`zbus::fdo::PropertiesProxy`]
-//! * [`zbus::fdo::IntrospectableProxy`]
-//! * [`zbus::fdo::PeerProxy`]
-//!
-//! …consequently `zbus-xmlgen` did not generate code for the above interfaces.
-
-use std::sync::mpsc::Sender;
-
-use rog_types::gfx_vendors::{GfxPower, GfxRequiredUserAction, GfxVendors};
-use zbus::{dbus_proxy, Connection, Result};
-
-#[dbus_proxy(
-    interface = "org.asuslinux.Daemon",
-    default_path = "/org/asuslinux/Gfx"
-)]
-trait Daemon {
-    /// Power method
-    fn power(&self) -> zbus::Result<GfxPower>;
-
-    /// SetVendor method
-    fn set_vendor(&self, vendor: &GfxVendors) -> zbus::Result<GfxRequiredUserAction>;
-
-    /// Vendor method
-    fn vendor(&self) -> zbus::Result<GfxVendors>;
-
-    /// NotifyAction signal
-    #[dbus_proxy(signal)]
-    fn notify_action(&self, action: GfxRequiredUserAction) -> zbus::Result<()>;
-
-    /// NotifyGfx signal
-    #[dbus_proxy(signal)]
-    fn notify_gfx(&self, vendor: GfxVendors) -> zbus::Result<()>;
-}
-
-pub struct GfxProxy<'a>(DaemonProxy<'a>);
-
-impl<'a> GfxProxy<'a> {
-    #[inline]
-    pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(GfxProxy(DaemonProxy::new(conn)?))
-    }
-
-    #[inline]
-    pub fn proxy(&self) -> &DaemonProxy<'a> {
-        &self.0
-    }
-
-    #[inline]
-    pub fn gfx_get_pwr(&self) -> Result<GfxPower> {
-        self.0.power()
-    }
-
-    #[inline]
-    pub fn gfx_get_mode(&self) -> Result<GfxVendors> {
-        self.0.vendor()
-    }
-
-    #[inline]
-    pub fn gfx_write_mode(&self, vendor: &GfxVendors) -> Result<GfxRequiredUserAction> {
-        self.0.set_vendor(vendor)
-    }
-
-    #[inline]
-    pub fn connect_notify_action(
-        &self,
-        send: Sender<GfxRequiredUserAction>,
-    ) -> zbus::fdo::Result<()> {
-        self.0.connect_notify_action(move |data| {
-            send.send(data)
-                .map_err(|err| zbus::fdo::Error::Failed(err.to_string()))?;
-            Ok(())
-        })
-    }
-
-    #[inline]
-    pub fn connect_notify_gfx(&self, send: Sender<GfxVendors>) -> zbus::fdo::Result<()> {
-        self.0.connect_notify_gfx(move |data| {
-            send.send(data)
-                .map_err(|err| zbus::fdo::Error::Failed(err.to_string()))?;
-            Ok(())
-        })
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Luke D. Jones	ba40c3f739	Update dependencies	2021-12-19 21:01:47 +13:00
Luke D. Jones	31eff037a2	Bump to version 4.0.7	2021-12-19 21:00:58 +13:00
Luke D. Jones	630dee0b2a	Update notes in CLI tool	2021-12-19 20:57:50 +13:00
Luke Jones	9110f06ed5	Update README.md Remove whitespace and rustup from fedora build section	2021-12-17 21:18:00 +00:00
Luke Jones	2b0eceaa9d	Merge branch 'main' into 'main' Update of README for building and installing See merge request asus-linux/asusctl!93	2021-12-17 21:16:56 +00:00
Peter Ross	c96e1babe5	Update README.md	2021-12-16 15:23:08 +00:00
Peter Ross	9388cbde5d	Update README.md	2021-12-16 15:16:35 +00:00
Luke D. Jones	e739cddd6a	Update patch links	2021-12-04 16:04:56 +13:00
Luke Jones	8cee6e0fc4	Remove Ubuntu repo instructions	2021-11-14 21:51:56 +00:00
Luke Jones	bcf516afeb	Merge branch 'sonnyp-main-patch-01923' into 'main' Update kernel support for Linux 5.15 See merge request asus-linux/asusctl!88	2021-11-12 00:23:54 +00:00
Luke Jones	b0e3e81b7f	Merge branch 'fix/platform-functions/profile-support' into 'main' Fix incorrect power profile support validation. See merge request asus-linux/asusctl!89	2021-11-12 00:23:22 +00:00
Luke Jones	ce6a1215a3	Merge branch 'LordVicky-main-patch-24845' into 'main' Update asusd-ledmodes.toml to support Asus Rog Strix G15 G513QE See merge request asus-linux/asusctl!90	2021-11-12 00:22:51 +00:00
LordVicky	f54c1dc7d0	Fix typo	2021-11-09 07:32:39 +00:00
LordVicky	43aaae8d47	Update asusd-ledmodes.toml to support Asus Rog Strix G15 G513QE	2021-11-09 07:28:57 +00:00
Alexander Narsudinov	ca463a2944	Fix incorrect power profile support validation. Before this patch power profile support validation used wrong flag from PlatformProfileFunctions struct.	2021-11-07 15:11:31 +03:00
Sonny Piers	20e22589dc	Update kernel support for Linux 5.15	2021-11-04 11:47:47 +00:00
Luke D. Jones	38d047cb8a	Update changelog	2021-11-01 16:03:40 +13:00
Luke D. Jones	1d977199f3	Fix cli for bios/g-sync	2021-11-01 10:57:40 +13:00
Luke Jones	5041019d77	Merge branch 'fluke/anime-cli' into 'main' Fluke/anime cli See merge request asus-linux/asusctl!87	2021-10-30 20:28:36 +00:00
Luke D. Jones	aa3835d3b3	Bump versions	2021-10-31 09:24:07 +13:00
Luke D. Jones	678505811d	Add additional anime cli commands for image types	2021-10-28 23:43:50 +13:00
Luke D. Jones	a925cbaed5	Bump version	2021-10-27 23:19:31 +13:00
Luke Jones	7d2201d873	Merge branch 'fluke/bugfixes' into 'main' Add led modes for G513QR Closes #144 and #143 See merge request asus-linux/asusctl!86	2021-10-27 10:18:31 +00:00
Luke D. Jones	c0c1608d44	Update deps	2021-10-27 23:15:25 +13:00
Luke D. Jones	7bc6c83a04	Check and pass error if charge limit not in 20-100 range Closes #144	2021-10-27 23:04:44 +13:00
Luke D. Jones	3f0df82f2d	Parse percentages in fan curve only if '%' provided otherwise range is 0-255	2021-10-27 22:42:32 +13:00
Luke D. Jones	328ff0251b	Add led modes for G513QR Closes #143	2021-10-27 22:35:48 +13:00
Luke Jones	c52582a413	Merge branch 'fluke/bugfixes' into 'main' Bugfixes Closes #139 and #140 See merge request asus-linux/asusctl!85	2021-10-02 07:34:55 +00:00
Luke D. Jones	3aa6eee306	Bugfixes - Spawn tasks on individual threads - Don't force a default of fan-curve on reload - Add missing profile commands - Begin obsoleting the graphics switch command in favour of supergfxctl - Slim down the notification daemon to pure ASUS notifications Bad behaviour in fan-curve new function that was forcing a re-init to default on reload. Remove this and only save config again after loading the config file and writing a curve (hidden side effect of write is that a zeroed array is defaulted to read-from-system - this needs to be changed too). Closes #140, #139	2021-10-02 20:31:14 +13:00
Luke Jones	7d47faba0e	Merge branch 'plasma-logout' into 'main' Add kde logout prompt as fallback to gnome-session-quit See merge request asus-linux/asusctl!82	2021-09-21 08:07:43 +00:00
Luke Jones	f6fb477898	Merge branch 'main' into 'main' Updated asusd-ledmodes.toml with ROG Strix G713QM See merge request asus-linux/asusctl!83	2021-09-21 08:06:59 +00:00
Abhijith M	8963960d4b	Updated asusd-ledmodes.toml with ROG Strix G713QM	2021-09-21 02:09:53 +00:00
Janghyub Seo	ef973f676b	Add kde logout prompt as fallback to gnome-session-quit	2021-09-19 02:13:11 +09:00
Luke D. Jones	812f9ea30e	Add lock update	2021-09-16 22:38:09 +12:00
Luke Jones	ff843b1241	Merge branch 'main' into 'main' Add G533QS to supported models See merge request asus-linux/asusctl!81	2021-09-16 10:30:09 +00:00
George Dumitrescu	59e7af149d	Add G533QS to supported models	2021-09-16 10:07:48 +03:00
Luke D. Jones	6f14c85287	Revert supergfxctl deps to git	2021-09-16 16:03:41 +12:00
Luke D. Jones	ac0dec4dbf	Bump daemon version for release	2021-09-16 11:20:17 +12:00
Luke D. Jones	e3d192412e	Bugfixes	2021-09-16 11:19:05 +12:00
Luke Jones	9fadb6db30	Merge branch 'necessary129-main-patch-69023' into 'main' Add another Strix G17 model See merge request asus-linux/asusctl!80	2021-09-15 00:06:31 +00:00
Shamil K	f8a1b71866	Add another Strix G17 model	2021-09-14 12:00:04 +00:00
Luke Jones	c0a55acba7	Merge branch 'main' into 'main' Adding ROG Flow X13 to LED modes known devices See merge request asus-linux/asusctl!79	2021-09-14 11:45:56 +00:00
Joseph Ferano	4f232de634	Adding ROG Flow X13 to LED modes known devices	2021-09-14 18:05:42 +07:00
Luke Jones	d351ebdaa0	Merge branch 'fluke/fan_curves_v13' into 'main' Fluke/fan curves v13 See merge request asus-linux/asusctl!78	2021-09-14 02:55:51 +00:00
Luke D. Jones	ab195e1d84	Fan curve enablement - Add CtrlProfileTask - Add method to reset active profile curve to platform default - Wrap the zbus methods for profiles + fan curves - Enable CLI args for fan curves - CLI mod and save curves	2021-09-14 14:52:15 +12:00
Luke D. Jones	7041d77256	Fix asusd-ledmodes.toml	2021-09-11 17:03:32 +12:00
Luke D. Jones	99dd052d54	Bump version in readme	2021-09-11 00:27:21 +12:00
Luke Jones	de9942609e	Merge branch 'fluke/fan_curves_v9' into 'main' Fluke/fan curves v9 See merge request asus-linux/asusctl!77	2021-09-10 12:26:14 +00:00
Luke D. Jones	b939a9d331	Fetch and store fan curve correctly	2021-09-11 00:25:46 +12:00
Luke D. Jones	0a565a7a5c	Fleshing out functions and zbus controls	2021-09-08 23:33:42 +12:00
Luke D. Jones	bfaa478a4a	Begin syncing changes with patch series	2021-09-07 20:20:37 +12:00
Luke Jones	f895a5623e	Merge branch 'doc-ubuntu' into 'main' Add ubuntu repo install commands See merge request asus-linux/asusctl!76	2021-09-06 03:48:19 +00:00
Guy Sheffer	b7c869bd64	Add ubuntu repo install commands	2021-09-05 10:55:16 +03:00
Luke D. Jones	5f677bc3b9	Provide extra help tips. Update manual	2021-08-29 21:30:30 +12:00
Luke D. Jones	ccfadc2fcb	Updates to asusctl cli app	2021-08-28 11:47:01 +12:00
Luke D. Jones	c6cc304a42	Clean up unwrap()'s. Print out info in asusctl if error	2021-08-28 11:07:47 +12:00
Luke D. Jones	3d41a7978a	Fix crash when platform_profile not supported Closes #130	2021-08-28 09:33:23 +12:00
Luke D. Jones	43fc467d58	Fix rm of not installed components	2021-08-28 00:25:51 +12:00
Luke D. Jones	6aba60f604	Try to re-get AniMe dev handle on write error	2021-08-27 22:31:50 +12:00
Luke D. Jones	a13dedf500	Cleanup	2021-08-27 20:46:04 +12:00
dragonn	cb490f23e9	Requesting dbus name after finishing initalizaction	2021-08-27 20:45:37 +12:00
Luke Jones	7dc8a743b9	Merge branch 'fluke/platform_curves' into 'main' platform_profile + fan curve support Closes #129 and #128 See merge request asus-linux/asusctl!75	2021-08-27 08:27:10 +00:00
Luke D. Jones	52f3b5a7bf	Charge limit: try to support BAT<n> Closes #128	2021-08-27 20:22:15 +12:00
Luke D. Jones	e89e7ca10f	Add LED brightness pre/next cycle Closes #129	2021-08-27 20:15:15 +12:00
Luke D. Jones	2431dd9e93	Remove supergfxctl to own repo	2021-08-26 16:06:57 +12:00
Luke D. Jones	453d3091c1	Bump major versions	2021-08-26 14:23:28 +12:00
Luke D. Jones	8db37491f3	Mention breaking changes in log	2021-08-26 13:57:19 +12:00
Luke D. Jones	cf915b9e00	Move anime data. Twiddle supergfxctl	2021-08-26 13:53:54 +12:00
Luke D. Jones	326ca37847	rog-supported crate	2021-08-26 13:17:17 +12:00
Luke D. Jones	498e604531	Major update to supergfx and others	2021-08-26 11:44:11 +12:00
Luke D. Jones	60b7f3be69	Begin cleanup	2021-08-25 11:42:32 +12:00
Luke D. Jones	6ceb5cf939	Major restructure to move gfx control out to crate	2021-08-25 11:16:23 +12:00
Luke D. Jones	0ed97db4c1	Temporary checkpoint	2021-08-24 12:35:57 +12:00
Luke D. Jones	8fcd05c2bb	Append small extra help to bios option cli	2021-08-12 10:35:37 +12:00
Luke D. Jones	6de4590f27	Update fan curve to use git repo	2021-08-12 10:21:09 +12:00
Luke Jones	b097fd4da9	Merge branch 'fluke/anime' into 'main' AniMe: more png colour type support Closes #122 and #121 See merge request asus-linux/asusctl!73	2021-08-11 08:31:33 +00:00
Luke D. Jones	2a8e05707d	AniMe: more png colour type support Closes #121, #122	2021-08-11 20:27:44 +12:00
Luke Jones	a54e112978	Merge branch 'no_star_for_you' into 'main' Remove Star from G513IH supported modes See merge request asus-linux/asusctl!72	2021-08-04 01:04:57 +00:00
pshem	5785eb981d	Remove Star from G513IH supported modes	2021-08-02 10:06:48 +01:00