From b525411fd3ea9d1882e3370d9704643af620c634 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Mon, 25 Dec 2023 21:22:35 +1300 Subject: [PATCH] Minor fixes in asusctl --- CHANGELOG.md | 3 +++ Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 2 +- asusctl/src/main.rs | 4 ++-- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c5b5700..306d0ab4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v5.0.5] +- Resync. A release was made that was missing some commits. + ## [v5.0.4] ### Changed - Added G834JZ led config diff --git a/Cargo.lock b/Cargo.lock index 86099894..be98c85b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "5.0.4" +version = "5.0.5" dependencies = [ "asusd", "cargo-husky", @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "asusd" -version = "5.0.4" +version = "5.0.5" dependencies = [ "async-trait", "cargo-husky", @@ -228,7 +228,7 @@ dependencies = [ "config-traits", "dmi_id", "env_logger", - "futures-lite 2.1.0", + "futures-lite 1.13.0", "log", "logind-zbus", "rog_anime", @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "5.0.4" +version = "5.0.5" dependencies = [ "cargo-husky", "config-traits", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "5.0.4" +version = "5.0.5" dependencies = [ "cargo-husky", "log", @@ -952,7 +952,7 @@ dependencies = [ [[package]] name = "cpuctl" -version = "5.0.4" +version = "5.0.5" [[package]] name = "cpufeatures" @@ -1079,7 +1079,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "5.0.4" +version = "5.0.5" dependencies = [ "log", "udev", @@ -2946,7 +2946,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rog-control-center" -version = "5.0.4" +version = "5.0.5" dependencies = [ "asusd", "cargo-husky", @@ -2980,7 +2980,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "5.0.4" +version = "5.0.5" dependencies = [ "cargo-husky", "dmi_id", @@ -2997,7 +2997,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "5.0.4" +version = "5.0.5" dependencies = [ "cargo-husky", "dmi_id", @@ -3011,7 +3011,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "5.0.4" +version = "5.0.5" dependencies = [ "asusd", "cargo-husky", @@ -3024,7 +3024,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "5.0.4" +version = "5.0.5" dependencies = [ "cargo-husky", "concat-idents", @@ -3041,7 +3041,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "5.0.4" +version = "5.0.5" dependencies = [ "cargo-husky", "log", @@ -3055,7 +3055,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "5.0.4" +version = "5.0.5" dependencies = [ "glam", "log", diff --git a/Cargo.toml b/Cargo.toml index b2a9cfc3..cfa9e8e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["asusctl", "asusd", "asusd-user", "cpuctl", "rog-control-cent resolver = "2" [workspace.package] -version = "5.0.4" +version = "5.0.5" [workspace.dependencies] async-trait = "^0.1" diff --git a/asusctl/src/main.rs b/asusctl/src/main.rs index ec194167..4462f004 100644 --- a/asusctl/src/main.rs +++ b/asusctl/src/main.rs @@ -132,9 +132,9 @@ fn do_parsed( println!("{}", CliStart::usage()); println!(); if let Some(cmdlist) = CliStart::command_list() { + let dev_type = dbus.proxies().aura().device_type()?; let commands: Vec = cmdlist.lines().map(|s| s.to_owned()).collect(); for command in commands.iter().filter(|command| { - let dev_type = dbus.proxies().aura().device_type().unwrap(); if !dev_type.is_old_style() && !dev_type.is_tuf_style() && command.trim().starts_with("led-pow-1") @@ -420,8 +420,8 @@ fn handle_led_mode( if let Some(cmdlist) = LedModeCommand::command_list() { let commands: Vec = cmdlist.lines().map(|s| s.to_owned()).collect(); + let modes = dbus.proxies().aura().supported_basic_modes()?; for command in commands.iter().filter(|command| { - let modes = dbus.proxies().aura().supported_basic_modes().unwrap(); for mode in &modes { if command .trim()