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

Need to revert tokio mpsc to sync

Browse Source
This commit is contained in:
Luke
2020-06-11 17:29:44 +12:00
parent 3eba038b16
commit 93c6b28409
3 changed files with 93 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rog-core/src/laptops.rs
View File

@@ -109,8 +109,7 @@ pub(super) struct LaptopBase {
//backlight: Backlight,
}
use std::sync::mpsc;
use tokio::sync::Mutex;
use tokio::sync::{mpsc, Mutex};
impl LaptopBase {
/// Pass in LedWriter as Mutex so it is only locked when required
@@ -119,7 +118,7 @@ impl LaptopBase {
rogcore: &mut RogCore,
config: &Mutex<Config>,
key_buf: [u8; 32],
aura_command: mpsc::SyncSender<AuraCommand>,
aura_command: mpsc::Sender<AuraCommand>,
) -> Result<(), AuraError> {
match self.usb_product {
0x1869 | 0x1866 => {
@@ -168,20 +167,32 @@ impl LaptopBase {
rogcore: &mut RogCore,
config: &Mutex<Config>,
key_buf: [u8; 32],
aura_command: mpsc::SyncSender<AuraCommand>,
mut aura_command: mpsc::Sender<AuraCommand>,
) -> Result<(), AuraError> {
match GX502Keys::from(key_buf[1]) {
GX502Keys::LedBrightUp => {
aura_command.send(AuraCommand::BrightInc).unwrap();
aura_command
.send(AuraCommand::BrightInc)
.await
.unwrap_or_else(|_| {});
}
GX502Keys::LedBrightDown => {
aura_command.send(AuraCommand::BrightDec).unwrap();
aura_command
.send(AuraCommand::BrightDec)
.await
.unwrap_or_else(|_| {});
}
GX502Keys::AuraNext => {
aura_command.send(AuraCommand::BuiltinNext).unwrap();
aura_command
.send(AuraCommand::BuiltinNext)
.await
.unwrap_or_else(|_| {});
}
GX502Keys::AuraPrevious => {
aura_command.send(AuraCommand::BuiltinPrev).unwrap();
aura_command
.send(AuraCommand::BuiltinPrev)
.await
.unwrap_or_else(|_| {});
}
GX502Keys::ScreenBrightUp => {
rogcore.virt_keys().press(ConsumerKeys::BacklightInc.into())
@@ -231,14 +242,20 @@ impl LaptopBase {
rogcore: &mut RogCore,
_config: &Mutex<Config>,
key_buf: [u8; 32],
aura_command: mpsc::SyncSender<AuraCommand>,
mut aura_command: mpsc::Sender<AuraCommand>,
) -> Result<(), AuraError> {
match GL753Keys::from(key_buf[1]) {
GL753Keys::LedBrightUp => {
aura_command.send(AuraCommand::BrightInc).unwrap();
aura_command
.send(AuraCommand::BrightInc)
.await
.unwrap_or_else(|_| {});
}
GL753Keys::LedBrightDown => {
aura_command.send(AuraCommand::BrightDec).unwrap();
aura_command
.send(AuraCommand::BrightDec)
.await
.unwrap_or_else(|_| {});
}
GL753Keys::ScreenBrightUp => {
rogcore.virt_keys().press(ConsumerKeys::BacklightInc.into())