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/src/ctrl_profiles/config.rs

@@ -1,8 +1,9 @@
+use std::fs::{File, OpenOptions};
+use std::io::{Read, Write};
+
 use log::{error, warn};
 use rog_profiles::{FanCurveProfiles, Profile};
 use serde_derive::{Deserialize, Serialize};
-use std::fs::{File, OpenOptions};
-use std::io::{Read, Write};
 
 #[derive(Deserialize, Serialize, Debug)]
 pub struct ProfileConfig {

daemon/src/ctrl_profiles/controller.rs

@@ -1,5 +1,3 @@
-use crate::error::RogError;
-use crate::GetSupported;
 use log::{info, warn};
 use rog_platform::platform::AsusPlatform;
 use rog_platform::supported::PlatformProfileFunctions;
@@ -7,6 +5,8 @@ use rog_profiles::error::ProfileError;
 use rog_profiles::{FanCurveProfiles, Profile};
 
 use super::config::ProfileConfig;
+use crate::error::RogError;
+use crate::GetSupported;
 
 pub struct CtrlPlatformProfile {
     pub config: ProfileConfig,
@@ -18,7 +18,10 @@ impl GetSupported for CtrlPlatformProfile {
 
     fn get_supported() -> Self::A {
         if !Profile::is_platform_profile_supported() {
-            warn!("platform_profile kernel interface not found, your laptop does not support this, or the interface is missing.");
+            warn!(
+                "platform_profile kernel interface not found, your laptop does not support this, \
+                 or the interface is missing."
+            );
         }
 
         let res = FanCurveProfiles::is_supported();
@@ -28,7 +31,10 @@ impl GetSupported for CtrlPlatformProfile {
         };
 
         if !fan_curve_supported {
-            info!("fan curves kernel interface not found, your laptop does not support this, or the interface is missing.");
+            info!(
+                "fan curves kernel interface not found, your laptop does not support this, or the \
+                 interface is missing."
+            );
         }
 
         PlatformProfileFunctions {
@@ -74,7 +80,8 @@ impl CtrlPlatformProfile {
         self.config.write();
     }
 
-    /// Toggle to next profile in list. This will first read the config, switch, then write out
+    /// Toggle to next profile in list. This will first read the config, switch,
+    /// then write out
     pub(super) fn set_next_profile(&mut self) -> Result<(), RogError> {
         // Read first just incase the user has modified the config before calling this
         match self.config.active_profile {

daemon/src/ctrl_profiles/trait_impls.rs

@@ -1,22 +1,18 @@
+use std::sync::Arc;
+
 use async_trait::async_trait;
 use log::info;
 use log::warn;
-use rog_profiles::fan_curve_set::CurveData;
-use rog_profiles::fan_curve_set::FanCurveSet;
-use rog_profiles::FanCurveProfiles;
-use rog_profiles::Profile;
+use rog_profiles::fan_curve_set::{CurveData, FanCurveSet};
+use rog_profiles::{FanCurveProfiles, Profile};
 use zbus::export::futures_util::lock::Mutex;
 use zbus::export::futures_util::StreamExt;
-use zbus::Connection;
-use zbus::SignalContext;
-
-use std::sync::Arc;
-use zbus::{dbus_interface, fdo::Error};
-
-use crate::error::RogError;
-use crate::CtrlTask;
+use zbus::fdo::Error;
+use zbus::{dbus_interface, Connection, SignalContext};
 
 use super::controller::CtrlPlatformProfile;
+use crate::error::RogError;
+use crate::CtrlTask;
 
 const ZBUS_PATH: &str = "/org/asuslinux/Profile";
 const UNSUPPORTED_MSG: &str =
@@ -91,8 +87,8 @@ impl ProfileZbus {
         Err(Error::Failed(UNSUPPORTED_MSG.to_owned()))
     }
 
-    /// Set a profile fan curve enabled status. Will also activate a fan curve if in the
-    /// same profile mode
+    /// Set a profile fan curve enabled status. Will also activate a fan curve
+    /// if in the same profile mode
     async fn set_fan_curve_enabled(
         &mut self,
         profile: Profile,
@@ -145,10 +141,11 @@ impl ProfileZbus {
         Ok(())
     }
 
-    /// Reset the stored (self) and device curve to the defaults of the platform.
+    /// Reset the stored (self) and device curve to the defaults of the
+    /// platform.
     ///
-    /// Each platform_profile has a different default and the defualt can be read
-    /// only for the currently active profile.
+    /// Each platform_profile has a different default and the defualt can be
+    /// read only for the currently active profile.
     async fn set_active_curve_to_defaults(&self) -> zbus::fdo::Result<()> {
         let mut ctrl = self.0.lock().await;
         ctrl.config.read();
@@ -159,10 +156,11 @@ impl ProfileZbus {
         Ok(())
     }
 
-    /// Reset the stored (self) and device curve to the defaults of the platform.
+    /// Reset the stored (self) and device curve to the defaults of the
+    /// platform.
     ///
-    /// Each platform_profile has a different default and the defualt can be read
-    /// only for the currently active profile.
+    /// Each platform_profile has a different default and the defualt can be
+    /// read only for the currently active profile.
     async fn reset_profile_curves(&self, profile: Profile) -> zbus::fdo::Result<()> {
         let mut ctrl = self.0.lock().await;
         ctrl.config.read();
@@ -244,8 +242,9 @@ impl crate::Reloadable for ProfileZbus {
         let active = ctrl.config.active_profile;
         if let Some(curves) = &mut ctrl.config.fan_curves {
             if let Ok(mut device) = FanCurveProfiles::get_device() {
-                // There is a possibility that the curve was default zeroed, so this call initialises
-                // the data from system read and we need to save it after
+                // There is a possibility that the curve was default zeroed, so this call
+                // initialises the data from system read and we need to save it
+                // after
                 curves.write_profile_curve_to_platform(active, &mut device)?;
                 ctrl.config.write();
             }