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

Trial BTreeMap<AuraModeNum, AuraEffect> return for led dbus

Browse Source
This commit is contained in:
Luke D. Jones
2022-07-25 10:26:47 +12:00
parent 79a45c4f10
commit f6183597c9
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,8 +418,8 @@ impl CtrlKbdLed {
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;
self.write_current_config_mode()?; self.write_current_config_mode()?;
// } // }
self.config.write(); self.config.write();
} }

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

@@ -1,6 +1,8 @@
use std::collections::BTreeMap;
use async_trait::async_trait; use async_trait::async_trait;
use log::warn; use log::warn;
use rog_aura::{usb::AuraPowerDev, AuraEffect, LedBrightness, AuraModeNum}; use rog_aura::{usb::AuraPowerDev, AuraEffect, AuraModeNum, LedBrightness};
use zbus::{dbus_interface, Connection, SignalContext}; use zbus::{dbus_interface, Connection, SignalContext};
use super::controller::CtrlKbdLedZbus; use super::controller::CtrlKbdLedZbus;
@@ -183,15 +185,12 @@ impl CtrlKbdLedZbus {
} }
/// Return a list of available modes /// Return a list of available modes
#[dbus_interface(property)] async fn led_modes(&self) -> BTreeMap<AuraModeNum, AuraEffect> {
async fn led_modes(&self) -> String { loop {
if let Ok(ctrl) = self.0.try_lock() { if let Ok(ctrl) = self.0.try_lock() {
if let Ok(json) = serde_json::to_string(&ctrl.config.builtins) { return ctrl.config.builtins.clone();
return json;
} }
} }
warn!("SetKeyBacklight could not deserialise");
"SetKeyBacklight could not serialise".to_string()
} }
/// Return the current LED brightness /// Return the current LED brightness

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

@@ -19,10 +19,12 @@
//! //!
//! …consequently `zbus-xmlgen` did not generate code for the above interfaces. //! …consequently `zbus-xmlgen` did not generate code for the above interfaces.
use std::collections::BTreeMap;
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, AuraModeNum}; use rog_aura::{usb::AuraPowerDev, AuraEffect, AuraModeNum, KeyColourArray, LedBrightness};
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
@@ -66,8 +68,7 @@ trait Led {
fn led_mode(&self) -> zbus::Result<AuraModeNum>; fn led_mode(&self) -> zbus::Result<AuraModeNum>;
/// LedModes property /// LedModes property
#[dbus_proxy(property)] fn led_modes(&self) -> zbus::Result<BTreeMap<AuraModeNum, AuraEffect>>;
fn led_modes(&self) -> zbus::Result<String>;
// As property doesn't work for AuraPowerDev (complexity of serialization?) // As property doesn't work for AuraPowerDev (complexity of serialization?)
// #[dbus_proxy(property)] // #[dbus_proxy(property)]