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

Revise cherrypick of edits from meumeu

Browse Source
This commit is contained in:
Luke
2020-06-11 16:25:46 +12:00
parent b3234e3d59
commit 3eba038b16
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rog-core/src/daemon.rs
View File

@@ -89,7 +89,8 @@ pub async fn start_daemon() -> Result<(), Box<dyn Error>> {
let (aura_command_send, aura_command_recv) = mpsc::sync_channel::<AuraCommand>(1); let (aura_command_send, aura_command_recv) = mpsc::sync_channel::<AuraCommand>(1);
let (tree, input, effect, mut animatrix_recv, fan_mode, effect_cancel_signal) = dbus_create_tree(); let (tree, input, effect, mut animatrix_recv, fan_mode, effect_cancel_signal) =
dbus_create_tree();
// We add the tree to the connection so that incoming method calls will be handled. // We add the tree to the connection so that incoming method calls will be handled.
tree.start_receive_send(&*connection); tree.start_receive_send(&*connection);
@@ -213,7 +214,6 @@ pub async fn start_daemon() -> Result<(), Box<dyn Error>> {
.do_command(AnimatrixCommand::WriteImage(image)) .do_command(AnimatrixCommand::WriteImage(image))
.await .await
.unwrap_or_else(|err| warn!("{:?}", err)); .unwrap_or_else(|err| warn!("{:?}", err));
} }
} }
}); });

15
rog-core/src/rog_dbus.rs
View File

@@ -3,7 +3,10 @@ use crate::rogcore::FanLevel;
use dbus::tree::{Factory, MTSync, Method, MethodErr, Signal, Tree}; use dbus::tree::{Factory, MTSync, Method, MethodErr, Signal, Tree};
use rog_client::{DBUS_IFACE, DBUS_PATH}; use rog_client::{DBUS_IFACE, DBUS_PATH};
use std::sync::Arc; use std::sync::Arc;
use tokio::sync::Mutex; use tokio::sync::{
mpsc::{channel, Receiver, Sender},
Mutex,
};
pub(super) fn dbus_create_ledmsg_method(msg: LedMsgType) -> Method<MTSync, ()> { pub(super) fn dbus_create_ledmsg_method(msg: LedMsgType) -> Method<MTSync, ()> {
let factory = Factory::new_sync::<()>(); let factory = Factory::new_sync::<()>();
@@ -99,7 +102,9 @@ pub(super) fn dbus_create_ledeffect_method(effect: NestedVecType) -> Method<MTSy
.annotate("org.freedesktop.DBus.Method.NoReply", "true") .annotate("org.freedesktop.DBus.Method.NoReply", "true")
} }
pub(super) fn dbus_create_animatrix_method(sender: Arc<Mutex<tokio::sync::mpsc::Sender<Vec<Vec<u8>>>>>) -> Method<MTSync, ()> { pub(super) fn dbus_create_animatrix_method(
sender: Mutex<Sender<Vec<Vec<u8>>>>, // need mutex only to get interior mutability in MTSync
) -> Method<MTSync, ()> {
let factory = Factory::new_sync::<()>(); let factory = Factory::new_sync::<()>();
factory factory
// method for ledmessage // method for ledmessage
@@ -149,13 +154,13 @@ pub(super) fn dbus_create_tree() -> (
Tree<MTSync, ()>, Tree<MTSync, ()>,
LedMsgType, LedMsgType,
NestedVecType, NestedVecType,
tokio::sync::mpsc::Receiver<Vec<Vec<u8>>>, Receiver<Vec<Vec<u8>>>,
FanModeType, FanModeType,
Arc<Signal<()>>, Arc<Signal<()>>,
) { ) {
let input_bytes: LedMsgType = Arc::new(Mutex::new(None)); let input_bytes: LedMsgType = Arc::new(Mutex::new(None));
let input_effect: NestedVecType = Arc::new(Mutex::new(None)); let input_effect: NestedVecType = Arc::new(Mutex::new(None));
let (animatrix_send, animatrix_recv) = tokio::sync::mpsc::channel::<Vec<Vec<u8>>>(1); let (animatrix_send, animatrix_recv) = channel::<Vec<Vec<u8>>>(1);
let fan_mode: FanModeType = Arc::new(Mutex::new(None)); let fan_mode: FanModeType = Arc::new(Mutex::new(None));
let factory = Factory::new_sync::<()>(); let factory = Factory::new_sync::<()>();
@@ -169,7 +174,7 @@ pub(super) fn dbus_create_tree() -> (
.add_m(dbus_create_ledmsg_method(input_bytes.clone())) .add_m(dbus_create_ledmsg_method(input_bytes.clone()))
.add_m(dbus_create_ledmultizone_method(input_effect.clone())) .add_m(dbus_create_ledmultizone_method(input_effect.clone()))
.add_m(dbus_create_ledeffect_method(input_effect.clone())) .add_m(dbus_create_ledeffect_method(input_effect.clone()))
.add_m(dbus_create_animatrix_method(Arc::new(Mutex::new(animatrix_send)))) .add_m(dbus_create_animatrix_method(Mutex::new(animatrix_send)))
.add_m(dbus_create_fan_mode_method(fan_mode.clone())) .add_m(dbus_create_fan_mode_method(fan_mode.clone()))
.add_s(effect_cancel_sig.clone()), .add_s(effect_cancel_sig.clone()),
), ),