refactor to 'lights', add diva protocol

src-slider_io/src/lighting/config.rs

@@ -7,7 +7,7 @@ pub enum ReactiveLayout {
 }
 
 #[derive(Debug, Clone)]
-pub enum LedMode {
+pub enum LightsMode {
   None,
   Reactive {
     layout: ReactiveLayout,
@@ -23,32 +23,32 @@ pub enum LedMode {
   },
 }
 
-impl LedMode {
+impl LightsMode {
   pub fn from_serde_value(v: &Value) -> Option<Self> {
     Some(match v["ledMode"].as_str()? {
-      "none" => LedMode::None,
-      "reactive-4" => LedMode::Reactive {
+      "none" => LightsMode::None,
+      "reactive-4" => LightsMode::Reactive {
         layout: ReactiveLayout::Even { splits: 4 },
         sensitivity: u8::try_from(v["ledSensitivity"].as_i64()?).ok()?,
       },
-      "reactive-8" => LedMode::Reactive {
+      "reactive-8" => LightsMode::Reactive {
         layout: ReactiveLayout::Even { splits: 8 },
         sensitivity: u8::try_from(v["ledSensitivity"].as_i64()?).ok()?,
       },
-      "reactive-16" => LedMode::Reactive {
+      "reactive-16" => LightsMode::Reactive {
         layout: ReactiveLayout::Even { splits: 16 },
         sensitivity: u8::try_from(v["ledSensitivity"].as_i64()?).ok()?,
       },
-      "reactive-voltex" => LedMode::Reactive {
+      "reactive-voltex" => LightsMode::Reactive {
         layout: ReactiveLayout::Voltex,
         sensitivity: u8::try_from(v["ledSensitivity"].as_i64()?).ok()?,
       },
-      "attract" => LedMode::Attract,
-      "test" => LedMode::Test,
-      "websocket" => LedMode::Websocket {
+      "attract" => LightsMode::Attract,
+      "test" => LightsMode::Test,
+      "websocket" => LightsMode::Websocket {
         url: v["ledWebsocketUrl"].as_str()?.to_string(),
       },
-      "serial" => LedMode::Serial {
+      "serial" => LightsMode::Serial {
         port: v["ledSerialPort"].as_str()?.to_string(),
       },
       _ => return None,

src-slider_io/src/lighting/lighting.rs

@@ -13,18 +13,18 @@ use crate::{
   state::{SliderLights, SliderState},
 };
 
-use super::config::{LedMode, ReactiveLayout};
+use super::config::{LightsMode, ReactiveLayout};
 
-pub struct LedJob {
+pub struct LightsJob {
   state: SliderState,
-  mode: LedMode,
+  mode: LightsMode,
   serial_port: Option<Box<dyn SerialPort>>,
   started: Instant,
   timer: Interval,
 }
 
-impl LedJob {
-  pub fn new(state: &SliderState, mode: &LedMode) -> Self {
+impl LightsJob {
+  pub fn new(state: &SliderState, mode: &LightsMode) -> Self {
     Self {
       state: state.clone(),
       mode: mode.clone(),
@@ -41,7 +41,7 @@ impl LedJob {
     lights: &mut SliderLights,
   ) {
     match self.mode {
-      LedMode::Reactive { layout, .. } => {
+      LightsMode::Reactive { layout, .. } => {
         let flat_input = flat_input.unwrap();
 
         match layout {
@@ -116,7 +116,7 @@ impl LedJob {
           }
         }
       }
-      LedMode::Attract => {
+      LightsMode::Attract => {
         let theta = self
           .started
           .elapsed()
@@ -128,7 +128,7 @@ impl LedJob {
           lights.paint(idx, &[color.red, color.green, color.blue]);
         }
       }
-      LedMode::Serial { .. } => {
+      LightsMode::Serial { .. } => {
         // https://github.com/jmontineri/OpeNITHM/blob/89e9a43f7484e8949cd31bbff79c32f21ea3ec1d/Firmware/OpeNITHM/SerialProcessor.h
         // https://github.com/jmontineri/OpeNITHM/blob/89e9a43f7484e8949cd31bbff79c32f21ea3ec1d/Firmware/OpeNITHM/SerialProcessor.cpp
         // https://github.com/jmontineri/OpeNITHM/blob/89e9a43f7484e8949cd31bbff79c32f21ea3ec1d/Firmware/OpeNITHM/SerialLeds.h
@@ -155,10 +155,10 @@ impl LedJob {
 }
 
 #[async_trait]
-impl AsyncJob for LedJob {
+impl AsyncJob for LightsJob {
   async fn setup(&mut self) -> bool {
     match &self.mode {
-      LedMode::Serial { port } => {
+      LightsMode::Serial { port } => {
         info!(
           "Serial port for led opening at {} {:?}",
           port.as_str(),
@@ -187,11 +187,11 @@ impl AsyncJob for LedJob {
 
     // Do the IO here
     match self.mode {
-      LedMode::Reactive { sensitivity, .. } => {
+      LightsMode::Reactive { sensitivity, .. } => {
         let input_handle = self.state.input.lock();
         flat_input = Some(input_handle.to_flat(&sensitivity));
       }
-      LedMode::Serial { .. } => {
+      LightsMode::Serial { .. } => {
         if let Some(serial_port) = self.serial_port.as_mut() {
           let mut serial_data_avail = serial_port.bytes_to_read().unwrap_or(0);
           if serial_data_avail >= 100 {