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

inotify relies on tokio, so a switch is required..

Browse Source
This commit is contained in:
Luke D. Jones
2022-09-22 12:55:15 +12:00
parent 283cb7e589
commit 3b9cf474a7
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/src/ctrl_platform.rs
View File

@@ -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(())
}

3
daemon/src/ctrl_power.rs
View File

@@ -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(())
}

6
daemon/src/lib.rs
View File

@@ -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(())
}