gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +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

12
daemon/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "daemon"
version = "4.0.7"
version = "4.1.0"
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
@@ -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"

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

@@ -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<Mutex<CtrlAnime>>,
_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,

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

@@ -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<Mutex<CtrlKbdLed>>,
_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