diff --git a/CHANGELOG.md b/CHANGELOG.md index d630e66e..5129e16a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file. 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] +## [Unreleased 4.1.0] ### Changed -- Huge refactor to use zbus 2.2 + zvariant 3.0 +- Huge refactor to use zbus 2.2 + zvariant 3.0 in system-daemon. More work required. - Fixes to fan-curve settings from CLI (Author: Armas Span) ### Added - Support for GA402R LED modes diff --git a/Cargo.lock b/Cargo.lock index 56cf71fb..6ecb94d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,7 +47,7 @@ dependencies = [ "sysfs-class", "tinybmp", "toml", - "zbus 1.9.2", + "zbus 2.2.0", ] [[package]] @@ -160,6 +160,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "az" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f771a5d1f5503f7f4279a30f3643d3421ba149848b89ecaaec0ea2acf04a5ac4" + [[package]] name = "bitflags" version = "1.2.1" @@ -213,7 +219,7 @@ dependencies = [ [[package]] name = "daemon" -version = "4.0.7" +version = "4.1.0" dependencies = [ "async-executor", "async-trait", @@ -266,9 +272,9 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ "dirs-sys", ] @@ -311,6 +317,29 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" +[[package]] +name = "embedded-graphics" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "750082c65094fbcc4baf9ba31583ce9a8bb7f52cadfb96f6164b1bc7f922f32b" +dependencies = [ + "az", + "byteorder", + "embedded-graphics-core", + "float-cmp", + "micromath", +] + +[[package]] +name = "embedded-graphics-core" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8b1239db5f3eeb7e33e35bd10bd014e7b2537b17e071f726a09351431337cfa" +dependencies = [ + "az", + "byteorder", +] + [[package]] name = "enumflags2" version = "0.6.4" @@ -355,9 +384,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", @@ -381,6 +410,15 @@ dependencies = [ "instant", ] +[[package]] +name = "float-cmp" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +dependencies = [ + "num-traits", +] + [[package]] name = "futures" version = "0.3.21" @@ -509,9 +547,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.14.0" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333928d5eb103c5d4050533cec0384302db6be8ef7d3cebd30ec6a35350353da" +checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f" dependencies = [ "serde", ] @@ -605,9 +643,9 @@ dependencies = [ [[package]] name = "libusb1-sys" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22e89d08bbe6816c6c5d446203b859eba35b8fa94bf1b7edb2f6d25d43f023f" +checksum = "6dfab089105aa85a3b492b421bd90d55e6257f00f8447cc3873c44f8206809ce" dependencies = [ "cc", "libc", @@ -636,16 +674,13 @@ dependencies = [ [[package]] name = "logind-zbus" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2833a7dee801395cc0b5fdc9f42b8777952d339437e6905b19860962f004d" +checksum = "c03958f20018a20963daf0c16ada4f271ae2da3e0017fb40caa8b0e3dc5b0226" dependencies = [ "serde", - "serde_json", "zbus 2.2.0", - "zbus_macros 2.2.0", "zvariant 3.2.1", - "zvariant_derive 3.2.1", ] [[package]] @@ -685,6 +720,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "micromath" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc4010833aea396656c2f91ee704d51a6f1329ec2ab56ffd00bfd56f7481ea94" + [[package]] name = "miniz_oxide" version = "0.4.4" @@ -733,9 +774,9 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" dependencies = [ "memchr", "version_check", @@ -755,6 +796,15 @@ dependencies = [ "zvariant_derive 3.2.1", ] +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + [[package]] name = "num_cpus" version = "1.13.1" @@ -1024,7 +1074,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "1.3.0" +version = "1.3.1" dependencies = [ "gif", "glam", @@ -1081,9 +1131,9 @@ dependencies = [ [[package]] name = "rusb" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a5084628cc5be77b1c750b3e5ee0cc519d2f2491b3f06b78b3aac3328b00ad" +checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0" dependencies = [ "libc", "libusb1-sys", @@ -1288,10 +1338,11 @@ dependencies = [ [[package]] name = "tinybmp" -version = "0.2.3" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781e52493917138f60c3b98b95e39967eafd28d3c470d0d35ae020b47f011b5d" +checksum = "44873aee48dd30712dc2610209902a78b9033a0148ac03c6c3e73e4ca2f49838" dependencies = [ + "embedded-graphics", "nom", ] diff --git a/asusctl/Cargo.toml b/asusctl/Cargo.toml index 6214ff4e..735a0cf3 100644 --- a/asusctl/Cargo.toml +++ b/asusctl/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -zbus = "^1.9.1" +zbus = "^2.2" rog_anime = { path = "../rog-anime" } rog_aura = { path = "../rog-aura" } rog_dbus = { path = "../rog-dbus" } @@ -20,7 +20,7 @@ toml = "^0.5.8" sysfs-class = "^0.1.2" [dev-dependencies] -tinybmp = "^0.2.3" -glam = "0.14.0" +tinybmp = "^0.3.3" +glam = "0.20.5" rog_dbus = { path = "../rog-dbus" } gif = "^0.11.2" diff --git a/daemon-user/Cargo.toml b/daemon-user/Cargo.toml index 85751dc8..763f1257 100644 --- a/daemon-user/Cargo.toml +++ b/daemon-user/Cargo.toml @@ -23,7 +23,7 @@ rog_anime = { path = "../rog-anime" } rog_dbus = { path = "../rog-dbus" } rog_supported = { path = "../rog-supported" } -dirs = "3.0.1" +dirs = "^4.0" zbus = "^1.9.1" zvariant = "^2.6" diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index fdfce7d1..cf8c55c4 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daemon" -version = "4.0.7" +version = "4.1.0" license = "MPL-2.0" readme = "README.md" authors = ["Luke "] @@ -28,16 +28,16 @@ async-executor = "1.4.1" async-trait = "^0.1" futures = { version = "0.3.19", features = ["executor", "thread-pool"] } -rusb = "^0.8" +rusb = "^0.9" udev = "^0.6" # cli and logging log = "^0.4" -env_logger = "^0.8" +env_logger = "^0.9" -zbus = "^2.0" -zvariant = "^3.0" -logind-zbus = { version = "^2.0" } #, default-features = false, features = ["non_blocking"] } +zbus = "^2.2" +zvariant = "^3.2" +logind-zbus = { version = "^3.0" } #, default-features = false, features = ["non_blocking"] } # serialisation serde = "^1.0" diff --git a/daemon/src/ctrl_anime/mod.rs b/daemon/src/ctrl_anime/mod.rs index 90d55fb9..1d7748e8 100644 --- a/daemon/src/ctrl_anime/mod.rs +++ b/daemon/src/ctrl_anime/mod.rs @@ -1,10 +1,10 @@ pub mod config; pub mod zbus; +use logind_zbus::manager::ManagerProxyBlocking; use ::zbus::blocking::Connection; use async_trait::async_trait; use log::{error, info, warn}; -use logind_zbus::ManagerProxy; use rog_anime::{ error::AnimeError, usb::{ @@ -301,7 +301,7 @@ impl CtrlAnime { pub struct CtrlAnimeTask<'a> { _inner: Arc>, _c: Connection, - manager: ManagerProxy<'a>, + manager: ManagerProxyBlocking<'a>, } impl<'a> CtrlAnimeTask<'a> { @@ -310,7 +310,7 @@ impl<'a> CtrlAnimeTask<'a> { Connection::system().expect("CtrlAnimeTask could not create dbus connection"); let manager = - ManagerProxy::new(&connection).expect("CtrlAnimeTask could not create ManagerProxy"); + ManagerProxyBlocking::new(&connection).expect("CtrlAnimeTask could not create ManagerProxy"); Self { _inner: inner, diff --git a/daemon/src/ctrl_aura/controller.rs b/daemon/src/ctrl_aura/controller.rs index 7aabff83..e4adbe5f 100644 --- a/daemon/src/ctrl_aura/controller.rs +++ b/daemon/src/ctrl_aura/controller.rs @@ -8,7 +8,7 @@ use crate::{ }; use async_trait::async_trait; use log::{info, warn}; -use logind_zbus::ManagerProxy; +use logind_zbus::manager::ManagerProxyBlocking; use rog_aura::{ usb::{ LED_APPLY, LED_AWAKE_OFF_SLEEP_OFF, LED_AWAKE_OFF_SLEEP_ON, LED_AWAKE_ON_SLEEP_OFF, @@ -58,7 +58,7 @@ pub struct CtrlKbdLed { pub struct CtrlKbdLedTask<'a> { inner: Arc>, _c: Connection, - _manager: ManagerProxy<'a>, + _manager: ManagerProxyBlocking<'a>, } impl<'a> CtrlKbdLedTask<'a> { @@ -67,7 +67,7 @@ impl<'a> CtrlKbdLedTask<'a> { Connection::system().expect("CtrlKbdLedTask could not create dbus connection"); let manager = - ManagerProxy::new(&connection).expect("CtrlKbdLedTask could not create ManagerProxy"); + ManagerProxyBlocking::new(&connection).expect("CtrlKbdLedTask could not create ManagerProxy"); // let c1 = inner.clone(); // // Run this action when the system wakes up from sleep diff --git a/rog-anime/Cargo.toml b/rog-anime/Cargo.toml index 51357fb0..de0d5cb8 100644 --- a/rog-anime/Cargo.toml +++ b/rog-anime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rog_anime" -version = "1.3.0" +version = "1.3.1" license = "MPL-2.0" readme = "README.md" authors = ["Luke "] @@ -24,7 +24,6 @@ gif = "^0.11.2" serde = "^1.0" serde_derive = "^1.0" -glam = { version = "0.14.0", features = ["serde"] } +glam = { version = "0.20.5", features = ["serde"] } zvariant = { version = "^3.0", optional = true } -#zvariant_derive = { version = "^3.0", optional = true } diff --git a/rog-dbus/Cargo.toml b/rog-dbus/Cargo.toml index bf628961..201ffa65 100644 --- a/rog-dbus/Cargo.toml +++ b/rog-dbus/Cargo.toml @@ -14,6 +14,6 @@ rog_anime = { path = "../rog-anime" } rog_aura = { path = "../rog-aura" } rog_profiles = { path = "../rog-profiles" } rog_supported = { path = "../rog-supported" } -zbus = "^2.0" +zbus = "^2.2" zbus_macros = "^2.0" zvariant = "^3.0"