diff --git a/CHANGELOG.md b/CHANGELOG.md index c86fb429..ad647578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +# [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 diff --git a/Cargo.lock b/Cargo.lock index ef85f43a..29a9552c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,7 +45,7 @@ dependencies = [ [[package]] name = "asusctl" -version = "4.0.2" +version = "4.0.3" dependencies = [ "daemon", "gif", @@ -1071,8 +1071,7 @@ dependencies = [ [[package]] name = "supergfxctl" -version = "2.0.0" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git?tag=2.0.0#3f040cd3ec334242631122cd038aa361cc860be6" +version = "2.0.2" dependencies = [ "log", "logind-zbus", diff --git a/asus-notify/Cargo.toml b/asus-notify/Cargo.toml index 5bb57b2c..db0efa04 100644 --- a/asus-notify/Cargo.toml +++ b/asus-notify/Cargo.toml @@ -14,9 +14,9 @@ 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" } +supergfxctl = { path = "../../supergfxctl" } [dependencies.notify-rust] version = "^4.3" default-features = false -features = ["z"] \ No newline at end of file +features = ["z"] diff --git a/asusctl/Cargo.toml b/asusctl/Cargo.toml index 3554d917..2136572a 100644 --- a/asusctl/Cargo.toml +++ b/asusctl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "asusctl" -version = "4.0.2" +version = "4.0.3" authors = ["Luke D Jones "] 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" } +supergfxctl = { path = "../../supergfxctl" } toml = "^0.5.8" sysfs-class = "^0.1.2" @@ -24,4 +24,4 @@ sysfs-class = "^0.1.2" tinybmp = "^0.2.3" glam = "0.14.0" rog_dbus = { path = "../rog-dbus" } -gif = "^0.11.2" \ No newline at end of file +gif = "^0.11.2" diff --git a/asusctl/src/main.rs b/asusctl/src/main.rs index 68610896..9ff1ebd8 100644 --- a/asusctl/src/main.rs +++ b/asusctl/src/main.rs @@ -451,7 +451,7 @@ fn handle_fan_curve( std::process::exit(1); } - if cmd.enabled.is_some() || cmd.fan.is_some() || cmd.data.is_some() && cmd.mod_profile.is_none() + 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); diff --git a/daemon/src/ctrl_profiles/controller.rs b/daemon/src/ctrl_profiles/controller.rs index be8b968f..569ff8d4 100644 --- a/daemon/src/ctrl_profiles/controller.rs +++ b/daemon/src/ctrl_profiles/controller.rs @@ -33,7 +33,7 @@ https://lkml.org/lkml/2021/8/18/1022 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. diff --git a/rog-dbus/Cargo.toml b/rog-dbus/Cargo.toml index 9a8fbe12..db82e8a2 100644 --- a/rog-dbus/Cargo.toml +++ b/rog-dbus/Cargo.toml @@ -14,7 +14,7 @@ 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" } +supergfxctl = { path = "../../supergfxctl" } zbus = "^1.9" zbus_macros = "^1.9" zvariant = "^2.8"