Merge branch 'fluke/bugfixes' into 'main'

Bugfixes Closes #139 and #140 See merge request asus-linux/asusctl!85
Bugfixes
2026-02-06 00:15:04 +01:00 · 2021-10-02 07:34:55 +00:00 · 2021-10-02 20:31:14 +13:00 · 2021-09-21 08:07:43 +00:00 · 2021-09-21 08:06:59 +00:00 · 2021-09-21 02:09:53 +00:00
27 changed files with 946 additions and 649 deletions
@@ -6,6 +6,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 # [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:
@@ -39,13 +39,12 @@ dependencies = [
 "rog_profiles",
 "rog_supported",
 "serde_json",
 "supergfxctl",
 "zbus",
 ]
 [[package]]
 name = "asusctl"
-version = "4.0.0"
+version = "4.0.4"
 dependencies = [
 "daemon",
 "gif",
@@ -56,9 +55,9 @@ dependencies = [
 "rog_dbus",
 "rog_profiles",
 "rog_supported",
 "supergfxctl",
 "sysfs-class",
 "tinybmp",
 "toml",
 "zbus",
 ]
@@ -147,9 +146,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 [[package]]
 name = "cc"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
 [[package]]
 name = "cfg-if"
@@ -209,7 +208,7 @@ dependencies = [
 [[package]]
 name = "daemon"
-version = "4.0.0"
+version = "4.0.4"
 dependencies = [
 "env_logger",
 "log",
@@ -255,7 +254,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
@@ -307,7 +306,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
@@ -334,9 +333,9 @@ dependencies = [
 [[package]]
 name = "futures"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -349,9 +348,9 @@ dependencies = [
 [[package]]
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -359,15 +358,15 @@ dependencies = [
 [[package]]
 name = "futures-core"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
 [[package]]
 name = "futures-executor"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -376,9 +375,9 @@ dependencies = [
 [[package]]
 name = "futures-io"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
 [[package]]
 name = "futures-lite"
@@ -397,34 +396,34 @@ dependencies = [
 [[package]]
 name = "futures-macro"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
 dependencies = [
 "autocfg",
 "proc-macro-hack",
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
 name = "futures-sink"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
 dependencies = [
 "autocfg",
 "futures-channel",
@@ -499,7 +498,7 @@ checksum = "915ef07c710d84733522461de2a734d4d62a3fd39a4d4f404c2f385ef8618d05"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
@@ -519,9 +518,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd"
 dependencies = [
 "cfg-if 1.0.0",
 ]
@@ -540,9 +539,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 [[package]]
 name = "libc"
-version = "0.2.101"
+version = "0.2.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
+checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
 [[package]]
 name = "libudev-sys"
@@ -661,9 +660,9 @@ dependencies = [
 [[package]]
 name = "notify-rust"
-version = "4.5.2"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2ca742cd7268b60c35828d318357f0b1bb9b82088e157ccf3013eb3ce70247"
+checksum = "e4b2d5d72d16b6abdb6fa2c364d9363e23d6ed7c20c1a1e85fd8cd880144442c"
 dependencies = [
 "mac-notification-sys",
 "serde",
@@ -759,9 +758,9 @@ checksum = "bea9d5c668f13b4a1b97d848780e00cfabf76eb83538129c264c0c6d6a968047"
 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb"
 [[package]]
 name = "png_pong"
@@ -797,9 +796,9 @@ dependencies = [
 [[package]]
 name = "proc-macro-crate"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
+checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
 dependencies = [
 "thiserror",
 "toml",
@@ -819,9 +818,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
 dependencies = [
 "unicode-xid 0.2.2",
 ]
@@ -920,13 +919,12 @@ dependencies = [
 [[package]]
 name = "rog_dbus"
-version = "4.0.0"
+version = "4.0.2"
 dependencies = [
 "rog_anime",
 "rog_aura",
 "rog_profiles",
 "rog_supported",
 "supergfxctl",
 "zbus",
 "zbus_macros",
 "zvariant",
@@ -934,7 +932,7 @@ dependencies = [
 [[package]]
 name = "rog_profiles"
-version = "1.0.0"
+version = "1.1.2"
 dependencies = [
 "serde",
 "serde_derive",
@@ -990,29 +988,29 @@ checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 [[package]]
 name = "serde"
-version = "1.0.129"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1f72836d2aa753853178eda473a3b9d8e4eefdaf20523b919677e6de489f8f1"
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
 dependencies = [
 "serde_derive",
 ]
 [[package]]
 name = "serde_derive"
-version = "1.0.129"
+version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57ae87ad533d9a56427558b516d0adac283614e347abf85b0dc0cbbf0a249f3"
+checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
 name = "serde_json"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
+checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
 dependencies = [
 "itoa",
 "ryu",
@@ -1027,7 +1025,7 @@ checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
@@ -1038,9 +1036,9 @@ checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
 [[package]]
 name = "socket2"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
 dependencies = [
 "libc",
 "winapi",
@@ -1068,22 +1066,6 @@ dependencies = [
 "syn 0.11.11",
 ]
 [[package]]
 name = "supergfxctl"
 version = "2.0.0"
 source = "git+https://gitlab.com/asus-linux/supergfxctl.git?tag=2.0.0#3f040cd3ec334242631122cd038aa361cc860be6"
 dependencies = [
 "log",
 "logind-zbus",
 "serde",
 "serde_derive",
 "serde_json",
 "sysfs-class",
 "zbus",
 "zvariant",
 "zvariant_derive",
 ]
 [[package]]
 name = "syn"
 version = "0.11.11"
@@ -1097,9 +1079,9 @@ dependencies = [
 [[package]]
 name = "syn"
-version = "1.0.75"
+version = "1.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
+checksum = "5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
@@ -1135,22 +1117,22 @@ dependencies = [
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
 dependencies = [
 "thiserror-impl",
 ]
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
 dependencies = [
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
@@ -1349,17 +1331,18 @@ dependencies = [
 "proc-macro-crate 0.1.5",
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
 [[package]]
 name = "zvariant"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4b785b8b32b0f8433b4474e6bb4ea77b37c1960e84d7598e01dd199b2b23ef"
+checksum = "e1a9373dead84d640ccf5798f2928917e6aa1ab3f130751406bb13e0a9dd9913"
 dependencies = [
 "byteorder",
 "enumflags2",
 "libc",
 "serde",
 "static_assertions",
 "zvariant_derive",
@@ -1367,12 +1350,12 @@ dependencies = [
 [[package]]
 name = "zvariant_derive"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42af4ee88fb928781391216c34be77ec7cdb3546042b2947ce38d86aa5f37dd"
+checksum = "46ee71e0e88747ec582d290dbe98ff7907ff28770c7a35f16da41e5e6f1f4fa3"
 dependencies = [
- "proc-macro-crate 1.0.0",
+ "proc-macro-crate 1.1.0",
 "proc-macro2",
 "quote 1.0.9",
- "syn 1.0.75",
+ "syn 1.0.77",
 ]
@@ -63,7 +63,7 @@ will probably suffer another rename once it becomes generic enough to do so.
 Requirements are rust >= 1.47 installed from rustup.io if the distro provided version is too old, and `make`.
-**Ubuntu*:** `apt install libclang-dev libudev-dev`
+**Ubuntu:** `apt install libclang-dev libudev-dev`
 **fedora:** `dnf install clang-devel systemd-devel`
@@ -14,9 +14,8 @@ rog_dbus = { path = "../rog-dbus" }
 rog_aura = { path = "../rog-aura" }
 rog_supported = { path = "../rog-supported" }
 rog_profiles = { path = "../rog-profiles" }
 supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", tag = "2.0.0" }
 [dependencies.notify-rust]
 version = "^4.3"
 default-features = false
-features = ["z"]
+features = ["z"]
@@ -3,13 +3,8 @@ use rog_aura::AuraEffect;
 use rog_dbus::{DbusProxies, Signals};
 use rog_profiles::Profile;
 use std::error::Error;
 use std::sync::mpsc::channel;
 use std::thread::sleep;
 use std::time::Duration;
 use std::{process, thread};
 use supergfxctl::gfx_vendors::{GfxRequiredUserAction, GfxVendors};
 use supergfxctl::zbus_proxy::GfxProxy;
 use zbus::Connection;
 const NOTIF_HEADER: &str = "ROG Control";
@@ -37,7 +32,6 @@ macro_rules! base_notification {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
    println!("asus-notify version {}", env!("CARGO_PKG_VERSION"));
    println!("   rog-dbus version {}", rog_dbus::VERSION);
    println!("supergfxctl version {}", supergfxctl::VERSION);
    let (proxies, conn) = DbusProxies::new()?;
    let signals = Signals::new(&proxies)?;
@@ -47,8 +41,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
    let recv = proxies.setup_recv(conn);
    let mut err_count = 0;
    gfx_thread()?;
    loop {
        sleep(Duration::from_millis(100));
        if let Err(err) = recv.next_signal() {
@@ -77,56 +69,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
    }
 }
 fn gfx_thread() -> Result<(), Box<dyn std::error::Error>> {
    let mut last_notification: Option<NotificationHandle> = None;
    let conn = Connection::new_system()?;
    let proxy = GfxProxy::new(&conn)?;
    let (tx1, rx1) = channel();
    proxy.connect_notify_gfx(tx1)?;
    let (tx2, rx2) = channel();
    proxy.connect_notify_action(tx2)?;
    thread::spawn(move || loop {
        if proxy
            .next_signal()
            .map_err(|e| println!("Error: {}", e))
            .is_err()
        {
            break;
        }
        if let Ok(data) = rx1.try_recv() {
            notify!(do_gfx_notif, last_notification, &data);
        }
        if let Ok(data) = rx2.try_recv() {
            match data {
                GfxRequiredUserAction::Logout | GfxRequiredUserAction::Reboot => {
                    do_gfx_action_notif(&data)
                        .map_err(|e| {
                            println!("Error: {}", e);
                        })
                        .ok();
                }
                GfxRequiredUserAction::Integrated => {
                    base_notification!(
                        "You must be in integrated mode first to switch to the requested mode"
                    )
                    .map_err(|e| {
                        println!("Error: {}", e);
                    })
                    .ok();
                }
                GfxRequiredUserAction::None => {}
            }
        }
    });
    Ok(())
 }
 fn do_thermal_notif(profile: &Profile) -> Result<NotificationHandle, Box<dyn Error>> {
    let icon = match profile {
        Profile::Balanced => "asus_notif_yellow",
@@ -160,51 +102,3 @@ fn do_charge_notif(limit: &u8) -> Result<NotificationHandle, notify_rust::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(())
 }
@@ -1,6 +1,6 @@
 [package]
 name = "asusctl"
-version = "4.0.0"
+version = "4.0.4"
 authors = ["Luke D Jones <luke@ljones.dev>"]
 edition = "2018"
@@ -15,7 +15,7 @@ rog_profiles = { path = "../rog-profiles" }
 rog_supported = { path = "../rog-supported" }
 daemon = { path = "../daemon" }
 gumdrop = "^0.8"
-supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", tag = "2.0.0" }
+toml = "^0.5.8"
 sysfs-class = "^0.1.2"
@@ -23,4 +23,4 @@ sysfs-class = "^0.1.2"
 tinybmp = "^0.2.3"
 glam = "0.14.0"
 rog_dbus = { path = "../rog-dbus" }
-gif = "^0.11.2"
+gif = "^0.11.2"
@@ -1,10 +1,9 @@
 use crate::{
    anime_cli::AnimeCommand,
    aura_cli::{LedBrightness, SetAuraBuiltin},
-    profiles_cli::ProfileCommand,
+    profiles_cli::{FanCurveCommand, ProfileCommand},
 };
 use gumdrop::Options;
 use supergfxctl::gfx_vendors::GfxVendors;
 #[derive(Default, Options)]
 pub struct CliStart {
@@ -20,7 +19,7 @@ pub struct CliStart {
    pub next_kbd_bright: bool,
    #[options(help = "Toggle to previous keyboard brightness")]
    pub prev_kbd_bright: bool,
-    #[options(meta = "", help = "<20-100>")]
+    #[options(meta = "", help = "Set your battery charge limit <20-100>")]
    pub chg_limit: Option<u8>,
    #[options(command)]
    pub command: Option<CliCommand>,
@@ -30,9 +29,11 @@ pub struct CliStart {
 pub enum CliCommand {
    #[options(help = "Set the keyboard lighting from built-in modes")]
    LedMode(LedModeCommand),
-    #[options(help = "Create and configure profiles")]
+    #[options(help = "Set or select platform_profile")]
    Profile(ProfileCommand),
-    #[options(help = "Set the graphics mode")]
+    #[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),
@@ -66,17 +67,6 @@ pub struct LedModeCommand {
 pub struct GraphicsCommand {
    #[options(help = "print help message")]
    pub help: bool,
    #[options(
        meta = "",
        help = "Set graphics mode: <nvidia, hybrid, compute, integrated>"
    )]
    pub mode: Option<GfxVendors>,
    #[options(help = "Get the current mode")]
    pub get: bool,
    #[options(help = "Get the current power status")]
    pub pow: bool,
    #[options(help = "Do not ask for confirmation")]
    pub force: bool,
 }
 #[derive(Options, Debug)]
@@ -7,25 +7,19 @@ use crate::aura_cli::{LedBrightness, SetAuraBuiltin};
 use crate::cli_opts::*;
 use anime_cli::{AnimeActions, AnimeCommand};
 use gumdrop::{Opt, Options};
-use profiles_cli::ProfileCommand;
+use profiles_cli::{FanCurveCommand, ProfileCommand};
 use rog_anime::{AnimeDataBuffer, AnimeImage, Vec2, ANIME_DATA_LEN};
 use rog_aura::{self, AuraEffect};
 use rog_dbus::RogDbusClient;
 use rog_profiles::error::ProfileError;
 use rog_supported::SupportedFunctions;
 use rog_supported::{
    AnimeSupportedFunctions, LedSupportedFunctions, PlatformProfileFunctions,
    RogBiosSupportedFunctions,
 };
-use std::{env::args, path::Path, sync::mpsc::channel};
+use std::process::Command;
-use supergfxctl::{
+use std::{env::args, path::Path};
    gfx_vendors::GfxRequiredUserAction,
    special::{get_asus_gsync_gfx_mode, has_asus_gsync_gfx_mode},
    zbus_proxy::GfxProxy,
 };
 use zbus::Connection;
 const PLEASE: &str =
    "Please use `systemctl status asusd` and `journalctl -b -u asusd` for more information";
 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>> {
@@ -49,50 +43,48 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
        }
    }
-    let (dbus, _) = RogDbusClient::new().map_err(|e| {
+    let (dbus, _) = RogDbusClient::new()
-        println!("\nIs asusd running?\n");
+        .map_err(|e| {
-        println!("{}", PLEASE);
+            print_error_help(Box::new(e), None);
-        println!("{}\n", CONFIG_ADVICE);
+            std::process::exit(3);
-        e
+        })
-    })?;
+        .unwrap();
    let supported = dbus
        .proxies()
        .supported()
        .get_supported_functions()
        .map_err(|e| {
-            println!("\nIs asusd running?\n");
+            print_error_help(Box::new(e), None);
-            println!("{}", PLEASE);
+            std::process::exit(4);
-            println!("{}\n", CONFIG_ADVICE);
+        })
-            e
+        .unwrap();
        })?;
    if parsed.version {
        print_versions();
        println!();
        print_laptop_info();
        println!("{}\n", PLEASE);
        return Ok(());
    }
    if let Err(err) = do_parsed(&parsed, &supported, &dbus) {
-        print_error_help(err, &supported);
+        print_error_help(err, Some(&supported));
    }
    Ok(())
 }
-fn print_error_help(err: Box<dyn std::error::Error>, supported: &SupportedFunctions) {
+fn print_error_help(err: Box<dyn std::error::Error>, supported: Option<&SupportedFunctions>) {
-    println!("Error: {}\n", err);
+    if do_diagnose("asusd") {
-    print_versions();
+        println!("\nError: {}\n", err);
-    println!();
+        print_versions();
-    print_laptop_info();
+        println!();
-    println!();
+        print_laptop_info();
-    println!("Supported laptop functions:\n\n{}", supported);
+        if let Some(supported) = supported {
-    println!();
+            println!();
-    println!("{}", PLEASE);
+            println!("Supported laptop functions:\n\n{}", supported);
-    println!("The above may give some indication that an option is not supported");
+        }
-    println!("or that a config file must be removed or fixed");
+    }
 }
 fn print_versions() {
@@ -105,7 +97,6 @@ fn print_versions() {
    println!("     rog-dbus v{}", rog_dbus::VERSION);
    println!(" rog-profiles v{}", rog_profiles::VERSION);
    println!("rog-supported v{}", rog_supported::VERSION);
    println!("  supergfxctl v{}", supergfxctl::VERSION);
 }
 fn print_laptop_info() {
@@ -117,6 +108,30 @@ fn print_laptop_info() {
    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,
@@ -125,7 +140,10 @@ fn do_parsed(
    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::Graphics(cmd)) => do_gfx(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 => {
@@ -177,67 +195,9 @@ fn do_parsed(
    Ok(())
 }
-fn do_gfx(command: &GraphicsCommand) -> Result<(), Box<dyn std::error::Error>> {
+fn do_gfx() -> Result<(), Box<dyn std::error::Error>> {
-    if command.mode.is_none() && !command.get && !command.pow && !command.force || command.help {
+    println!("Please use supergfxctl for graphics switching. supergfxctl is the result of making asusctl graphics switching generic so all laptops can use it");
-        println!("{}", command.self_usage());
+    println!("This command will be removed in future");
    }
    let conn = Connection::new_system()?;
    let proxy = GfxProxy::new(&conn)?;
    let (tx, rx) = channel();
    proxy.connect_notify_action(tx)?;
    if let Some(mode) = command.mode {
        if has_asus_gsync_gfx_mode() && get_asus_gsync_gfx_mode()? == 1 {
            println!("You can not change modes until you turn dedicated/G-Sync off and reboot");
            std::process::exit(-1);
        }
        println!("If anything fails check `journalctl -b -u asusd`\n");
        proxy.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
        })?;
        loop {
            proxy.next_signal()?;
            if let Ok(res) = rx.try_recv() {
                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 = proxy.gfx_get_mode()?;
        println!("Current graphics mode: {}", <&str>::from(res));
    }
    if command.pow {
        let res = proxy.gfx_get_pwr()?;
        println!("Current power status: {}", <&str>::from(&res));
    }
    Ok(())
 }
@@ -375,39 +335,104 @@ fn handle_profile(
    supported: &PlatformProfileFunctions,
    cmd: &ProfileCommand,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    println!("Warning: Profiles should work fine but now depend on power-profiles-daemon v0.9+");
+    if !supported.fan_curves {
-    println!("Warning: Fan-curve support is coming in a 4.1.x release");
+        println!("Profiles not supported by either this kernel or by the laptop.");
-    if !cmd.next && !cmd.list {
+        return Err(ProfileError::NotSupported.into());
    }
    println!("Warning: Profiles now depend on power-profiles-daemon v0.9+ which may not be in your install");
    println!("         If you have unexpected behaviour or have only two profiles in your desktop control");
    println!("         you need to manually install from https://gitlab.freedesktop.org/hadess/power-profiles-daemon");
    println!("         Fedora and Arch distros will get the update soon...\n");
    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()
+        println!("{}", ProfileCommand::usage());
            .lines()
            .map(|s| s.to_string())
            .collect();
        for line in usage
            .iter()
            .filter(|line| !line.contains("--curve") || supported.fan_curves)
        {
            println!("{}", line);
        }
        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_profile()?;
    } else if let Some(profile) = cmd.profile_set {
        dbus.proxies().profile().set_active_profile(profile)?;
    }
    if cmd.list {
        let res = dbus.proxies().profile().profiles()?;
        res.iter().for_each(|p| println!("{:?}", p));
    }
    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.");
        return Err(ProfileError::NotSupported.into());
    }
    if !cmd.get_enabled && !cmd.default && cmd.mod_profile.is_none() {
        if !cmd.help {
            println!("Missing arg or command\n");
        }
        println!("{}", FanCurveCommand::usage());
        if let Some(lst) = cmd.self_command_list() {
            println!("\n{}", lst);
        }
        std::process::exit(1);
    }
    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 cmd.get_enabled {
        let res = dbus.proxies().profile().enabled_fan_profiles()?;
        println!("{:?}", res);
    }
    if cmd.default {
        dbus.proxies().profile().set_active_curve_to_defaults()?;
    }
    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(())
 }
@@ -464,3 +489,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
 }
@@ -1,4 +1,5 @@
 use gumdrop::Options;
 use rog_profiles::{fan_curve_set::CurveData, FanCurvePU, Profile};
 #[derive(Debug, Clone, Options)]
 pub struct ProfileCommand {
@@ -8,4 +9,42 @@ pub struct ProfileCommand {
    pub next: bool,
    #[options(help = "list available profiles")]
    pub list: bool,
    #[options(help = "get profile")]
    pub profile_get: bool,
    #[options(meta = "", help = "set the active profile")]
    pub profile_set: Option<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 = "profile to modify fan-curve for. Shows data if no options provided"
    )]
    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>,
    #[options(
        meta = "",
        help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%. `mod-profile` required"
    )]
    pub data: Option<CurveData>,
 }
@@ -1,6 +1,6 @@
 [package]
 name = "daemon"
-version = "4.0.0"
+version = "4.0.4"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -34,8 +34,18 @@ impl Config {
            } else if let Ok(data) = serde_json::from_str(&buf) {
                config = data;
            } else {
-                warn!("Could not deserialise {}", CONFIG_PATH);
+                warn!(
-                panic!("Please remove {} then restart asusd", CONFIG_PATH);
+                    "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()
@@ -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",
+                    "Could not deserialise {}.\nWill rename to {}-old and recreate config",
-                    ANIME_CONFIG_PATH
+                    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));
    }
 }
@@ -5,6 +5,7 @@ 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,
@@ -181,15 +182,20 @@ impl CtrlAnime {
                    for action in actions.iter() {
                        match action {
                            ActionData::Animation(frames) => {
-                                if rog_anime::run_animation(frames, thread_exit.clone(), &|frame| {
+                                if let Err(err) = rog_anime::run_animation(
-                                    if let Ok(lock) = inner.try_lock() {
+                                    frames,
-                                        lock.write_data_buffer(frame);
+                                    thread_exit.clone(),
-                                    }
+                                    &|frame| {
-                                    Ok(())
+                                        inner
-                                })
+                                            .try_lock()
-                                .map_err(|err| warn!("rog_anime::run_animation: {}", err))
+                                            .map(|lock| lock.write_data_buffer(frame))
-                                .is_err()
+                                            .map_err(|err| {
-                                {
+                                                warn!("rog_anime::run_animation: {}", err);
                                                AnimeError::NoFrames
                                            })
                                    },
                                ) {
                                    warn!("rog_anime::run_animation: {}", err);
                                    break 'main;
                                };
@@ -105,8 +105,17 @@ impl AuraConfig {
                    info!("Updated AuraConfig version");
                    return config;
                }
-                warn!("Could not deserialise {}", AURA_CONFIG_PATH);
+                warn!(
-                panic!("Please remove {} then restart asusd", AURA_CONFIG_PATH);
+                    "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)
@@ -1,5 +1,4 @@
 use log::{error, warn};
 use rog_profiles::fan_curve_set::FanCurveSet;
 use rog_profiles::{FanCurveProfiles, Profile};
 use serde_derive::{Deserialize, Serialize};
 use std::fs::{File, OpenOptions};
@@ -17,20 +16,22 @@ pub struct ProfileConfig {
 impl ProfileConfig {
    fn new(config_path: String) -> Self {
-        let mut platform = ProfileConfig {
+        Self {
            config_path,
-            active_profile: Profile::get_active_profile().unwrap_or(Profile::Balanced),
+            active_profile: Profile::Balanced,
            fan_curves: None,
-        };
+        }
    }
-        if let Ok(res) = FanCurveSet::is_supported() {
+    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();
-                platform.fan_curves = Some(curves);
+                self.fan_curves = Some(curves);
            }
        }
-
+        self.write();
        platform
    }
    pub fn load(config_path: String) -> Self {
@@ -45,17 +46,29 @@ impl ProfileConfig {
        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 {}", config_path);
+                warn!(
-                panic!("Please remove {} then restart service", config_path);
+                    "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 = Self::new(config_path);
            config.set_defaults_and_save();
        }
        config.write();
        config
    }
@@ -1,17 +1,16 @@
 use std::sync::{Arc, Mutex};
 use crate::error::RogError;
-use crate::GetSupported;
+use crate::{CtrlTask, GetSupported};
 use log::{info, warn};
 use rog_profiles::error::ProfileError;
-use rog_profiles::fan_curve_set::FanCurveSet;
+use rog_profiles::{FanCurveProfiles, Profile};
 use rog_profiles::Profile;
 use rog_supported::PlatformProfileFunctions;
 use udev::Device;
 use super::config::ProfileConfig;
 pub struct CtrlPlatformProfile {
    pub config: ProfileConfig,
    pub fan_device: Option<Device>,
 }
 impl GetSupported for CtrlPlatformProfile {
@@ -28,13 +27,13 @@ https://lkml.org/lkml/2021/8/18/1022
            );
        }
-        let res = FanCurveSet::is_supported();
+        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 {
+        if !fan_curve_supported {
            info!(
                r#"
 fan curves kernel interface not found, your laptop does not support this, or the interface is missing.
@@ -55,9 +54,12 @@ Please note that as of 24/08/2021 this is not final.
 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 Some(curves) = &self.config.fan_curves {
+        if let Some(curves) = &mut self.config.fan_curves {
-            if let Ok(mut device) = FanCurveSet::get_device() {
+            if let Ok(mut device) = FanCurveProfiles::get_device() {
-                curves.write_to_platform(self.config.active_profile, &mut 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(())
@@ -65,30 +67,20 @@ impl crate::Reloadable for CtrlPlatformProfile {
 }
 impl CtrlPlatformProfile {
-    pub fn new(mut config: ProfileConfig, fan_device: Option<Device>) -> Result<Self, RogError> {
+    pub fn new(config: ProfileConfig) -> Result<Self, RogError> {
        if Profile::is_platform_profile_supported() {
            info!("Device has profile control available");
-            if let Some(ref device) = fan_device {
+            if FanCurveProfiles::get_device().is_ok() {
-                let profile = config.active_profile;
+                info!("Device has fan curves available");
                config
                    .fan_curves
                    .as_mut()
                    .unwrap()
                    .read_from_dev_profile(profile, device);
            }
            config.write();
-            return Ok(CtrlPlatformProfile { config, fan_device });
+            return Ok(CtrlPlatformProfile { config });
        }
        Err(ProfileError::NotSupported.into())
    }
    pub fn get_device(&self) -> Option<Device> {
        self.fan_device.clone()
    }
    pub fn save_config(&self) {
        self.config.write();
    }
@@ -96,8 +88,6 @@ impl CtrlPlatformProfile {
    /// 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
        self.config.read();
        match self.config.active_profile {
            Profile::Balanced => {
                Profile::set_profile(Profile::Performance)?;
@@ -112,9 +102,50 @@ impl CtrlPlatformProfile {
                self.config.active_profile = Profile::Balanced;
            }
        }
        self.write_profile_curve_to_platform()?;
        Ok(())
    }
-        self.config.write();
+    /// 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_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(())
    }
 }
@@ -35,11 +35,13 @@ impl ProfileZbus {
        ))
    }
-    /// Toggle to next platform_profile. Names provided by `Profiles`
+    /// 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();
        }
        self.do_notification();
    }
@@ -61,9 +63,12 @@ impl ProfileZbus {
            // Read first just incase the user has modified the config before calling this
            ctrl.config.read();
            Profile::set_profile(profile)
-                .map_err(|e| warn!("Profile::set_profile, {}", e))
+                .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();
        }
@@ -84,14 +89,23 @@ impl ProfileZbus {
        ))
    }
-    /// Get a list of profiles that have fan-curves enabled.
+    /// Set a profile fan curve enabled status. Will also activate a fan curve if in the
-    fn set_enabled_fan_profiles(&mut self, profiles: Vec<Profile>) -> zbus::fdo::Result<()> {
+    /// 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();
-            if let Some(curves) = &mut ctrl.config.fan_curves {
+            return if let Some(curves) = &mut ctrl.config.fan_curves {
-                curves.set_enabled_curve_profiles(profiles);
+                curves.set_profile_curve_enabled(profile, enabled);
-            }
+
-            return Err(Error::Failed(UNSUPPORTED_MSG.to_string()));
+                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(),
@@ -99,46 +113,51 @@ impl ProfileZbus {
    }
    /// Get the fan-curve data for the currently active Profile
-    fn active_fan_curve_data(&mut self) -> zbus::fdo::Result<FanCurveSet> {
+    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 {
-                return Ok((*curves.get_active_fan_curves()).clone());
+                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()))
    }
-    /// Get fan-curve data for each Profile as an array of objects
+    /// Set the fan curve for the specified profile.
-    fn fan_curves(&self) -> zbus::fdo::Result<Vec<FanCurveSet>> {
+    /// 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) = &ctrl.config.fan_curves {
+            if let Some(curves) = &mut ctrl.config.fan_curves {
-                return Ok(curves.get_all_fan_curves());
+                curves
-            }
+                    .save_fan_curve(curve, profile)
-            return Err(Error::Failed(UNSUPPORTED_MSG.to_string()));
+                    .map_err(|err| zbus::fdo::Error::Failed(err.to_string()))?;
        }
        Err(Error::Failed("Failed to get all fan curves".to_string()))
    }
    /// Set this fan-curve data
    fn set_fan_curve(&self, curve: CurveData) -> zbus::fdo::Result<()> {
        if let Ok(mut ctrl) = self.inner.try_lock() {
            ctrl.config.read();
            let profile = ctrl.config.active_profile;
            if let Some(mut device) = ctrl.get_device() {
                if let Some(curves) = &mut ctrl.config.fan_curves {
                    curves.write_and_set_fan_curve(curve, profile, &mut device);
                }
            } 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(())
    }
-        Err(Error::Failed("Failed to set fan curves".to_string()))
+    /// 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)]
@@ -1,3 +1,15 @@
 use std::error::Error;
 use std::io::Write;
 use std::sync::Arc;
 use std::sync::Mutex;
 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::*;
@@ -7,6 +19,9 @@ use daemon::ctrl_aura::controller::{
 };
 use daemon::ctrl_charge::CtrlCharge;
 use daemon::ctrl_profiles::config::ProfileConfig;
 use daemon::ctrl_profiles::controller::CtrlProfileTask;
 use daemon::ctrl_rog_bios::CtrlRogBios;
 use daemon::error::RogError;
 use daemon::{
    config::Config, ctrl_supported::SupportedFunctions, laptops::print_board_info, GetSupported,
 };
@@ -14,20 +29,9 @@ use daemon::{
    ctrl_profiles::{controller::CtrlPlatformProfile, zbus::ProfileZbus},
    laptops::LaptopLedData,
 };
 use ::zbus::{fdo, Connection, ObjectServer};
 use daemon::{CtrlTask, Reloadable, ZbusAdd};
 use log::LevelFilter;
 use log::{error, info, warn};
 use rog_dbus::DBUS_NAME;
-use rog_profiles::fan_curve_set::FanCurveSet;
+use rog_profiles::Profile;
 use std::env;
 use std::error::Error;
 use std::io::Write;
 use std::sync::Arc;
 use std::sync::Mutex;
 use daemon::ctrl_rog_bios::CtrlRogBios;
 static PROFILE_CONFIG_PATH: &str = "/etc/asusd/profile.conf";
@@ -70,8 +74,6 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
    print_board_info();
    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()?;
    let fdo_connection = fdo::DBusProxy::new(&connection)?;
@@ -108,23 +110,32 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
        }
    }
-    let fan_device = if let Ok(res) = FanCurveSet::get_device() {
+    if Profile::is_platform_profile_supported() {
-        Some(res)
+        let profile_config = ProfileConfig::load(PROFILE_CONFIG_PATH.into());
-    } else {
+        match CtrlPlatformProfile::new(profile_config) {
-        None
+            Ok(mut ctrl) => {
-    };
+                ctrl.reload()
-    let profile_config = ProfileConfig::load(PROFILE_CONFIG_PATH.into());
+                    .unwrap_or_else(|err| warn!("Profile control: {}", err));
    match CtrlPlatformProfile::new(profile_config, fan_device) {
        Ok(mut ctrl) => {
            ctrl.reload()
                .unwrap_or_else(|err| warn!("Profile control: {}", err));
-            let tmp = Arc::new(Mutex::new(ctrl));
+                let tmp = Arc::new(Mutex::new(ctrl));
-            ProfileZbus::new(tmp).add_to_server(&mut object_server);
+                ProfileZbus::new(tmp.clone()).add_to_server(&mut object_server);
-        }
+
-        Err(err) => {
+                let task = CtrlProfileTask::new(tmp);
-            error!("Profile control: {}", err);
+                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()) {
@@ -139,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);
@@ -158,39 +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);
        }
    }
    // 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();
            }
        });
    // 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);
        }
@@ -27,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;
@@ -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", "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", "G513IH", "G513QY"]
+board_names = ["GX531", "G512LV", "G712LV", "G712LW", "G513IH", "G513QY", "G713QM"]
 standard = ["Static", "Breathe", "Strobe", "Rainbow", "Pulse"]
 multizone = true
 per_key = false
@@ -96,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"]
@@ -112,7 +120,14 @@ per_key = true
 [[led_data]]
 prod_family = "ROG Zephyrus Duo 15 SE"
-board_name = ["GX551Q"]
+board_names = ["GX551Q"]
-standard ["Static", "Breathe", "Pulse", "Rainbow", "Strobe"]
+standard = ["Static", "Breathe", "Strobe", "Rainbow", "Pulse"]
 multizone = false
-per_key = true
+per_key = true
 [[led_data]]
 prod_family = "ROG Flow X13"
 board_names = ["GV301QH", "GV301QE"]
 standard = ["Static", "Breathe", "Pulse"]
 multizone = false
 per_key = false
@@ -1,6 +1,6 @@
 [package]
 name = "rog_dbus"
-version = "4.0.0"
+version = "4.0.2"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -14,7 +14,6 @@ rog_anime = { path = "../rog-anime" }
 rog_aura = { path = "../rog-aura" }
 rog_profiles = { path = "../rog-profiles" }
 rog_supported = { path = "../rog-supported" }
 supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", tag = "2.0.0" }
 zbus = "^1.9"
 zbus_macros = "^1.9"
 zvariant = "^2.8"
@@ -1,5 +1,4 @@
 pub static DBUS_NAME: &str = "org.asuslinux.Daemon";
 pub static DBUS_NAME_GFX: &str = "org.supergfxctl.Daemon";
 pub static DBUS_PATH: &str = "/org/asuslinux/Daemon";
 pub static DBUS_IFACE: &str = "org.asuslinux.Daemon";
@@ -21,7 +21,10 @@
 use std::sync::mpsc::Sender;
-use rog_profiles::{fan_curve_set::FanCurveSet, Profile};
+use rog_profiles::{
    fan_curve_set::{CurveData, FanCurveSet},
    Profile,
 };
 use zbus::{dbus_proxy, Connection, Result};
 #[dbus_proxy(
@@ -29,29 +32,37 @@ use zbus::{dbus_proxy, Connection, Result};
    default_path = "/org/asuslinux/Profile"
 )]
 trait Daemon {
-    /// Get the active `Profile` data
+    /// Get the fan-curve data for the currently active Profile
-    fn active_fan_curve_data(&self) -> zbus::Result<FanCurveSet>;
+    fn fan_curve_data(&self, profile: Profile) -> zbus::Result<FanCurveSet>;
-    /// Profile, get the active profile
+    /// Fetch the active profile name
    fn active_profile(&self) -> zbus::Result<Profile>;
-    /// Get enabled fan curves
+    /// Get a list of profiles that have fan-curves enabled.
    fn enabled_fan_profiles(&self) -> zbus::Result<Vec<Profile>>;
-    /// Get all fan curve data
+    /// Toggle to next platform_profile. Names provided by `Profiles`.
-    fn fan_curves(&self) -> zbus::Result<Vec<FanCurveSet>>;
+    /// If fan-curves are supported will also activate a fan curve for profile.
    /// NextProfile method
    fn next_profile(&self) -> zbus::Result<()>;
-    /// Profiles method
+    /// Fetch profile names
    fn profiles(&self) -> zbus::Result<Vec<Profile>>;
-    /// Set the specific profile as active
+    /// Set this platform_profile name as active
    fn set_active_profile(&self, profile: Profile) -> zbus::Result<()>;
-    /// Set a fan curve. If a field is empty then the exisiting saved curve is used
+    /// Set a profile fan curve enabled status. Will also activate a fan curve.
-    fn set_fan_curve(&self, curve: FanCurveSet) -> zbus::Result<()>;
+    fn set_fan_curve_enabled(&self, profile: Profile, enabled: bool) -> zbus::Result<()>;
    /// Set the fan curve for the specified profile, or the profile the user is
    /// currently in if profile == None. Will also activate the fan curve.
    fn set_fan_curve(&self, profile: Profile, curve: CurveData) -> zbus::Result<()>;
    /// 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::Result<()>;
    /// NotifyProfile signal
    #[dbus_proxy(signal)]
@@ -72,8 +83,18 @@ impl<'a> ProfileProxy<'a> {
    }
    #[inline]
-    pub fn profiles(&self) -> Result<Vec<Profile>> {
+    pub fn active_profile(&self) -> zbus::Result<Profile> {
-        self.0.profiles()
+        self.0.active_profile()
    }
    #[inline]
    pub fn enabled_fan_profiles(&self) -> zbus::Result<Vec<Profile>> {
        self.0.enabled_fan_profiles()
    }
    #[inline]
    pub fn fan_curve_data(&self, profile: Profile) -> zbus::Result<FanCurveSet> {
        self.0.fan_curve_data(profile)
    }
    #[inline]
@@ -81,6 +102,31 @@ impl<'a> ProfileProxy<'a> {
        self.0.next_profile()
    }
    #[inline]
    pub fn profiles(&self) -> Result<Vec<Profile>> {
        self.0.profiles()
    }
    #[inline]
    pub fn set_active_profile(&self, profile: Profile) -> zbus::Result<()> {
        self.0.set_active_profile(profile)
    }
    #[inline]
    pub fn set_fan_curve_enabled(&self, profile: Profile, enabled: bool) -> zbus::Result<()> {
        self.0.set_fan_curve_enabled(profile, enabled)
    }
    #[inline]
    pub fn set_fan_curve(&self, curve: CurveData, profile: Profile) -> zbus::Result<()> {
        self.0.set_fan_curve(profile, curve)
    }
    #[inline]
    pub fn set_active_curve_to_defaults(&self) -> zbus::Result<()> {
        self.0.set_active_curve_to_defaults()
    }
    #[inline]
    pub fn connect_notify_profile(&self, send: Sender<Profile>) -> zbus::fdo::Result<()> {
        self.0.connect_notify_profile(move |data| {
@@ -1,6 +1,6 @@
 [package]
 name = "rog_profiles"
-version = "1.0.0"
+version = "1.1.2"
 authors = ["Luke D. Jones <luke@ljones.dev>"]
 edition = "2018"
@@ -8,7 +8,11 @@ pub enum ProfileError {
    NotSupported,
    NotFound(String),
    Io(std::io::Error),
-    //Zbus(zbus::Error),
+    ParseProfileName,
    ParseFanCurveDigit(std::num::ParseIntError),
    /// (pwm/temp, prev, next)
    ParseFanCurvePrevHigher(&'static str, u8, u8),
    // Zbus(zbus::Error),
 }
 impl fmt::Display for ProfileError {
@@ -21,7 +25,16 @@ impl fmt::Display for ProfileError {
            ProfileError::NotSupported => write!(f, "Not supported"),
            ProfileError::NotFound(deets) => write!(f, "Not found: {}", deets),
            ProfileError::Io(detail) => write!(f, "std::io error: {}", detail),
-            //Error::Zbus(detail) => write!(f, "Zbus error: {}", detail),
+            ProfileError::ParseProfileName => write!(f, "Invalid profile name"),
            ProfileError::ParseFanCurveDigit(e) => {
                write!(f, "Could not parse number to 0-255: {}", e)
            }
            ProfileError::ParseFanCurvePrevHigher(part, prev, next) => write!(
                f,
                "Invalid {}, previous value {} is higher than next value {}",
                part, prev, next
            ),
            // Error::Zbus(detail) => write!(f, "Zbus error: {}", detail),
        }
    }
 }
@@ -4,24 +4,24 @@ use udev::Device;
 #[cfg(feature = "dbus")]
 use zvariant_derive::Type;
-use crate::{error::ProfileError, write_to_fan, FanCurvePU};
+use crate::{error::ProfileError, FanCurvePU};
-pub fn pwm_str(fan: char, index: char) -> String {
+pub(crate) fn pwm_str(fan: char, index: usize) -> String {
    let mut buf = "pwm1_auto_point1_pwm".to_string();
    unsafe {
        let tmp = buf.as_bytes_mut();
        tmp[3] = fan as u8;
-        tmp[15] = index as u8;
+        tmp[15] = char::from_digit(index as u32 + 1, 10).unwrap() as u8;
    }
    buf
 }
-pub fn temp_str(fan: char, index: char) -> String {
+pub(crate) fn temp_str(fan: char, index: usize) -> String {
    let mut buf = "pwm1_auto_point1_temp".to_string();
    unsafe {
        let tmp = buf.as_bytes_mut();
        tmp[3] = fan as u8;
-        tmp[15] = index as u8;
+        tmp[15] = char::from_digit(index as u32 + 1, 10).unwrap() as u8;
    }
    buf
 }
@@ -29,22 +29,135 @@ pub fn temp_str(fan: char, index: char) -> String {
 #[cfg_attr(feature = "dbus", derive(Type))]
 #[derive(Deserialize, Serialize, Default, Debug, Clone)]
 pub struct CurveData {
-    pub fan: FanCurvePU,
+    pub(crate) fan: FanCurvePU,
-    pub pwm: [u8; 8],
+    pub(crate) pwm: [u8; 8],
-    pub temp: [u8; 8],
+    pub(crate) temp: [u8; 8],
 }
 impl std::str::FromStr for CurveData {
    type Err = ProfileError;
    fn from_str(input: &str) -> Result<Self, Self::Err> {
        let mut temp = [0u8; 8];
        let mut pwm = [0u8; 8];
        let mut temp_prev = 0;
        let mut pwm_prev = 0;
        for (index, value) in input.split(',').enumerate() {
            for (select, num) in value.splitn(2, |c| c == 'c' || c == ':').enumerate() {
                let r = num.trim_matches(|c| c == 'c' || c == ':' || c == '%');
                let r = r.parse::<u8>().map_err(ProfileError::ParseFanCurveDigit)?;
                if select == 0 {
                    if temp_prev > r {
                        return Err(ProfileError::ParseFanCurvePrevHigher(
                            "temperature",
                            temp_prev,
                            r,
                        ));
                    }
                    temp_prev = r;
                    temp[index] = r;
                } else {
                    if pwm_prev > r {
                        return Err(ProfileError::ParseFanCurvePrevHigher(
                            "percentage",
                            pwm_prev,
                            r,
                        ));
                    }
                    pwm_prev = r;
                    pwm[index] = r;
                }
            }
        }
        Ok(Self {
            fan: FanCurvePU::CPU,
            pwm,
            temp,
        })
    }
 }
 impl CurveData {
    pub fn set_fan(&mut self, fan: FanCurvePU) {
        self.fan = fan;
    }
    fn set_val_from_attr(tmp: &str, device: &Device, buf: &mut [u8; 8]) {
        if let Some(n) = tmp.chars().nth(15) {
            let i = n.to_digit(10).unwrap() as usize;
            let d = device.attribute_value(tmp).unwrap();
            let d: u8 = d.to_string_lossy().parse().unwrap();
            buf[i - 1] = d;
        }
    }
    fn read_from_device(&mut self, device: &Device) {
        for attr in device.attributes() {
            let tmp = attr.name().to_string_lossy();
            if tmp.starts_with("pwm1") && tmp.ends_with("_temp") {
                Self::set_val_from_attr(tmp.as_ref(), device, &mut self.temp)
            }
            if tmp.starts_with("pwm1") && tmp.ends_with("_pwm") {
                Self::set_val_from_attr(tmp.as_ref(), device, &mut self.pwm)
            }
        }
    }
    fn init_if_zeroed(&mut self, device: &mut Device) -> std::io::Result<()> {
        if self.pwm == [0u8; 8] && self.temp == [0u8; 8] {
            // Need to reset the device to defaults to get the proper profile defaults
            match self.fan {
                FanCurvePU::CPU => device.set_attribute_value("pwm1_enable", "3")?,
                FanCurvePU::GPU => device.set_attribute_value("pwm2_enable", "3")?,
            };
            self.read_from_device(device);
        }
        Ok(())
    }
    /// Write this curve to the device fan specified by `self.fan`
    fn write_to_device(&self, device: &mut Device, enable: bool) -> std::io::Result<()> {
        let pwm_num = match self.fan {
            FanCurvePU::CPU => '1',
            FanCurvePU::GPU => '2',
        };
        let enable = if enable { "1" } else { "2" };
        for (index, out) in self.pwm.iter().enumerate() {
            let pwm = pwm_str(pwm_num, index);
            device.set_attribute_value(&pwm, &out.to_string())?;
        }
        for (index, out) in self.temp.iter().enumerate() {
            let temp = temp_str(pwm_num, index);
            device.set_attribute_value(&temp, &out.to_string())?;
        }
        // Enable must be done *after* all points are written
        match self.fan {
            FanCurvePU::CPU => device.set_attribute_value("pwm1_enable", enable)?,
            FanCurvePU::GPU => device.set_attribute_value("pwm2_enable", enable)?,
        };
        Ok(())
    }
 }
 /// A `FanCurveSet` contains both CPU and GPU fan curve data
 #[cfg_attr(feature = "dbus", derive(Type))]
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct FanCurveSet {
-    pub cpu: CurveData,
+    pub(crate) enabled: bool,
-    pub gpu: CurveData,
+    pub(crate) cpu: CurveData,
    pub(crate) gpu: CurveData,
 }
 impl Default for FanCurveSet {
    fn default() -> Self {
        Self {
            enabled: false,
            cpu: CurveData {
                fan: FanCurvePU::CPU,
                pwm: [0u8; 8],
@@ -60,80 +173,71 @@ impl Default for FanCurveSet {
 }
 impl FanCurveSet {
-    pub fn get_device() -> Result<Device, ProfileError> {
+    pub(crate) fn read_cpu_from_device(&mut self, device: &Device) {
-        let mut enumerator = udev::Enumerator::new()?;
+        self.cpu.read_from_device(device);
        enumerator.match_subsystem("hwmon")?;
        for device in enumerator.scan_devices().unwrap() {
            if device.parent_with_subsystem("platform").unwrap().is_some() {
                if let Some(name) = device.attribute_value("name") {
                    if name == "asus_custom_fan_curve" {
                        return Ok(device);
                    }
                }
            }
        }
        Err(ProfileError::NotSupported)
    }
-    pub fn is_supported() -> Result<bool, ProfileError> {
+    pub(crate) fn read_gpu_from_device(&mut self, device: &Device) {
-        if Self::get_device().is_ok() {
+        self.gpu.read_from_device(device);
            return Ok(true);
        }
        Ok(false)
    }
-    pub fn new() -> Result<(Self, Device), ProfileError> {
+    pub(crate) fn write_cpu_fan(&mut self, device: &mut Device) -> std::io::Result<()> {
-        if let Ok(device) = Self::get_device() {
+        self.cpu.init_if_zeroed(device)?;
-            let mut fans = Self {
+        self.cpu.write_to_device(device, self.enabled)
                cpu: CurveData::default(),
                gpu: CurveData::default(),
            };
            fans.cpu.fan = FanCurvePU::CPU;
            fans.cpu.fan = FanCurvePU::GPU;
            fans.read_from_device(&device);
            return Ok((fans, device));
        }
        Err(ProfileError::NotSupported)
    }
-    fn set_val_from_attr(tmp: &str, device: &Device, buf: &mut [u8; 8]) {
+    pub(crate) fn write_gpu_fan(&mut self, device: &mut Device) -> std::io::Result<()> {
-        if let Some(n) = tmp.chars().nth(15) {
+        self.gpu.init_if_zeroed(device)?;
-            let i = n.to_digit(10).unwrap() as usize;
+        self.gpu.write_to_device(device, self.enabled)
-            let d = device.attribute_value(tmp).unwrap();
+    }
-            let d: u8 = d.to_string_lossy().parse().unwrap();
+}
-            buf[i - 1] = d;
+
-        }
+#[cfg(test)]
-    }
+mod tests {
-
+    use std::str::FromStr;
-    pub fn read_from_device(&mut self, device: &Device) {
+
-        for attr in device.attributes() {
+    use super::*;
-            let tmp = attr.name().to_string_lossy();
+
-            if tmp.starts_with("pwm1") && tmp.ends_with("_temp") {
+    #[test]
-                Self::set_val_from_attr(tmp.as_ref(), device, &mut self.cpu.temp)
+    fn curve_data_from_str() {
-            }
+        let curve =
-            if tmp.starts_with("pwm1") && tmp.ends_with("_pwm") {
+            CurveData::from_str("30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%")
-                Self::set_val_from_attr(tmp.as_ref(), device, &mut self.cpu.pwm)
+                .unwrap();
-            }
+        assert_eq!(curve.fan, FanCurvePU::CPU);
-            if tmp.starts_with("pwm2") && tmp.ends_with("_temp") {
+        assert_eq!(curve.temp, [30, 49, 59, 69, 79, 89, 99, 109]);
-                Self::set_val_from_attr(tmp.as_ref(), device, &mut self.gpu.temp)
+        assert_eq!(curve.pwm, [1, 2, 3, 4, 31, 49, 56, 58]);
-            }
+    }
-            if tmp.starts_with("pwm2") && tmp.ends_with("_pwm") {
+
-                Self::set_val_from_attr(tmp.as_ref(), device, &mut self.gpu.pwm)
+    #[test]
-            }
+    fn curve_data_from_str_simple() {
-        }
+        let curve = CurveData::from_str("30:1,49:2,59:3,69:4,79:31,89:49,99:56,109:58").unwrap();
-    }
+        assert_eq!(curve.fan, FanCurvePU::CPU);
-
+        assert_eq!(curve.temp, [30, 49, 59, 69, 79, 89, 99, 109]);
-    pub fn write_cpu_fan(&self, device: &mut Device) {
+        assert_eq!(curve.pwm, [1, 2, 3, 4, 31, 49, 56, 58]);
-        write_to_fan(&self.cpu, '1', device);
+    }
-    }
+
-
+    #[test]
-    pub fn write_gpu_fan(&self, device: &mut Device) {
+    fn curve_data_from_str_invalid_pwm() {
-        write_to_fan(&self.gpu, '2', device);
+        let curve =
            CurveData::from_str("30c:4%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%");
        assert!(&curve.is_err());
        assert!(matches!(
            curve,
            Err(ProfileError::ParseFanCurvePrevHigher(_, _, _))
        ));
    }
    #[test]
    fn check_pwm_str() {
        assert_eq!(pwm_str('1', 0), "pwm1_auto_point1_pwm");
        assert_eq!(pwm_str('1', 4), "pwm1_auto_point5_pwm");
        assert_eq!(pwm_str('1', 7), "pwm1_auto_point8_pwm");
    }
    #[test]
    fn check_temp_str() {
        assert_eq!(temp_str('1', 0), "pwm1_auto_point1_temp");
        assert_eq!(temp_str('1', 4), "pwm1_auto_point5_temp");
        assert_eq!(temp_str('1', 7), "pwm1_auto_point8_temp");
    }
 }
@@ -38,7 +38,7 @@ pub fn find_fan_curve_node() -> Result<Option<Device>, ProfileError> {
 }
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Deserialize, Serialize, Debug, Clone, Copy)]
+#[derive(Deserialize, Serialize, Debug, PartialEq, Clone, Copy)]
 pub enum Profile {
    Balanced,
    Performance,
@@ -51,10 +51,7 @@ impl Profile {
    }
    pub fn get_active_profile() -> Result<Profile, ProfileError> {
-        let mut file = OpenOptions::new()
+        let mut file = OpenOptions::new().read(true).open(&PLATFORM_PROFILE)?;
            .read(true)
            .open(&PLATFORM_PROFILE)
            .unwrap_or_else(|_| panic!("{} not found", &PLATFORM_PROFILE));
        let mut buf = String::new();
        file.read_to_string(&mut buf)?;
@@ -62,10 +59,7 @@ impl Profile {
    }
    pub fn get_profile_names() -> Result<Vec<Profile>, ProfileError> {
-        let mut file = OpenOptions::new()
+        let mut file = OpenOptions::new().read(true).open(&PLATFORM_PROFILES)?;
            .read(true)
            .open(&PLATFORM_PROFILES)
            .unwrap_or_else(|_| panic!("{} not found", &PLATFORM_PROFILES));
        let mut buf = String::new();
        file.read_to_string(&mut buf)?;
@@ -73,10 +67,7 @@ impl Profile {
    }
    pub fn set_profile(profile: Profile) -> Result<(), ProfileError> {
-        let mut file = OpenOptions::new()
+        let mut file = OpenOptions::new().write(true).open(PLATFORM_PROFILE)?;
            .write(true)
            .open(PLATFORM_PROFILE)
            .unwrap_or_else(|_| panic!("{} not found", PLATFORM_PROFILE));
        file.write_all(<&str>::from(profile).as_bytes())?;
        Ok(())
@@ -110,8 +101,21 @@ impl From<&str> for Profile {
    }
 }
 impl std::str::FromStr for Profile {
    type Err = ProfileError;
    fn from_str(profile: &str) -> Result<Self, Self::Err> {
        match profile.to_ascii_lowercase().trim() {
            "balanced" => Ok(Profile::Balanced),
            "performance" => Ok(Profile::Performance),
            "quiet" => Ok(Profile::Quiet),
            _ => Err(ProfileError::ParseProfileName),
        }
    }
 }
 #[cfg_attr(feature = "dbus", derive(Type))]
-#[derive(Deserialize, Serialize, Debug, Clone, Copy)]
+#[derive(Deserialize, Serialize, Debug, PartialEq, Clone, Copy)]
 pub enum FanCurvePU {
    CPU,
    GPU,
@@ -126,27 +130,63 @@ impl From<FanCurvePU> for &str {
    }
 }
 impl std::str::FromStr for FanCurvePU {
    type Err = ProfileError;
    fn from_str(fan: &str) -> Result<Self, Self::Err> {
        match fan.to_ascii_lowercase().trim() {
            "cpu" => Ok(FanCurvePU::CPU),
            "gpu" => Ok(FanCurvePU::GPU),
            _ => Err(ProfileError::ParseProfileName),
        }
    }
 }
 impl Default for FanCurvePU {
    fn default() -> Self {
        Self::CPU
    }
 }
-/// Main purpose of `FanCurves` is to enable retoring state on system boot
+/// Main purpose of `FanCurves` is to enable restoring state on system boot
 #[cfg_attr(feature = "dbus", derive(Type))]
 #[derive(Deserialize, Serialize, Debug, Default)]
 pub struct FanCurveProfiles {
    enabled: Vec<Profile>,
    balanced: FanCurveSet,
    performance: FanCurveSet,
    quiet: FanCurveSet,
 }
 impl FanCurveProfiles {
    pub fn get_device() -> Result<Device, ProfileError> {
        let mut enumerator = udev::Enumerator::new()?;
        enumerator.match_subsystem("hwmon")?;
        for device in enumerator.scan_devices()? {
            if device.parent_with_subsystem("platform")?.is_some() {
                if let Some(name) = device.attribute_value("name") {
                    if name == "asus_custom_fan_curve" {
                        return Ok(device);
                    }
                }
            }
        }
        Err(ProfileError::NotSupported)
    }
    pub fn is_supported() -> Result<bool, ProfileError> {
        if Self::get_device().is_ok() {
            return Ok(true);
        }
        Ok(false)
    }
    ///
    pub fn read_from_dev_profile(&mut self, profile: Profile, device: &Device) {
        let mut tmp = FanCurveSet::default();
-        tmp.read_from_device(device);
+        tmp.read_cpu_from_device(device);
        tmp.read_gpu_from_device(device);
        match profile {
            Profile::Balanced => self.balanced = tmp,
            Profile::Performance => self.performance = tmp,
@@ -154,22 +194,69 @@ impl FanCurveProfiles {
        }
    }
-    pub fn write_to_platform(&self, profile: Profile, device: &mut Device) {
+    /// 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.
    pub fn set_active_curve_to_defaults(
        &mut self,
        profile: Profile,
        device: &mut Device,
    ) -> std::io::Result<()> {
        // Do reset
        device.set_attribute_value("pwm1_enable", "3")?;
        device.set_attribute_value("pwm2_enable", "3")?;
        // Then read
        let mut tmp = FanCurveSet::default();
        tmp.read_cpu_from_device(device);
        tmp.read_gpu_from_device(device);
        match profile {
            Profile::Balanced => self.balanced = tmp,
            Profile::Performance => self.performance = tmp,
            Profile::Quiet => self.quiet = tmp,
        }
        Ok(())
    }
    /// Write the curves for the selected profile to the device. If the curve is
    /// in the enabled list it will become active. If the curve is zeroed it will be initialised
    /// to a default read from the system.
    // TODO: Make this return an error if curve is zeroed
    pub fn write_profile_curve_to_platform(
        &mut self,
        profile: Profile,
        device: &mut Device,
    ) -> std::io::Result<()> {
        let fans = match profile {
-            Profile::Balanced => &self.balanced,
+            Profile::Balanced => &mut self.balanced,
-            Profile::Performance => &self.performance,
+            Profile::Performance => &mut self.performance,
-            Profile::Quiet => &self.quiet,
+            Profile::Quiet => &mut self.quiet,
        };
-        fans.write_cpu_fan(device);
+        fans.write_cpu_fan(device)?;
-        fans.write_gpu_fan(device);
+        fans.write_gpu_fan(device)?;
        Ok(())
    }
-    pub fn get_enabled_curve_profiles(&self) -> &[Profile] {
+    pub fn get_enabled_curve_profiles(&self) -> Vec<Profile> {
-        &self.enabled
+        let mut tmp = Vec::new();
        if self.balanced.enabled {
            tmp.push(Profile::Balanced);
        }
        if self.performance.enabled {
            tmp.push(Profile::Performance);
        }
        if self.quiet.enabled {
            tmp.push(Profile::Quiet);
        }
        tmp
    }
-    pub fn set_enabled_curve_profiles(&mut self, profiles: Vec<Profile>) {
+    pub fn set_profile_curve_enabled(&mut self, profile: Profile, enabled: bool) {
-        self.enabled = profiles
+        match profile {
            Profile::Balanced => self.balanced.enabled = enabled,
            Profile::Performance => self.performance.enabled = enabled,
            Profile::Quiet => self.quiet.enabled = enabled,
        }
    }
    pub fn get_all_fan_curves(&self) -> Vec<FanCurveSet> {
@@ -180,11 +267,11 @@ impl FanCurveProfiles {
        ]
    }
-    pub fn get_active_fan_curves(&self) -> &FanCurveSet {
+    pub fn get_active_fan_curves(&self) -> Result<&FanCurveSet, ProfileError> {
-        match Profile::get_active_profile().unwrap() {
+        match Profile::get_active_profile()? {
-            Profile::Balanced => &self.balanced,
+            Profile::Balanced => Ok(&self.balanced),
-            Profile::Performance => &self.performance,
+            Profile::Performance => Ok(&self.performance),
-            Profile::Quiet => &self.quiet,
+            Profile::Quiet => Ok(&self.quiet),
        }
    }
@@ -213,16 +300,7 @@ impl FanCurveProfiles {
        }
    }
-    pub fn write_and_set_fan_curve(
+    pub fn save_fan_curve(&mut self, curve: CurveData, profile: Profile) -> std::io::Result<()> {
        &mut self,
        curve: CurveData,
        profile: Profile,
        device: &mut Device,
    ) {
        match curve.fan {
            FanCurvePU::CPU => write_to_fan(&curve, '1', device),
            FanCurvePU::GPU => write_to_fan(&curve, '2', device),
        }
        match profile {
            Profile::Balanced => match curve.fan {
                FanCurvePU::CPU => self.balanced.cpu = curve,
@@ -237,36 +315,6 @@ impl FanCurveProfiles {
                FanCurvePU::GPU => self.quiet.gpu = curve,
            },
        }
-    }
+        Ok(())
 }
 pub fn write_to_fan(curve: &CurveData, pwm_num: char, device: &mut Device) {
    let mut pwm = "pwmN_auto_pointN_pwm".to_string();
    dbg!(&device);
    for (index, out) in curve.pwm.iter().enumerate() {
        unsafe {
            let buf = pwm.as_bytes_mut();
            buf[3] = pwm_num as u8;
            // Should be quite safe to unwrap as we're not going over 8
            buf[15] = char::from_digit(index as u32 + 1, 10).unwrap() as u8;
        }
        let out = out.to_string();
        dbg!(&pwm);
        dbg!(&out);
        device.set_attribute_value(&pwm, &out).unwrap();
    }
    let mut pwm = "pwmN_auto_pointN_temp".to_string();
    for (index, out) in curve.temp.iter().enumerate() {
        unsafe {
            let buf = pwm.as_bytes_mut();
            buf[3] = pwm_num as u8;
            // Should be quite safe to unwrap as we're not going over 8
            buf[15] = char::from_digit(index as u32 + 1, 10).unwrap() as u8;
        }
        let out = out.to_string();
        device.set_attribute_value(&pwm, &out).unwrap();
    }
 }
Author	SHA1	Message	Date
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