Big refactor out of Aura LED data structs

aura/src/aura_dbus.rs

@@ -0,0 +1,81 @@
+use super::*;
+use dbus::{ffidisp::Connection, Message};
+use std::error::Error;
+use std::{thread, time::Duration};
+
+/// Simplified way to write a effect block
+pub struct AuraDbusWriter {
+    connection: Connection,
+    block_time: u64,
+}
+
+impl AuraDbusWriter {
+    #[inline]
+    pub fn new() -> Result<Self, Box<dyn Error>> {
+        Ok(AuraDbusWriter {
+            connection: Connection::new_system()?,
+            block_time: 10,
+        })
+    }
+
+    /// This method must always be called before the very first write to initialise
+    /// the keyboard LED EC in the correct mode
+    #[inline]
+    pub fn init_effect(&self) -> Result<(), Box<dyn Error>> {
+        let msg = Message::new_method_call(DBUS_NAME, DBUS_PATH, DBUS_IFACE, "ledmessage")?
+            .append1(KeyColourArray::get_init_msg());
+        self.connection.send(msg).unwrap();
+        Ok(())
+    }
+
+    /// Write a single colour block.
+    ///
+    /// Intentionally blocks for 10ms after sending to allow the block to
+    /// be written to the keyboard EC. This should not be async.
+    #[inline]
+    pub fn write_colour_block(
+        &self,
+        key_colour_array: &KeyColourArray,
+    ) -> Result<(), Box<dyn Error>> {
+        let group = key_colour_array.get();
+        let msg = Message::new_method_call(DBUS_NAME, DBUS_PATH, DBUS_IFACE, "ledeffect")?
+            .append1(&group[0].to_vec())
+            .append1(&group[1].to_vec())
+            .append1(&group[2].to_vec())
+            .append1(&group[3].to_vec())
+            .append1(&group[4].to_vec())
+            .append1(&group[5].to_vec())
+            .append1(&group[6].to_vec())
+            .append1(&group[7].to_vec())
+            .append1(&group[8].to_vec())
+            .append1(&group[9].to_vec());
+        self.connection.send(msg).unwrap();
+        thread::sleep(Duration::from_millis(self.block_time));
+        Ok(())
+    }
+
+    #[inline]
+    pub fn write_bytes(&self, bytes: &[u8]) -> Result<String, Box<dyn std::error::Error>> {
+        let msg = Message::new_method_call(DBUS_NAME, DBUS_PATH, DBUS_IFACE, "ledmessage")?
+            .append1(bytes.to_vec());
+        let r = self.connection.send_with_reply_and_block(msg, 5000)?;
+        if let Some(reply) = r.get1::<&str>() {
+            return Ok(reply.to_owned());
+        }
+        Err(Box::new(dbus::Error::new_custom("name", "message")))
+    }
+
+    #[inline]
+    pub fn write_builtin_mode(
+        &self,
+        mode: &SetAuraBuiltin,
+    ) -> Result<String, Box<dyn std::error::Error>> {
+        let bytes = <[u8; LED_MSG_LEN]>::from(mode);
+        self.write_bytes(&bytes)
+    }
+
+    #[inline]
+    pub fn write_brightness(&self, level: u8) -> Result<String, Box<dyn std::error::Error>> {
+        self.write_bytes(&aura_brightness_bytes(level))
+    }
+}