From 030dd661b8789d89b3e17804df40571f6341045a Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Sun, 24 Jul 2022 20:45:20 +1200
Subject: [PATCH] Switch zbus led_mode to return AuraModeNum

---
 daemon/src/ctrl_aura/controller.rs |  5 +++--
 daemon/src/ctrl_aura/zbus.rs       | 22 ++++++++++++----------
 rog-dbus/src/zbus_led.rs           |  6 +++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/daemon/src/ctrl_aura/controller.rs b/daemon/src/ctrl_aura/controller.rs
index 3543744b..d4eb6e76 100644
--- a/daemon/src/ctrl_aura/controller.rs
+++ b/daemon/src/ctrl_aura/controller.rs
@@ -417,10 +417,11 @@ impl CtrlKbdLed {
             let next = self.supported_modes.standard[idx];
 
             self.config.read();
-            if self.config.builtins.contains_key(&next) {
+            // if self.config.builtins.contains_key(&next) {
                 self.config.current_mode = next;
+                dbg!(self.config.current_mode);
                 self.write_current_config_mode()?;
-            }
+            // }
             self.config.write();
         }
 
diff --git a/daemon/src/ctrl_aura/zbus.rs b/daemon/src/ctrl_aura/zbus.rs
index 6b5b4184..5441fe83 100644
--- a/daemon/src/ctrl_aura/zbus.rs
+++ b/daemon/src/ctrl_aura/zbus.rs
@@ -1,6 +1,6 @@
 use async_trait::async_trait;
 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 super::controller::CtrlKbdLedZbus;
@@ -175,17 +175,19 @@ impl CtrlKbdLedZbus {
     }
 
     /// Return the current mode data
-    #[dbus_interface(property)]
-    async fn led_mode(&self) -> String {
+    // #[dbus_interface(property)]
+    async fn led_mode(&self) -> AuraModeNum {
         if let Ok(ctrl) = self.0.try_lock() {
-            if let Some(mode) = ctrl.config.builtins.get(&ctrl.config.current_mode) {
-                if let Ok(json) = serde_json::to_string(&mode) {
-                    return json;
-                }
-            }
+            // if let Some(mode) = ctrl.config.builtins.get(&ctrl.config.current_mode) {
+                // if let Ok(json) = serde_json::to_string(&ctrl.config.current_mode) {
+                //     return json;
+                // }
+            // }
+            return ctrl.config.current_mode;
         }
-        warn!("SetKeyBacklight could not deserialise");
-        "SetKeyBacklight could not deserialise".to_string()
+        // warn!("SetKeyBacklight could not deserialise");
+        // "SetKeyBacklight could not deserialise".to_string()
+        AuraModeNum::Static
     }
 
     /// Return a list of available modes
diff --git a/rog-dbus/src/zbus_led.rs b/rog-dbus/src/zbus_led.rs
index 37b962fe..c529eb57 100644
--- a/rog-dbus/src/zbus_led.rs
+++ b/rog-dbus/src/zbus_led.rs
@@ -22,7 +22,7 @@
 use zbus::{blocking::Connection, Result};
 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
 
@@ -63,8 +63,8 @@ trait Led {
     fn led_brightness(&self) -> zbus::Result<i16>;
 
     /// LedMode property
-    #[dbus_proxy(property)]
-    fn led_mode(&self) -> zbus::Result<String>;
+    // #[dbus_proxy(property)]
+    fn led_mode(&self) -> zbus::Result<AuraModeNum>;
 
     /// LedModes property
     #[dbus_proxy(property)]