Advanced Aura feature

Groundwork for 'advanced' aura modes
Add single zone + Doom light flash
Fix mocking for ROGCC
Better prepare & change to mapping of keyboard layouts to models and functions
Refactor and begin using new key layout stuff
Enable first arg to rogcc to set layout in mocking feature mode
Complete refactor of key layouts, and to RON serde

daemon-user/src/ctrl_anime.rs

@@ -1,28 +1,24 @@
+use std::path::Path;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex};
+use std::thread::sleep;
+use std::time::{Duration, Instant};
+
 use rog_anime::error::AnimeError;
 use rog_anime::{ActionData, ActionLoader, AnimTime, Fade, Sequences, Vec2};
 use rog_dbus::RogDbusClientBlocking;
 use serde_derive::{Deserialize, Serialize};
-use std::time::Duration;
-use std::{
-    path::Path,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Mutex,
-    },
-};
-use std::{sync::Arc, thread::sleep, time::Instant};
-use zbus::{
-    dbus_interface,
-    zvariant::{ObjectPath, Type},
-};
+use zbus::dbus_interface;
+use zbus::zvariant::{ObjectPath, Type};
 
-use crate::user_config::ConfigLoadSave;
-use crate::{error::Error, user_config::UserAnimeConfig};
+use crate::error::Error;
+use crate::user_config::{ConfigLoadSave, UserAnimeConfig};
 
 #[derive(Debug, Clone, Deserialize, Serialize, Type)]
 pub struct Timer {
     type_of: TimeType,
-    /// If time type is Timer then this is milliseonds, otherwise it is animation loop count
+    /// If time type is Timer then this is milliseonds, otherwise it is
+    /// animation loop count
     count: u64,
     /// Used only for `TimeType::Timer`, milliseonds to fade the image in for
     fade_in: Option<u64>,
@@ -64,8 +60,8 @@ pub enum TimeType {
     Infinite,
 }
 
-/// The inner object exists to allow the zbus proxy to share it with a runner thread
-/// and a zbus server behind `Arc<Mutex<T>>`
+/// The inner object exists to allow the zbus proxy to share it with a runner
+/// thread and a zbus server behind `Arc<Mutex<T>>`
 pub struct CtrlAnimeInner<'a> {
     sequences: Sequences,
     client: RogDbusClientBlocking<'a>,
@@ -84,7 +80,9 @@ impl<'a> CtrlAnimeInner<'static> {
             do_early_return,
         })
     }
