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

Switch zbus led_mode to return AuraModeNum

Browse Source
This commit is contained in:
Luke D. Jones
2022-07-24 20:45:20 +12:00
parent 1fc12d9855
commit 030dd661b8
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,10 +417,11 @@ impl CtrlKbdLed {
let next = self.supported_modes.standard[idx]; let next = self.supported_modes.standard[idx];
self.config.read(); self.config.read();
if self.config.builtins.contains_key(&next) { // if self.config.builtins.contains_key(&next) {
self.config.current_mode = next; self.config.current_mode = next;
dbg!(self.config.current_mode);
self.write_current_config_mode()?; self.write_current_config_mode()?;
} // }
self.config.write(); self.config.write();
} }

22
daemon/src/ctrl_aura/zbus.rs
View File

@@ -1,6 +1,6 @@
use async_trait::async_trait; use async_trait::async_trait;
use log::warn; use log::warn;
use rog_aura::{usb::AuraPowerDev, AuraEffect, LedBrightness}; use rog_aura::{usb::AuraPowerDev, AuraEffect, LedBrightness, AuraModeNum};
use zbus::{dbus_interface, Connection, SignalContext}; use zbus::{dbus_interface, Connection, SignalContext};
use super::controller::CtrlKbdLedZbus; use super::controller::CtrlKbdLedZbus;
@@ -175,17 +175,19 @@ impl CtrlKbdLedZbus {
} }
/// Return the current mode data /// Return the current mode data
#[dbus_interface(property)] // #[dbus_interface(property)]
async fn led_mode(&self) -> String { async fn led_mode(&self) -> AuraModeNum {
if let Ok(ctrl) = self.0.try_lock() { if let Ok(ctrl) = self.0.try_lock() {
if let Some(mode) = ctrl.config.builtins.get(&ctrl.config.current_mode) { // if let Some(mode) = ctrl.config.builtins.get(&ctrl.config.current_mode) {
if let Ok(json) = serde_json::to_string(&mode) { // if let Ok(json) = serde_json::to_string(&ctrl.config.current_mode) {
return json; // return json;
} // }
} // }
return ctrl.config.current_mode;
} }
warn!("SetKeyBacklight could not deserialise"); // warn!("SetKeyBacklight could not deserialise");
"SetKeyBacklight could not deserialise".to_string() // "SetKeyBacklight could not deserialise".to_string()
AuraModeNum::Static
} }
/// Return a list of available modes /// Return a list of available modes

6
rog-dbus/src/zbus_led.rs
View File

@@ -22,7 +22,7 @@
use zbus::{blocking::Connection, Result}; use zbus::{blocking::Connection, Result};
use zbus_macros::dbus_proxy; use zbus_macros::dbus_proxy;
use rog_aura::{usb::AuraPowerDev, AuraEffect, KeyColourArray, LedBrightness}; use rog_aura::{usb::AuraPowerDev, AuraEffect, KeyColourArray, LedBrightness, AuraModeNum};
const BLOCKING_TIME: u64 = 40; // 100ms = 10 FPS, max 50ms = 20 FPS, 40ms = 25 FPS const BLOCKING_TIME: u64 = 40; // 100ms = 10 FPS, max 50ms = 20 FPS, 40ms = 25 FPS
@@ -63,8 +63,8 @@ trait Led {
fn led_brightness(&self) -> zbus::Result<i16>; fn led_brightness(&self) -> zbus::Result<i16>;
/// LedMode property /// LedMode property
#[dbus_proxy(property)] // #[dbus_proxy(property)]
fn led_mode(&self) -> zbus::Result<String>; fn led_mode(&self) -> zbus::Result<AuraModeNum>;
/// LedModes property /// LedModes property
#[dbus_proxy(property)] #[dbus_proxy(property)]