diff --git a/CHANGELOG.md b/CHANGELOG.md index cc28cce7..14ea96dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v6.0.2] + +### Changed + +- Clean up code +- Don't panic if no aura device in ROGCC +- Try to prevent an errorenous tuf keyboard detection + ## [v6.0.1] ### Added diff --git a/Cargo.lock b/Cargo.lock index 8de8cafa..09cacb59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,7 +117,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "6.0.1" +version = "6.0.2" dependencies = [ "asusd", "cargo-husky", @@ -135,14 +135,14 @@ dependencies = [ [[package]] name = "asusd" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "concat-idents", "config-traits", "dmi_id", "env_logger", - "futures-lite 1.13.0", + "futures-lite 2.3.0", "inotify", "log", "logind-zbus", @@ -161,7 +161,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "config-traits", @@ -365,7 +365,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -400,7 +400,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -418,7 +418,7 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -492,7 +492,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn 2.0.61", "which", ] @@ -604,7 +604,7 @@ checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -814,7 +814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -828,7 +828,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "log", @@ -839,7 +839,7 @@ dependencies = [ [[package]] name = "const-field-offset" version = "0.1.5" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "const-field-offset-macro", "field-offset", @@ -848,11 +848,11 @@ dependencies = [ [[package]] name = "const-field-offset-macro" version = "0.1.5" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -934,7 +934,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpuctl" -version = "6.0.1" +version = "6.0.2" [[package]] name = "cpufeatures" @@ -1063,7 +1063,7 @@ checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1134,7 +1134,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "6.0.1" +version = "6.0.2" dependencies = [ "log", "udev 0.8.0", @@ -1228,7 +1228,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1497,7 +1497,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -1841,7 +1841,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "i-slint-backend-linuxkms" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "calloop", "drm", @@ -1861,7 +1861,7 @@ dependencies = [ [[package]] name = "i-slint-backend-selector" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "cfg-if", "i-slint-backend-linuxkms", @@ -1873,7 +1873,7 @@ dependencies = [ [[package]] name = "i-slint-backend-winit" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "cfg-if", "cfg_aliases 0.2.0", @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "i-slint-common" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "cfg-if", "derive_more", @@ -1914,7 +1914,7 @@ dependencies = [ [[package]] name = "i-slint-compiler" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "by_address", "codemap", @@ -1943,7 +1943,7 @@ dependencies = [ [[package]] name = "i-slint-core" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "auto_enums", "bitflags 2.5.0", @@ -1986,16 +1986,16 @@ dependencies = [ [[package]] name = "i-slint-core-macros" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] name = "i-slint-renderer-femtovg" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "cfg-if", "const-field-offset", @@ -2026,7 +2026,7 @@ dependencies = [ [[package]] name = "i-slint-renderer-skia" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "bytemuck", "cfg-if", @@ -2781,7 +2781,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -2939,9 +2939,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -2972,7 +2972,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -3093,12 +3093,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -3112,9 +3112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -3309,7 +3309,7 @@ dependencies = [ [[package]] name = "rog-control-center" -version = "6.0.1" +version = "6.0.2" dependencies = [ "asusd", "betrayer", @@ -3341,7 +3341,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "dmi_id", @@ -3358,7 +3358,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "dmi_id", @@ -3372,7 +3372,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "6.0.1" +version = "6.0.2" dependencies = [ "asusd", "cargo-husky", @@ -3386,7 +3386,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "concat-idents", @@ -3401,7 +3401,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "log", @@ -3415,7 +3415,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "6.0.1" +version = "6.0.2" dependencies = [ "log", "rog_anime", @@ -3425,7 +3425,7 @@ dependencies = [ [[package]] name = "rog_slash" -version = "6.0.1" +version = "6.0.2" dependencies = [ "cargo-husky", "dmi_id", @@ -3478,9 +3478,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3526,9 +3526,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "rustybuzz" @@ -3548,9 +3548,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3617,35 +3617,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3660,7 +3660,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -3760,7 +3760,7 @@ dependencies = [ [[package]] name = "slint" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "const-field-offset", "i-slint-backend-selector", @@ -3776,7 +3776,7 @@ dependencies = [ [[package]] name = "slint-build" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "i-slint-compiler", "spin_on", @@ -3787,7 +3787,7 @@ dependencies = [ [[package]] name = "slint-macros" version = "1.6.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "i-slint-compiler", "proc-macro2", @@ -3977,7 +3977,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -3997,9 +3997,9 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f" +checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c" dependencies = [ "kurbo", "siphasher", @@ -4018,9 +4018,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -4083,22 +4083,22 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4196,7 +4196,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4263,7 +4263,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4306,7 +4306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a615d6c2764852a2e88a4f16e9ce1ea49bb776b5872956309e170d63a042a34f" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4496,7 +4496,7 @@ dependencies = [ [[package]] name = "vtable" version = "0.2.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "const-field-offset", "portable-atomic", @@ -4507,11 +4507,11 @@ dependencies = [ [[package]] name = "vtable-macro" version = "0.2.0" -source = "git+https://github.com/slint-ui/slint.git#2e3b00e38ee7214b632e19d0a1a96e7a9f787318" +source = "git+https://github.com/slint-ui/slint.git#c0b79024cc6d064f9e94695d63a18ae490add2d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4557,7 +4557,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", "wasm-bindgen-shared", ] @@ -4591,7 +4591,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4868,7 +4868,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -4879,7 +4879,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] @@ -5302,22 +5302,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.33" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.61", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 760bb168..d24e519b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ default-members = [ resolver = "2" [workspace.package] -version = "6.0.1" +version = "6.0.2" rust-version = "1.77" license = "MPL-2.0" readme = "README.md" diff --git a/README.md b/README.md index 12fcab88..e2839703 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ Now includes a GUI, `rog-control-center`. ## Kernel support -**The minimum supported kernel version is 6.10**, which will contain the patches from [here](https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/). Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t) +**The minimum supported kernel version is 6.10**, which will contain the patches from [here](https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/). This is especially required for 2023+ devices and possibly some lat 2022 devices. + +Z13 devices will need [these](https://lore.kernel.org/linux-input/20240416090402.31057-1-luke@ljones.dev/T/#t) ## Goals @@ -31,7 +33,7 @@ See the [rog-aura readme](./rog-aura/README.md) for more details. ## Discord -[Discord server link](https://discord.gg/z8y99XqPb7) +[![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/z8y99XqPb7) ## SUPPORTED LAPTOPS diff --git a/asusd/src/ctrl_anime/mod.rs b/asusd/src/ctrl_anime/mod.rs index 4dc98ee5..d231cf81 100644 --- a/asusd/src/ctrl_anime/mod.rs +++ b/asusd/src/ctrl_anime/mod.rs @@ -8,6 +8,7 @@ use std::sync::Arc; use std::thread::sleep; use ::zbus::export::futures_util::lock::Mutex; +use config_traits::{StdConfig, StdConfigLoad2}; use log::{error, info, warn}; use rog_anime::error::AnimeError; use rog_anime::usb::{ @@ -62,7 +63,7 @@ pub struct CtrlAnime { impl CtrlAnime { #[inline] - pub fn new(config: AnimeConfig) -> Result { + pub fn new() -> Result { let usb = USBRaw::new(0x193b).ok(); let hid = HidRaw::new("193b").ok(); let node = if usb.is_some() { @@ -89,6 +90,7 @@ impl CtrlAnime { // } // } + let config = AnimeConfig::new().load(); let mut anime_type = get_anime_type()?; if let AnimeType::Unknown = anime_type { if let Some(model) = config.model_override { diff --git a/asusd/src/ctrl_aura/controller.rs b/asusd/src/ctrl_aura/controller.rs index 6a90e57b..2fd71cd5 100644 --- a/asusd/src/ctrl_aura/controller.rs +++ b/asusd/src/ctrl_aura/controller.rs @@ -121,12 +121,12 @@ impl CtrlKbdLed { } // Check for a TUF laptop LED. Assume there is only ever one. - if let Ok(tuf_kbd) = KeyboardLed::new() { - if tuf_kbd.has_kbd_rgb_mode() { + if let Ok(kbd_backlight) = KeyboardLed::new() { + if kbd_backlight.has_kbd_rgb_mode() { info!("AuraControl found a TUF laptop keyboard"); let ctrl = CtrlKbdLed { led_type: AuraDeviceType::LaptopTuf, - led_node: LEDNode::KbdLed(tuf_kbd), + led_node: LEDNode::KbdLed(kbd_backlight), supported_data: LedSupportData::get_data("tuf"), per_key_mode_active: false, config: Self::init_config("tuf"), diff --git a/asusd/src/ctrl_platform.rs b/asusd/src/ctrl_platform.rs index 93f1995c..173e7192 100644 --- a/asusd/src/ctrl_platform.rs +++ b/asusd/src/ctrl_platform.rs @@ -720,6 +720,7 @@ impl crate::ZbusRun for CtrlPlatform { impl ReloadAndNotify for CtrlPlatform { type Data = Config; + /// Called on config file changed externally async fn reload_and_notify( &mut self, signal_context: &SignalContext<'static>, diff --git a/asusd/src/ctrl_slash/mod.rs b/asusd/src/ctrl_slash/mod.rs index c7d1846e..52ac85de 100644 --- a/asusd/src/ctrl_slash/mod.rs +++ b/asusd/src/ctrl_slash/mod.rs @@ -1,6 +1,7 @@ pub mod config; pub mod trait_impls; +use config_traits::{StdConfig, StdConfigLoad}; use rog_platform::hid_raw::HidRaw; use rog_platform::usb_raw::USBRaw; use rog_slash::error::SlashError; @@ -31,19 +32,13 @@ impl Node { } pub struct CtrlSlash { - // node: HidRaw, node: Node, config: SlashConfig, - // slash_type: SlashType, - // // set to force thread to exit - // thread_exit: Arc, - // // Set to false when the thread exits - // thread_running: Arc, } impl CtrlSlash { #[inline] - pub fn new(config: SlashConfig) -> Result { + pub fn new() -> Result { let slash_type = get_slash_type()?; if matches!(slash_type, SlashType::Unknown | SlashType::Unsupported) { return Err(RogError::Slash(SlashError::NoDevice)); @@ -61,10 +56,7 @@ impl CtrlSlash { let ctrl = CtrlSlash { node, - config, - // slash_type, - // thread_exit: Arc::new(AtomicBool::new(false)), - // thread_running: Arc::new(AtomicBool::new(false)), + config: SlashConfig::new().load(), }; ctrl.do_initialization()?; diff --git a/asusd/src/daemon.rs b/asusd/src/daemon.rs index e1833363..973e728e 100644 --- a/asusd/src/daemon.rs +++ b/asusd/src/daemon.rs @@ -5,17 +5,15 @@ use std::sync::Arc; use ::zbus::export::futures_util::lock::Mutex; use ::zbus::Connection; use asusd::config::Config; -use asusd::ctrl_anime::config::AnimeConfig; use asusd::ctrl_anime::trait_impls::CtrlAnimeZbus; use asusd::ctrl_anime::CtrlAnime; use asusd::ctrl_aura::manager::AuraManager; use asusd::ctrl_fancurves::CtrlFanCurveZbus; use asusd::ctrl_platform::CtrlPlatform; -use asusd::ctrl_slash::config::SlashConfig; use asusd::ctrl_slash::trait_impls::CtrlSlashZbus; use asusd::ctrl_slash::CtrlSlash; use asusd::{print_board_info, start_tasks, CtrlTask, DBUS_NAME}; -use config_traits::{StdConfig, StdConfigLoad, StdConfigLoad2, StdConfigLoad3}; +use config_traits::{StdConfig, StdConfigLoad3}; use log::{error, info}; use zbus::fdo::ObjectManager; @@ -98,7 +96,7 @@ async fn start_daemon() -> Result<(), Box> { } } - match CtrlAnime::new(AnimeConfig::new().load()) { + match CtrlAnime::new() { Ok(ctrl) => { let zbus = CtrlAnimeZbus(Arc::new(Mutex::new(ctrl))); let sig_ctx = CtrlAnimeZbus::signal_context(&connection)?; @@ -109,7 +107,7 @@ async fn start_daemon() -> Result<(), Box> { } } - match CtrlSlash::new(SlashConfig::new().load()) { + match CtrlSlash::new() { Ok(ctrl) => { let zbus = CtrlSlashZbus(Arc::new(Mutex::new(ctrl))); // Currently, the Slash has no need for a loop watching power events, however, diff --git a/rog-control-center/src/tray.rs b/rog-control-center/src/tray.rs index 312300f7..7db94797 100644 --- a/rog-control-center/src/tray.rs +++ b/rog-control-center/src/tray.rs @@ -136,7 +136,11 @@ pub fn init_tray(_supported_properties: Vec, config: Arc, config: Arc>) { let handle = ui.as_weak(); tokio::spawn(async move { - let aura = find_aura_iface().await.unwrap(); + let aura = if let Ok(aura) = find_aura_iface().await { + aura + } else { + info!("This device appears to have no aura interfaces"); + return; + }; set_ui_props_async!(handle, aura, AuraPageData, brightness); set_ui_props_async!(handle, aura, AuraPageData, led_mode); diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 72fb5e92..1b6c45f4 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-05-06 11:00+0000\n" +"POT-Creation-Date: 2024-05-08 04:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"