-    /// To be called on each main loop iteration to pump out commands to the anime
+
+    /// To be called on each main loop iteration to pump out commands to the
+    /// anime
     pub fn run(&'a self) -> Result<(), Error> {
         if self.do_early_return.load(Ordering::SeqCst) {
             return Ok(());

daemon-user/src/daemon.rs

@@ -1,18 +1,19 @@
+use std::fs::OpenOptions;
+use std::io::Read;
+use std::path::PathBuf;
+use std::sync::atomic::AtomicBool;
+use std::sync::{Arc, Mutex};
+
 use rog_anime::usb::get_anime_type;
+use rog_aura::aura_detection::LaptopLedData;
 use rog_aura::layouts::KeyLayout;
 use rog_dbus::RogDbusClientBlocking;
-use rog_user::{
-    ctrl_anime::{CtrlAnime, CtrlAnimeInner},
-    user_config::*,
-    DBUS_NAME,
-};
+use rog_user::ctrl_anime::{CtrlAnime, CtrlAnimeInner};
+use rog_user::user_config::*;
+use rog_user::DBUS_NAME;
 use smol::Executor;
-use std::sync::Mutex;
-use std::{fs::OpenOptions, io::Read, path::PathBuf, sync::Arc};
 use zbus::Connection;
 
-use std::sync::atomic::AtomicBool;
-
 #[cfg(not(feature = "local_data"))]
 const DATA_DIR: &str = "/usr/share/rog-gui/";
 #[cfg(feature = "local_data")]
@@ -82,11 +83,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         let mut board_name = String::new();
         file.read_to_string(&mut board_name)?;
 
-        let layout = KeyLayout::find_layout(board_name.as_str(), PathBuf::from(DATA_DIR))
+        let led_support = LaptopLedData::get_data();
+
+        let layout = KeyLayout::find_layout(led_support, PathBuf::from(DATA_DIR))
             .map_err(|e| {
                 println!("{BOARD_NAME}, {e}");
             })
-            .unwrap_or_else(|_| KeyLayout::ga401_layout());
+            .unwrap_or_else(|_| KeyLayout::default_layout());
 
         executor
             .spawn(async move {
@@ -99,7 +102,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                     aura_config.aura.next_state(&layout);
                     let packets = aura_config.aura.create_packets();
 
-                    client.proxies().led().per_key_raw(packets).unwrap();
+                    client
+                        .proxies()
+                        .led()
+                        .direct_addressing_raw(packets)
+                        .unwrap();
                     std::thread::sleep(std::time::Duration::from_millis(33));
                 }
             })

daemon-user/src/user_config.rs

@@ -1,11 +1,11 @@
-use std::{
-    fs::{create_dir, OpenOptions},
-    io::{Read, Write},
-    time::Duration,
-};
+use std::fs::{create_dir, OpenOptions};
+use std::io::{Read, Write};
+use std::time::Duration;
 
-use rog_anime::{ActionLoader, AnimTime, AnimeType, Fade, Sequences, Vec2};
-use rog_aura::{keys::Key, Breathe, Colour, Effect, Flicker, LedType, Speed, Static};
+use rog_anime::{ActionLoader, AnimTime, AnimeType, Fade, Sequences as AnimeSequences, Vec2};
+use rog_aura::advanced::LedCode;
+use rog_aura::effects::{AdvancedEffects as AuraSequences, Breathe, DoomFlicker, Effect, Static};
+use rog_aura::{Colour, Speed};
 use serde::de::DeserializeOwned;
 use serde_derive::{Deserialize, Serialize};
 
@@ -87,8 +87,8 @@ pub struct UserAnimeConfig {
 }
 
 impl UserAnimeConfig {
-    pub fn create(&self, anime_type: AnimeType) -> Result<Sequences, Error> {
-        let mut seq = Sequences::new(anime_type);
+    pub fn create(&self, anime_type: AnimeType) -> Result<AnimeSequences, Error> {
+        let mut seq = AnimeSequences::new(anime_type);
 
         for (idx, action) in self.anime.iter().enumerate() {
             seq.insert(idx, action)?;
@@ -175,7 +175,7 @@ impl Default for UserAnimeConfig {
 #[derive(Debug, Deserialize, Serialize)]
 pub struct UserAuraConfig {
     pub name: String,
-    pub aura: rog_aura::Sequences,
+    pub aura: AuraSequences,
 }
 
 impl ConfigLoadSave<UserAuraConfig> for UserAuraConfig {
@@ -193,43 +193,38 @@ impl ConfigLoadSave<UserAuraConfig> for UserAuraConfig {
 
 impl Default for UserAuraConfig {
     fn default() -> Self {
-        let mut seq = rog_aura::Sequences::new();
+        let mut seq = AuraSequences::new(false);
         let mut key = Effect::Breathe(Breathe::new(
-            LedType::Key(Key::W),
+            LedCode::W,
             Colour(255, 0, 20),
             Colour(20, 255, 0),
             Speed::Low,
         ));
 
         seq.push(key.clone());
-        key.set_led_type(LedType::Key(Key::A));
+        key.set_led(LedCode::A);
         seq.push(key.clone());
-        key.set_led_type(LedType::Key(Key::S));
+        key.set_led(LedCode::S);
         seq.push(key.clone());
-        key.set_led_type(LedType::Key(Key::D));
+        key.set_led(LedCode::D);
         seq.push(key);
 
         let key = Effect::Breathe(Breathe::new(
-            LedType::Key(Key::F),
+            LedCode::F,
             Colour(255, 0, 0),
             Colour(255, 0, 0),
             Speed::High,
         ));
         seq.push(key);
 
-        let mut key = Effect::Static(Static::new(LedType::Key(Key::RCtrl), Colour(0, 0, 255)));
+        let mut key = Effect::Static(Static::new(LedCode::RCtrl, Colour(0, 0, 255)));
         seq.push(key.clone());
-        key.set_led_type(LedType::Key(Key::LCtrl));
+        key.set_led(LedCode::LCtrl);
         seq.push(key.clone());
-        key.set_led_type(LedType::Key(Key::Esc));
+        key.set_led(LedCode::Esc);
         seq.push(key);
 
-        let key = Effect::Flicker(Flicker::new(
-            LedType::Key(Key::N9),
-            Colour(0, 0, 255),
-            80,
-            40,
-        ));
+        let key = Effect::DoomFlicker(DoomFlicker::new(LedCode::N9, Colour(0, 0, 255), 80, 40));
         seq.push(key);
 
         Self {

daemon-user/src/zbus_anime.rs

@@ -1,7 +1,8 @@
 //! # DBus interface proxy for: `org.asuslinux.Daemon`
 //!
-//! This code was generated by `zbus-xmlgen` `1.0.0` from DBus introspection data.
-//! Source: `Interface '/org/asuslinux/Anime' from service 'org.asuslinux.Daemon' on session bus`.
+//! This code was generated by `zbus-xmlgen` `1.0.0` from DBus introspection
+//! data. Source: `Interface '/org/asuslinux/Anime' from service
+//! 'org.asuslinux.Daemon' on session bus`.
 //!
 //! You may prefer to adapt it, instead of using it verbatim.
 //!