Merge branch 'fluke/profiles' into 'main'

Fluke/profiles

See merge request asus-linux/asusctl!71

CHANGELOG.md

@@ -5,9 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+# [3.7.2] - 2021-08-02
+### Added
+- Enable multizone support on Strix 513IH
+- Add G513QY ledmodes
 ### Changed
 - Fix missing CLI command help for some supported options
 - Fix incorrectly selecting profile by name, where the active profile was being copied to the selected profile
+- Add `asusd` version back to `asusctl -v` report
+- Fix various clippy warnings
 
 # [3.7.1] - 2021-06-11
 ### Changed

Cargo.lock

@@ -43,8 +43,9 @@ dependencies = [
 
 [[package]]
 name = "asusctl"
-version = "3.5.0"
+version = "3.5.1"
 dependencies = [
+ "daemon",
  "gif",
  "glam",
  "gumdrop",
@@ -206,7 +207,7 @@ dependencies = [
 
 [[package]]
 name = "daemon"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "env_logger",
  "log",
@@ -918,7 +919,7 @@ dependencies = [
 
 [[package]]
 name = "rog_dbus"
-version = "3.5.0"
+version = "3.5.1"
 dependencies = [
  "rog_anime",
  "rog_aura",
@@ -940,7 +941,7 @@ dependencies = [
 
 [[package]]
 name = "rog_profiles"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "intel-pstate",
  "rog_fan_curve",

asusctl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "asusctl"
-version = "3.5.0"
+version = "3.5.1"
 authors = ["Luke D Jones <luke@ljones.dev>"]
 edition = "2018"
 
@@ -12,6 +12,7 @@ rog_aura = { path = "../rog-aura" }
 rog_dbus = { path = "../rog-dbus" }
 rog_profiles = { path = "../rog-profiles" }
 rog_types = { path = "../rog-types" }
+daemon = { path = "../daemon" }
 rog_fan_curve = { version = "^0.1", features = ["serde"] }
 gumdrop = "^0.8"
 yansi-term = "^0.1"

asusctl/src/aura_cli.rs

@@ -124,6 +124,8 @@ pub struct MultiColourSpeed {
 /// Byte value for setting the built-in mode.
 ///
 /// Enum corresponds to the required integer value
+///
+// NOTE: The option names here must match those in rog-aura crate
 #[derive(Options)]
 pub enum SetAuraBuiltin {
     #[options(help = "set a single static colour")]
@@ -135,7 +137,7 @@ pub enum SetAuraBuiltin {
     #[options(help = "rainbow cycling in one of four directions")]
     Rainbow(SingleSpeedDirection),
     #[options(help = "rain pattern mimicking raindrops")]
-    Star(TwoColourSpeed),
+    Stars(TwoColourSpeed),
     #[options(help = "rain pattern of three preset colours")]
     Rain(SingleSpeed),
     #[options(help = "pressed keys are highlighted to fade")]
@@ -233,7 +235,7 @@ impl From<&SetAuraBuiltin> for AuraEffect {
                 data.mode = AuraModeNum::Rainbow;
                 data
             }
-            SetAuraBuiltin::Star(x) => {
+            SetAuraBuiltin::Stars(x) => {
                 let mut data: AuraEffect = x.into();
                 data.mode = AuraModeNum::Star;
                 data

asusctl/src/main.rs

@@ -133,9 +133,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let supported = dbus.proxies().supported().get_supported_functions()?;
 
     if parsed.version {
-        println!("  asusctl v{}", env!("CARGO_PKG_VERSION"));
+        println!("\nApp and daemon versions:");
-        println!(" rog-dbus v{}", rog_dbus::VERSION);
+        println!("     asusctl v{}", env!("CARGO_PKG_VERSION"));
-        println!("rog-types v{}", rog_types::VERSION);
+        println!("       asusd v{}", daemon::VERSION);
+        println!("\nComponent crate versions:");
+        println!("   rog-anime v{}", rog_anime::VERSION);
+        println!("    rog-aura v{}", rog_aura::VERSION);
+        println!("    rog-dbus v{}", rog_dbus::VERSION);
+        println!("rog-profiles v{}", rog_profiles::VERSION);
+        println!("   rog-types v{}", rog_types::VERSION);
         return Ok(());
     }
 

daemon/Cargo.toml

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

rog-anime/src/sequencer.rs

@@ -64,7 +64,7 @@ impl ActionData {
                 time: duration,
                 brightness,
             } => ActionData::Animation(AnimeGif::create_diagonal_gif(
-                &file,
+                file,
                 *duration,
                 *brightness,
             )?),
@@ -79,7 +79,7 @@ impl ActionData {
                 if let Some(ext) = file.extension() {
                     if ext.to_string_lossy().to_lowercase() == "png" {
                         return Ok(ActionData::Animation(AnimeGif::create_png_static(
-                            &file,
+                            file,
                             *scale,
                             *angle,
                             *translation,
@@ -89,7 +89,7 @@ impl ActionData {
                     }
                 }
                 ActionData::Animation(AnimeGif::create_png_gif(
-                    &file,
+                    file,
                     *scale,
                     *angle,
                     *translation,
@@ -107,7 +107,7 @@ impl ActionData {
             } => {
                 if let Some(time) = time {
                     return Ok(ActionData::Animation(AnimeGif::create_png_static(
-                        &file,
+                        file,
                         *scale,
                         *angle,
                         *translation,
@@ -116,7 +116,7 @@ impl ActionData {
                     )?));
                 }
                 // If no time then create a plain static image
-                let image = AnimeImage::from_png(&file, *scale, *angle, *translation, *brightness)?;
+                let image = AnimeImage::from_png(file, *scale, *angle, *translation, *brightness)?;
                 let data = <AnimeDataBuffer>::from(&image);
                 ActionData::Image(Box::new(data))
             }
@@ -157,7 +157,7 @@ impl Sequences {
 
     pub fn iter(&self) -> ActionIterator {
         ActionIterator {
-            actions: &self,
+            actions: self,
             next_idx: 0,
         }
     }

rog-dbus/Cargo.toml

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

rog-dbus/src/zbus_anime.rs

@@ -37,7 +37,7 @@ pub struct AnimeProxy<'a>(DaemonProxy<'a>);
 impl<'a> AnimeProxy<'a> {
     #[inline]
     pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(AnimeProxy(DaemonProxy::new(&conn)?))
+        Ok(AnimeProxy(DaemonProxy::new(conn)?))
     }
 
     #[inline]

rog-dbus/src/zbus_charge.rs

@@ -44,7 +44,7 @@ pub struct ChargeProxy<'a>(DaemonProxy<'a>);
 impl<'a> ChargeProxy<'a> {
     #[inline]
     pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(ChargeProxy(DaemonProxy::new(&conn)?))
+        Ok(ChargeProxy(DaemonProxy::new(conn)?))
     }
 
     #[inline]

rog-dbus/src/zbus_gfx.rs

@@ -52,7 +52,7 @@ pub struct GfxProxy<'a>(DaemonProxy<'a>);
 impl<'a> GfxProxy<'a> {
     #[inline]
     pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(GfxProxy(DaemonProxy::new(&conn)?))
+        Ok(GfxProxy(DaemonProxy::new(conn)?))
     }
 
     #[inline]

rog-dbus/src/zbus_led.rs

@@ -81,7 +81,7 @@ pub struct LedProxy<'a>(DaemonProxy<'a>);
 impl<'a> LedProxy<'a> {
     #[inline]
     pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(LedProxy(DaemonProxy::new(&conn)?))
+        Ok(LedProxy(DaemonProxy::new(conn)?))
     }
 
     #[inline]

rog-dbus/src/zbus_profile.rs

@@ -60,7 +60,7 @@ pub struct ProfileProxy<'a>(DaemonProxy<'a>);
 impl<'a> ProfileProxy<'a> {
     #[inline]
     pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(ProfileProxy(DaemonProxy::new(&conn)?))
+        Ok(ProfileProxy(DaemonProxy::new(conn)?))
     }
 
     #[inline]

rog-dbus/src/zbus_rogbios.rs

@@ -54,7 +54,7 @@ pub struct RogBiosProxy<'a>(DaemonProxy<'a>);
 impl<'a> RogBiosProxy<'a> {
     #[inline]
     pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(RogBiosProxy(DaemonProxy::new(&conn)?))
+        Ok(RogBiosProxy(DaemonProxy::new(conn)?))
     }
 
     #[inline]

rog-dbus/src/zbus_supported.rs

@@ -36,7 +36,7 @@ pub struct SupportProxy<'a>(DaemonProxy<'a>);
 impl<'a> SupportProxy<'a> {
     #[inline]
     pub fn new(conn: &Connection) -> Result<Self> {
-        Ok(SupportProxy(DaemonProxy::new(&conn)?))
+        Ok(SupportProxy(DaemonProxy::new(conn)?))
     }
 
     #[inline]

rog-profiles/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rog_profiles"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Luke D. Jones <luke@ljones.dev>"]
 edition = "2018"