gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-01-22 17:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update more deps

Browse Source
This commit is contained in:
Luke D. Jones
2022-06-06 00:38:58 +12:00
parent f0620154c8
commit 31fff75f08
9 changed files with 94 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -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/), 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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased 4.1.0]
### Changed ### 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) - Fixes to fan-curve settings from CLI (Author: Armas Span)
### Added ### Added
- Support for GA402R LED modes - Support for GA402R LED modes

95
Cargo.lock generated
View File

@@ -47,7 +47,7 @@ dependencies = [
"sysfs-class", "sysfs-class",
"tinybmp", "tinybmp",
"toml", "toml",
"zbus 1.9.2", "zbus 2.2.0",
] ]
[[package]] [[package]]
@@ -160,6 +160,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "az"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f771a5d1f5503f7f4279a30f3643d3421ba149848b89ecaaec0ea2acf04a5ac4"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.2.1" version = "1.2.1"
@@ -213,7 +219,7 @@ dependencies = [
[[package]] [[package]]
name = "daemon" name = "daemon"
version = "4.0.7" version = "4.1.0"
dependencies = [ dependencies = [
"async-executor", "async-executor",
"async-trait", "async-trait",
@@ -266,9 +272,9 @@ dependencies = [
[[package]] [[package]]
name = "dirs" name = "dirs"
version = "3.0.2" version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
dependencies = [ dependencies = [
"dirs-sys", "dirs-sys",
] ]
@@ -311,6 +317,29 @@ version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946" 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]] [[package]]
name = "enumflags2" name = "enumflags2"
version = "0.6.4" version = "0.6.4"
@@ -355,9 +384,9 @@ dependencies = [
[[package]] [[package]]
name = "env_logger" name = "env_logger"
version = "0.8.4" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
dependencies = [ dependencies = [
"atty", "atty",
"humantime", "humantime",
@@ -381,6 +410,15 @@ dependencies = [
"instant", "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]] [[package]]
name = "futures" name = "futures"
version = "0.3.21" version = "0.3.21"
@@ -509,9 +547,9 @@ dependencies = [
[[package]] [[package]]
name = "glam" name = "glam"
version = "0.14.0" version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "333928d5eb103c5d4050533cec0384302db6be8ef7d3cebd30ec6a35350353da" checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@@ -605,9 +643,9 @@ dependencies = [
[[package]] [[package]]
name = "libusb1-sys" name = "libusb1-sys"
version = "0.5.0" version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e22e89d08bbe6816c6c5d446203b859eba35b8fa94bf1b7edb2f6d25d43f023f" checksum = "6dfab089105aa85a3b492b421bd90d55e6257f00f8447cc3873c44f8206809ce"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@@ -636,16 +674,13 @@ dependencies = [
[[package]] [[package]]
name = "logind-zbus" name = "logind-zbus"
version = "2.1.0" version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aa2833a7dee801395cc0b5fdc9f42b8777952d339437e6905b19860962f004d" checksum = "c03958f20018a20963daf0c16ada4f271ae2da3e0017fb40caa8b0e3dc5b0226"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json",
"zbus 2.2.0", "zbus 2.2.0",
"zbus_macros 2.2.0",
"zvariant 3.2.1", "zvariant 3.2.1",
"zvariant_derive 3.2.1",
] ]
[[package]] [[package]]
@@ -685,6 +720,12 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "micromath"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc4010833aea396656c2f91ee704d51a6f1329ec2ab56ffd00bfd56f7481ea94"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.4.4" version = "0.4.4"
@@ -733,9 +774,9 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "5.1.2" version = "6.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
dependencies = [ dependencies = [
"memchr", "memchr",
"version_check", "version_check",
@@ -755,6 +796,15 @@ dependencies = [
"zvariant_derive 3.2.1", "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]] [[package]]
name = "num_cpus" name = "num_cpus"
version = "1.13.1" version = "1.13.1"
@@ -1024,7 +1074,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_anime" name = "rog_anime"
version = "1.3.0" version = "1.3.1"
dependencies = [ dependencies = [
"gif", "gif",
"glam", "glam",
@@ -1081,9 +1131,9 @@ dependencies = [
[[package]] [[package]]
name = "rusb" name = "rusb"
version = "0.8.1" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9a5084628cc5be77b1c750b3e5ee0cc519d2f2491b3f06b78b3aac3328b00ad" checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0"
dependencies = [ dependencies = [
"libc", "libc",
"libusb1-sys", "libusb1-sys",
@@ -1288,10 +1338,11 @@ dependencies = [
[[package]] [[package]]
name = "tinybmp" name = "tinybmp"
version = "0.2.3" version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "781e52493917138f60c3b98b95e39967eafd28d3c470d0d35ae020b47f011b5d" checksum = "44873aee48dd30712dc2610209902a78b9033a0148ac03c6c3e73e4ca2f49838"
dependencies = [ dependencies = [
"embedded-graphics",
"nom", "nom",
] ]

6
asusctl/Cargo.toml
View File

@@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
zbus = "^1.9.1" zbus = "^2.2"
rog_anime = { path = "../rog-anime" } rog_anime = { path = "../rog-anime" }
rog_aura = { path = "../rog-aura" } rog_aura = { path = "../rog-aura" }
rog_dbus = { path = "../rog-dbus" } rog_dbus = { path = "../rog-dbus" }
@@ -20,7 +20,7 @@ toml = "^0.5.8"
sysfs-class = "^0.1.2" sysfs-class = "^0.1.2"
[dev-dependencies] [dev-dependencies]
tinybmp = "^0.2.3" tinybmp = "^0.3.3"
glam = "0.14.0" glam = "0.20.5"
rog_dbus = { path = "../rog-dbus" } rog_dbus = { path = "../rog-dbus" }
gif = "^0.11.2" gif = "^0.11.2"

2
daemon-user/Cargo.toml
View File

@@ -23,7 +23,7 @@ rog_anime = { path = "../rog-anime" }
rog_dbus = { path = "../rog-dbus" } rog_dbus = { path = "../rog-dbus" }
rog_supported = { path = "../rog-supported" } rog_supported = { path = "../rog-supported" }
dirs = "3.0.1" dirs = "^4.0"
zbus = "^1.9.1" zbus = "^1.9.1"
zvariant = "^2.6" zvariant = "^2.6"

12
daemon/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "daemon" name = "daemon"
version = "4.0.7" version = "4.1.0"
license = "MPL-2.0" license = "MPL-2.0"
readme = "README.md" readme = "README.md"
authors = ["Luke <luke@ljones.dev>"] authors = ["Luke <luke@ljones.dev>"]
@@ -28,16 +28,16 @@ async-executor = "1.4.1"
async-trait = "^0.1" async-trait = "^0.1"
futures = { version = "0.3.19", features = ["executor", "thread-pool"] } futures = { version = "0.3.19", features = ["executor", "thread-pool"] }
rusb = "^0.8" rusb = "^0.9"
udev = "^0.6" udev = "^0.6"
# cli and logging # cli and logging
log = "^0.4" log = "^0.4"
env_logger = "^0.8" env_logger = "^0.9"
zbus = "^2.0" zbus = "^2.2"
zvariant = "^3.0" zvariant = "^3.2"
logind-zbus = { version = "^2.0" } #, default-features = false, features = ["non_blocking"] } logind-zbus = { version = "^3.0" } #, default-features = false, features = ["non_blocking"] }
# serialisation # serialisation
serde = "^1.0" serde = "^1.0"

6
daemon/src/ctrl_anime/mod.rs
View File

@@ -1,10 +1,10 @@
pub mod config; pub mod config;
pub mod zbus; pub mod zbus;
use logind_zbus::manager::ManagerProxyBlocking;
use ::zbus::blocking::Connection; use ::zbus::blocking::Connection;
use async_trait::async_trait; use async_trait::async_trait;
use log::{error, info, warn}; use log::{error, info, warn};
use logind_zbus::ManagerProxy;
use rog_anime::{ use rog_anime::{
error::AnimeError, error::AnimeError,
usb::{ usb::{
@@ -301,7 +301,7 @@ impl CtrlAnime {
pub struct CtrlAnimeTask<'a> { pub struct CtrlAnimeTask<'a> {
_inner: Arc<Mutex<CtrlAnime>>, _inner: Arc<Mutex<CtrlAnime>>,
_c: Connection, _c: Connection,
manager: ManagerProxy<'a>, manager: ManagerProxyBlocking<'a>,
} }
impl<'a> CtrlAnimeTask<'a> { impl<'a> CtrlAnimeTask<'a> {
@@ -310,7 +310,7 @@ impl<'a> CtrlAnimeTask<'a> {
Connection::system().expect("CtrlAnimeTask could not create dbus connection"); Connection::system().expect("CtrlAnimeTask could not create dbus connection");
let manager = let manager =
ManagerProxy::new(&connection).expect("CtrlAnimeTask could not create ManagerProxy"); ManagerProxyBlocking::new(&connection).expect("CtrlAnimeTask could not create ManagerProxy");
Self { Self {
_inner: inner, _inner: inner,

6
daemon/src/ctrl_aura/controller.rs
View File

@@ -8,7 +8,7 @@ use crate::{
}; };
use async_trait::async_trait; use async_trait::async_trait;
use log::{info, warn}; use log::{info, warn};
use logind_zbus::ManagerProxy; use logind_zbus::manager::ManagerProxyBlocking;
use rog_aura::{ use rog_aura::{
usb::{ usb::{
LED_APPLY, LED_AWAKE_OFF_SLEEP_OFF, LED_AWAKE_OFF_SLEEP_ON, LED_AWAKE_ON_SLEEP_OFF, 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> { pub struct CtrlKbdLedTask<'a> {
inner: Arc<Mutex<CtrlKbdLed>>, inner: Arc<Mutex<CtrlKbdLed>>,
_c: Connection, _c: Connection,
_manager: ManagerProxy<'a>, _manager: ManagerProxyBlocking<'a>,
} }
impl<'a> CtrlKbdLedTask<'a> { impl<'a> CtrlKbdLedTask<'a> {
@@ -67,7 +67,7 @@ impl<'a> CtrlKbdLedTask<'a> {
Connection::system().expect("CtrlKbdLedTask could not create dbus connection"); Connection::system().expect("CtrlKbdLedTask could not create dbus connection");
let manager = let manager =
ManagerProxy::new(&connection).expect("CtrlKbdLedTask could not create ManagerProxy"); ManagerProxyBlocking::new(&connection).expect("CtrlKbdLedTask could not create ManagerProxy");
// let c1 = inner.clone(); // let c1 = inner.clone();
// // Run this action when the system wakes up from sleep // // Run this action when the system wakes up from sleep

5
rog-anime/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "rog_anime" name = "rog_anime"
version = "1.3.0" version = "1.3.1"
license = "MPL-2.0" license = "MPL-2.0"
readme = "README.md" readme = "README.md"
authors = ["Luke <luke@ljones.dev>"] authors = ["Luke <luke@ljones.dev>"]
@@ -24,7 +24,6 @@ gif = "^0.11.2"
serde = "^1.0" serde = "^1.0"
serde_derive = "^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 = { version = "^3.0", optional = true }
#zvariant_derive = { version = "^3.0", optional = true }

2
rog-dbus/Cargo.toml
View File

@@ -14,6 +14,6 @@ rog_anime = { path = "../rog-anime" }
rog_aura = { path = "../rog-aura" } rog_aura = { path = "../rog-aura" }
rog_profiles = { path = "../rog-profiles" } rog_profiles = { path = "../rog-profiles" }
rog_supported = { path = "../rog-supported" } rog_supported = { path = "../rog-supported" }
zbus = "^2.0" zbus = "^2.2"
zbus_macros = "^2.0" zbus_macros = "^2.0"
zvariant = "^3.0" zvariant = "^3.0"