Add Mshroom machine implementation

diff --git a/src/machine/mod.rs b/src/machine/mod.rs
index f6cddfe..fd8b84f 100644 (file)
--- a/src/machine/mod.rs
+++ b/src/machine/mod.rs
@@ -3,6 +3,7 @@ use crate::rgb;
 pub mod jiji;\r
 pub mod lyss_metal;\r
 pub mod lyss_metal2;\r
+pub mod mshroom;\r
 \r
 const RGB_FUSION2_GPU_REG_COLOR: u8 = 0x40;\r
 const RGB_FUSION2_GPU_REG_MODE: u8 = 0x88;\r

diff --git a/src/machine/mshroom.rs b/src/machine/mshroom.rs
new file mode 100644 (file)
index 0000000..9aa7559
--- /dev/null
+++ b/src/machine/mshroom.rs
@@ -0,0 +1,45 @@
+use crate::{corsair_vengeance, cpu_temperature, rgb};
+
+use super::Machine;
+
+pub struct Mshroom {
+    ram: Vec<corsair_vengeance::Controller>,
+}
+
+impl Mshroom {
+    pub fn new() -> anyhow::Result<Self> {
+        let machine = Self {
+            ram: vec![
+                corsair_vengeance::Controller::new(0x19),
+                corsair_vengeance::Controller::new(0x1B),
+            ],
+        };
+
+        Ok(machine)
+    }
+}
+
+impl Machine for Mshroom {
+    fn set_color_1(&mut self, color: &rgb::Rgb) -> anyhow::Result<()> {
+        for controller in &self.ram {
+            controller.set_color(color);
+        }
+        Ok(())
+    }
+
+    fn set_color_2(&mut self, color: &rgb::Rgb) -> anyhow::Result<()> {
+        Ok(())
+    } // No color 2.
+
+    fn get_gpu_tmp(&self) -> f32 {
+        // unsafe { intel_arc::GetTemperature(self.gpu_devices, 0) as f32 }
+        // self.gpus[0].thermal_settings(None).unwrap()[0]
+        //     .current_temperature
+        //     .0 as f32
+        0.
+    }
+
+    fn get_cpu_tmp(&self) -> f32 {
+        cpu_temperature::read()
+    }
+}

diff --git a/src/main_loop.rs b/src/main_loop.rs
index a8b7618..8e88ecf 100644 (file)
--- a/src/main_loop.rs
+++ b/src/main_loop.rs
@@ -51,6 +51,9 @@ pub fn main_loop(completed: Arc<AtomicBool>) {
             machine::lyss_metal2::MachineLyssMetal2::new()
                 .expect("Unable to create MachineLyssMetal2"),
         ),
+        settings::MachineName::Mshroom => {
+            Box::new(machine::mshroom::Mshroom::new().expect("Unable to create Mshroom"))
+        }
     };
 
     let mut kernel = [0f32; consts::KERNEL_SIZE_SAMPLES];

diff --git a/src/settings.rs b/src/settings.rs
index 54c880b..feaa201 100644 (file)
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -13,6 +13,7 @@ pub enum MachineName {
     Jiji,\r
     LyssMetal,\r
     LyssMetal2,\r
+    Mshroom,\r
 }\r
 \r
 #[derive(Debug, Deserialize, Serialize)]\r
@@ -32,7 +33,7 @@ type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
 impl Settings {\r
     fn default() -> Self {\r
         Settings {\r
-            machine_name: MachineName::Jiji,\r
+            machine_name: MachineName::Mshroom,\r
             cold_color_1: Rgb {\r
                 red: 0,\r
                 green: 255,\r