adds support to enable/disable side leds

daemon/src/ctrl_aura/config.rs

@@ -25,6 +25,7 @@ impl AuraConfigV320 {
             multizone: self.multizone,
             awake_enabled: true,
             sleep_anim_enabled: true,
+            side_leds_enabled:true,
         }
     }
 }
@@ -46,6 +47,7 @@ impl AuraConfigV352 {
             multizone: self.multizone,
             awake_enabled: true,
             sleep_anim_enabled: true,
+            side_leds_enabled:true,
         }
     }
 }
@@ -58,6 +60,7 @@ pub struct AuraConfig {
     pub multizone: Option<AuraMultiZone>,
     pub awake_enabled: bool,
     pub sleep_anim_enabled: bool,
+    pub side_leds_enabled: bool,
 }
 
 impl Default for AuraConfig {
@@ -69,6 +72,7 @@ impl Default for AuraConfig {
             multizone: None,
             awake_enabled: true,
             sleep_anim_enabled: true,
+            side_leds_enabled:true,
         }
     }
 }

daemon/src/ctrl_aura/controller.rs

@@ -11,7 +11,7 @@ use logind_zbus::ManagerProxy;
 use rog_aura::{
     usb::{
         LED_APPLY, LED_AWAKE_OFF_SLEEP_OFF, LED_AWAKE_OFF_SLEEP_ON, LED_AWAKE_ON_SLEEP_OFF,
-        LED_AWAKE_ON_SLEEP_ON, LED_SET,
+        LED_AWAKE_ON_SLEEP_ON, LED_SET, SIDE_LEDS_OFF, SIDE_LEDS_ON,
     },
     AuraEffect, LedBrightness, LED_MSG_LEN,
 };
@@ -148,6 +148,10 @@ impl crate::Reloadable for CtrlKbdLedReloader {
             ctrl.set_states_enabled(ctrl.config.awake_enabled, ctrl.config.sleep_anim_enabled)
                 .map_err(|err| warn!("{}", err))
                 .ok();
+
+            ctrl.set_side_leds_states(ctrl.config.side_leds_enabled)
+                .map_err(|err| warn!("{}", err))
+                .ok();
         }
         Ok(())
     }
@@ -283,6 +287,19 @@ impl CtrlKbdLed {
         Ok(())
     }
 
+    pub(super) fn set_side_leds_states(&self, activated: bool) -> Result<(), RogError> {
+        let bytes: [u8; LED_MSG_LEN] = if activated {
+            SIDE_LEDS_ON
+        } else {
+            SIDE_LEDS_OFF
+        };
+        self.write_bytes(&bytes)?;
+        self.write_bytes(&LED_SET)?;
+        // Changes won't persist unless apply is set
+        self.write_bytes(&LED_APPLY)?;
+        Ok(())
+    }
+
     fn find_led_node(id_product: &str) -> Result<String, RogError> {
         let mut enumerator = udev::Enumerator::new().map_err(|err| {
             warn!("{}", err);

daemon/src/ctrl_aura/zbus.rs

@@ -65,6 +65,19 @@ impl CtrlKbdLedZbus {
         }
     }
 
+    /// Set the keyboard side LEDs to enabled
+    fn set_side_leds_enabled(&mut self, enabled: bool) {
+        if let Ok(mut ctrl) = self.0.try_lock() {
+            ctrl.set_side_leds_states(enabled)
+                .map_err(|err| warn!("{}", err))
+                .ok();
+            ctrl.config.side_leds_enabled = enabled;
+            ctrl.config.write();
+            self.notify_side_leds(ctrl.config.side_leds_enabled)
+                .unwrap_or_else(|err| warn!("{}", err))
+        }
+    }
+
     fn set_led_mode(&mut self, effect: AuraEffect) {
         if let Ok(mut ctrl) = self.0.try_lock() {
             match ctrl.do_command(effect) {
@@ -135,6 +148,14 @@ impl CtrlKbdLedZbus {
         true
     }
 
+    #[dbus_interface(property)]
+    fn side_leds_enabled(&self) -> bool {
+        if let Ok(ctrl) = self.0.try_lock() {
+            return ctrl.config.side_leds_enabled;
+        }
+        true
+    }
+
     /// Return the current mode data
     #[dbus_interface(property)]
     fn led_mode(&self) -> String {
@@ -174,6 +195,9 @@ impl CtrlKbdLedZbus {
     #[dbus_interface(signal)]
     fn notify_led(&self, data: AuraEffect) -> zbus::Result<()>;
 
+    #[dbus_interface(signal)]
+    fn notify_side_leds(&self, data: bool) -> zbus::Result<()>;
+
     #[dbus_interface(signal)]
     fn notify_power_states(&self, data: &LedPowerStates) -> zbus::Result<()>;
 }