Merge branch 'main' into 'main'

Add G533QS to supported models

See merge request asus-linux/asusctl!81

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

Cargo.lock

@@ -45,7 +45,7 @@ dependencies = [
 
 [[package]]
 name = "asusctl"
-version = "4.0.2"
+version = "4.0.3"
 dependencies = [
  "daemon",
  "gif",
@@ -210,7 +210,7 @@ dependencies = [
 
 [[package]]
 name = "daemon"
-version = "4.0.2"
+version = "4.0.3"
 dependencies = [
  "env_logger",
  "log",
@@ -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",

asus-notify/Cargo.toml

@@ -19,4 +19,4 @@ supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", tag = "2.
 [dependencies.notify-rust]
 version = "^4.3"
 default-features = false
-features = ["z"]
+features = ["z"]

asusctl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "asusctl"
-version = "4.0.2"
+version = "4.0.3"
 authors = ["Luke D Jones <luke@ljones.dev>"]
 edition = "2018"
 
@@ -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"
+gif = "^0.11.2"

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);

daemon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daemon"
-version = "4.0.2"
+version = "4.0.3"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]

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.

data/asusd-ledmodes.toml

@@ -42,7 +42,7 @@ 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
@@ -123,4 +123,11 @@ prod_family = "ROG Zephyrus Duo 15 SE"
 board_names = ["GX551Q"]
 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