Refactor and rename a large amount of things to cleanup meanings

asus-nb/src/aura_modes.rs

@@ -2,7 +2,7 @@ use crate::cli_options;
 use crate::cli_options::SetAuraBuiltin;
 use serde_derive::{Deserialize, Serialize};
 
-pub const SINGLE: u8 = 0x00;
+pub const STATIC: u8 = 0x00;
 pub const BREATHING: u8 = 0x01;
 pub const STROBE: u8 = 0x02;
 pub const RAINBOW: u8 = 0x03;
@@ -26,7 +26,7 @@ impl From<cli_options::Colour> for Colour {
 }
 impl Default for Colour {
     fn default() -> Self {
-        Colour(255, 255, 255)
+        Colour(128, 0, 0)
     }
 }
 
@@ -165,7 +165,7 @@ impl From<cli_options::SingleColourSpeed> for SingleColourSpeed {
 
 #[derive(Clone, Deserialize, Serialize)]
 pub enum AuraModes {
-    Stable(SingleColour),
+    Static(SingleColour),
     Breathe(TwoColourSpeed),
     Strobe(SingleSpeed),
     Rainbow(SingleSpeedDirection),
@@ -186,7 +186,7 @@ pub enum AuraModes {
 impl From<SetAuraBuiltin> for AuraModes {
     fn from(mode: SetAuraBuiltin) -> Self {
         match mode {
-            SetAuraBuiltin::Stable(x) => AuraModes::Stable(x.into()),
+            SetAuraBuiltin::Static(x) => AuraModes::Static(x.into()),
             SetAuraBuiltin::Breathe(x) => AuraModes::Breathe(x.into()),
             SetAuraBuiltin::Strobe(x) => AuraModes::Strobe(x.into()),
             SetAuraBuiltin::Rainbow(x) => AuraModes::Rainbow(x.into()),
@@ -221,7 +221,7 @@ impl From<&mut AuraModes> for u8 {
 impl From<&AuraModes> for u8 {
     fn from(mode: &AuraModes) -> Self {
         match mode {
-            AuraModes::Stable(_) => SINGLE,
+            AuraModes::Static(_) => STATIC,
             AuraModes::Breathe(_) => BREATHING,
             AuraModes::Strobe(_) => STROBE,
             AuraModes::Rainbow(_) => RAINBOW,
@@ -243,7 +243,7 @@ impl From<&AuraModes> for u8 {
 impl From<&AuraModes> for &str {
     fn from(mode: &AuraModes) -> Self {
         match mode {
-            AuraModes::Stable(_) => "Static",
+            AuraModes::Static(_) => "Static",
             AuraModes::Breathe(_) => "Breathing",
             AuraModes::Strobe(_) => "Strobing",
             AuraModes::Rainbow(_) => "Rainbow",
@@ -267,7 +267,7 @@ impl From<&AuraModes> for &str {
 impl From<u8> for AuraModes {
     fn from(byte: u8) -> Self {
         match byte {
-            SINGLE => AuraModes::Stable(SingleColour::default()),
+            STATIC => AuraModes::Static(SingleColour::default()),
             BREATHING => AuraModes::Breathe(TwoColourSpeed::default()),
             STROBE => AuraModes::Strobe(SingleSpeed::default()),
             RAINBOW => AuraModes::Rainbow(SingleSpeedDirection::default()),

asus-nb/src/cli_options.rs

@@ -178,7 +178,7 @@ pub struct SingleColourSpeed {
 #[derive(Options, Deserialize, Serialize)]
 pub enum SetAuraBuiltin {
     #[options(help = "set a single static colour")]
-    Stable(SingleColour),
+    Static(SingleColour),
     #[options(help = "pulse between one or two colours")]
     Breathe(TwoColourSpeed),
     #[options(help = "strobe through all colours")]
@@ -207,7 +207,7 @@ pub enum SetAuraBuiltin {
 
 impl Default for SetAuraBuiltin {
     fn default() -> Self {
-        SetAuraBuiltin::Stable(SingleColour {
+        SetAuraBuiltin::Static(SingleColour {
             help: false,
             colour: Colour(255, 0, 0),
         })

asus-nb/src/core_dbus.rs

@@ -10,14 +10,14 @@ use std::sync::{
 use std::{thread, time::Duration};
 
 /// Simplified way to write a effect block
-pub struct AuraDbusWriter {
+pub struct AuraDbusClient {
     connection: Box<Connection>,
     block_time: u64,
     stop: Arc<AtomicBool>,
     stop_token: Token,
 }
 
-impl AuraDbusWriter {
+impl AuraDbusClient {
     #[inline]
     pub fn new() -> Result<Self, Box<dyn Error>> {
         let connection = Connection::new_system()?;
@@ -32,7 +32,7 @@ impl AuraDbusWriter {
             true
         })?;
 
-        Ok(AuraDbusWriter {
+        Ok(AuraDbusClient {
             connection: Box::new(connection),
             block_time: 33333,
             stop,

asus-nb/src/lib.rs

@@ -1,6 +1,6 @@
-pub static DBUS_NAME: &str = "org.asus-linux.Daemon";
-pub static DBUS_PATH: &str = "/org/asus-linux/Daemon";
-pub static DBUS_IFACE: &str = "org.asus-linux.Daemon";
+pub static DBUS_NAME: &str = "org.asuslinux.Daemon";
+pub static DBUS_PATH: &str = "/org/asus/linux/Daemon";
+pub static DBUS_IFACE: &str = "org.asuslinux.Daemon";
 pub const LED_MSG_LEN: usize = 17;
 
 pub mod aura_modes;
@@ -145,7 +145,7 @@ impl From<&AuraModes> for [u8; LED_MSG_LEN] {
         msg[1] = 0xb3;
         match mode {
             AuraModes::LedBrightness(n) => return aura_brightness_bytes(*n),
-            AuraModes::Stable(_) => msg[3] = 0x00,
+            AuraModes::Static(_) => msg[3] = 0x00,
             AuraModes::Breathe(_) => msg[3] = 0x01,
             AuraModes::Strobe(_) => msg[3] = 0x02,
             AuraModes::Rainbow(_) => msg[3] = 0x03,
@@ -192,7 +192,7 @@ impl From<&AuraModes> for [u8; LED_MSG_LEN] {
                 msg[6] = settings.colour.2;
                 msg[7] = settings.speed as u8;
             }
-            AuraModes::Stable(settings)
+            AuraModes::Static(settings)
             | AuraModes::Pulse(settings)
             | AuraModes::Comet(settings)
             | AuraModes::Flash(settings) => {