diff --git a/Cargo.lock b/Cargo.lock index c43a1218..4a19b7cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2530,9 +2530,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95" dependencies = [ "autocfg", "libc", diff --git a/asusctl/src/main.rs b/asusctl/src/main.rs index fea79752..c3e127b2 100644 --- a/asusctl/src/main.rs +++ b/asusctl/src/main.rs @@ -211,7 +211,9 @@ fn do_parsed( } if let Some(chg_limit) = parsed.chg_limit { - dbus.proxies().charge().set_charge_control_end_threshold(chg_limit)?; + dbus.proxies() + .charge() + .set_charge_control_end_threshold(chg_limit)?; } Ok(()) diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index 7e94e8c0..983411c6 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -44,5 +44,5 @@ toml = "^0.5.8" # Device control sysfs-class = "^0.1.2" # used for backlight control and baord ID -inotify = "0.10.0" +inotify = { version = "0.10.0", default-features = false } concat-idents = "1.1.3" \ No newline at end of file diff --git a/daemon/src/ctrl_platform.rs b/daemon/src/ctrl_platform.rs index 71e63c56..444c3550 100644 --- a/daemon/src/ctrl_platform.rs +++ b/daemon/src/ctrl_platform.rs @@ -1,5 +1,5 @@ -use crate::{CtrlTask, task_watch_item}; use crate::{config::Config, error::RogError, GetSupported}; +use crate::{task_watch_item, CtrlTask}; use async_trait::async_trait; use log::{info, warn}; use rog_platform::platform::{AsusPlatform, GpuMode}; @@ -311,8 +311,9 @@ impl CtrlTask for CtrlRogBios { ) .await; - self.watch_panel_od(executor, signal_ctxt.clone())?; - self.watch_gpu_mux_mode(executor, signal_ctxt.clone())?; + self.watch_panel_od(executor, signal_ctxt.clone()).await?; + self.watch_gpu_mux_mode(executor, signal_ctxt.clone()) + .await?; Ok(()) } diff --git a/daemon/src/ctrl_power.rs b/daemon/src/ctrl_power.rs index 814f04ee..19f6dace 100644 --- a/daemon/src/ctrl_power.rs +++ b/daemon/src/ctrl_power.rs @@ -167,7 +167,8 @@ impl CtrlTask for CtrlPower { ) .await; - self.watch_charge_control_end_threshold(executor, signal_ctxt)?; + self.watch_charge_control_end_threshold(executor, signal_ctxt) + .await?; Ok(()) } diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs index c0b98700..de0001dd 100644 --- a/daemon/src/lib.rs +++ b/daemon/src/lib.rs @@ -78,7 +78,7 @@ pub trait ZbusAdd { macro_rules! task_watch_item { ($name:ident $self_inner:ident) => { concat_idents::concat_idents!(fn_name = watch_, $name { - fn fn_name<'a>( + async fn fn_name<'a>( &self, executor: &mut Executor<'a>, signal_ctxt: SignalContext<'a>, @@ -91,17 +91,15 @@ macro_rules! task_watch_item { executor .spawn(async move { let mut buffer = [0; 1024]; - watch.event_stream(&mut buffer).unwrap().for_each(|e|{ + watch.event_stream(&mut buffer).unwrap().for_each(|_| async { let value = ctrl.$name(); dbg!(value); concat_idents::concat_idents!(notif_fn = notify_, $name { Self::notif_fn(&signal_ctxt, value).await.unwrap(); }); - smol::future::ready(()) }).await; }) .detach(); - dbg!("SPWADEWFWEFE"); }); Ok(()) } diff --git a/rog-platform/Cargo.toml b/rog-platform/Cargo.toml index 2d9be5b5..4eb73f07 100644 --- a/rog-platform/Cargo.toml +++ b/rog-platform/Cargo.toml @@ -18,5 +18,6 @@ udev = "^0.6" rusb = "^0.9" sysfs-class = "^0.1" inotify = "^0.10.0" +# inotify = { version = "0.10.0", default-features = false } concat-idents = "1.1.3" \ No newline at end of file