diff --git a/src/conf.rs b/src/conf.rs index 4d64fb2..a92dcff 100644 --- a/src/conf.rs +++ b/src/conf.rs @@ -2,7 +2,7 @@ use config::Config; use serde::{Serialize,Deserialize}; use crate::errors::LJResult; -#[derive(Serialize, Deserialize, Debug)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct Conf { pub laser_id: u8, pub debug: bool, @@ -10,7 +10,7 @@ pub struct Conf { pub dac: DacFamily } -#[derive(Serialize, Deserialize, Debug)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub enum DacFamily { #[serde(rename = "helios")] Helios(HeliosConf), @@ -18,12 +18,12 @@ pub enum DacFamily { Etherdream(EtherDreamConf), } -#[derive(Serialize, Deserialize, Debug)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct HeliosConf { pub id: u8 } -#[derive(Serialize, Deserialize, Debug)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct EtherDreamConf { pub url: String } diff --git a/src/device.rs b/src/device.rs deleted file mode 100644 index e245e5e..0000000 --- a/src/device.rs +++ /dev/null @@ -1,15 +0,0 @@ -mod common; -mod helios; - -use crate::conf::{Conf, DacFamily}; //, EtherDreamConf, HeliosConf}; -use crate::device::common::Device; -use crate::device::helios::HeliosDevice; - -pub fn device_factory(config: Conf) -> Box { - let device = match config.dac { - DacFamily::Helios(conf) => Box::new(HeliosDevice::new(conf)), - DacFamily::Etherdream(_conf) => todo!(), - }; - - device -} diff --git a/src/device/helios.rs b/src/device/helios.rs index b87a8f8..e1b8efc 100644 --- a/src/device/helios.rs +++ b/src/device/helios.rs @@ -2,37 +2,59 @@ /// Configure udev: /// https://github.com/Grix/helios_dac/blob/master/docs/udev_rules_for_linux.md /// -/* -use helios_dac::NativeHeliosDacController; +use helios_dac::{NativeHeliosDac, NativeHeliosDacController}; use helios_dac::{ - // Coordinate, - Color, - DeviceStatus, - Frame, - Point, + // Coordinate, + Color, + DeviceStatus, + Frame, + Point as HeliosPoint, }; -*/ use crate::conf::HeliosConf; -use crate::device::common::{Device, Status}; +use crate::device::{Device, Status}; +use crate::errors::{LJError, LJResult}; +use crate::point::Point; pub struct HeliosDevice { - pub conf: HeliosConf, + pub conf: HeliosConf, + dac: NativeHeliosDac, } impl HeliosDevice { - - pub fn new ( conf: HeliosConf) -> Self{ - Self{ conf } - } - + pub fn new(conf: &HeliosConf) -> LJResult { + let id = conf.id; + let controller = NativeHeliosDacController::new()?; + let devices = controller.list_devices()?; + let Some(device) = devices.into_iter().nth(id as usize) else { + return Err(Box::new(LJError::HeliosDeviceMissing)); + }; + let dac = device.open()?; + Ok(Self { conf: (*conf).clone(), dac }) + } } impl Device for HeliosDevice { - fn status(&self) -> Status { - return Status { - active: true, - last_traced_at: "now".to_string(), - properties: vec!["foo".to_string()], - }; - } + fn status(&self) -> Status { + return Status { + active: true, + last_traced_at: "now".to_string(), + properties: vec!["foo".to_string()], + }; + } + + fn draw(&self, + line: Vec, + speed: u32, + ) -> LJResult<()> { + while let Ok(DeviceStatus::NotReady) = self.dac.status() {} + + let points: Vec = line.into_iter().map(|p| p.into()).collect(); + let frame = Frame::new(speed, points); + Ok(()) + } + + fn stop(&mut self) -> LJResult<()> { + self.dac.stop()?; + Ok(()) + } } diff --git a/src/device/mod.rs b/src/device/mod.rs new file mode 100644 index 0000000..70a3916 --- /dev/null +++ b/src/device/mod.rs @@ -0,0 +1,45 @@ +use crate::point::Point; + +mod helios; + +use crate::conf::{Conf, DacFamily, EtherDreamConf, HeliosConf}; +use crate::device::helios::HeliosDevice; +use crate::errors::LJResult; + +/* +self.protocol_version, +self.le_state, +self.playback_state, +self.source, +self.le_flags, +self.playback_flags, +self.source_flags, +self.fullness, +self.point_rate, +self.point_count +*/ + + +pub struct Status { + pub active: bool, + pub last_traced_at: String, + pub properties: Vec +} + +pub trait Device { + fn status( &self ) -> Status; + fn draw( + &self, + frame: Vec, + speed: u32, + ) -> LJResult<()> ; + fn stop(&mut self) -> LJResult<()>; +} + +pub fn device_factory(config: &Conf) -> LJResult> { + let device = match &config.dac { + DacFamily::Helios(conf) => Box::new(HeliosDevice::new(conf)?), + DacFamily::Etherdream(_conf) => todo!(), + }; + Ok(device) +} diff --git a/src/lib.rs b/src/lib.rs index 41e05b8..937f09a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,3 +2,4 @@ pub mod conf; pub mod redis_ctrl; pub mod errors; pub mod device; +pub mod point; diff --git a/src/main.rs b/src/main.rs index c9c77b4..4b8ba46 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,26 +9,16 @@ mod point; mod transformer; mod device; -use helios_dac::{ - self, - NativeHeliosDacController, - NativeHeliosDac, - DeviceStatus, - Frame, -}; -use std::sync::{ - atomic::{AtomicBool, Ordering}, - Arc -}; +use device::device_factory; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::Arc; use redis_ctrl::{RedisCtrl, Order}; -use log::{LevelFilter, info, /* warn, */ error}; -use env_logger::Builder; - use conf::Conf; use errors::{LJError, LJResult}; use point::Point; -use device::device_factory; -use transformer::{Transformers,Translate,Replicate}; +use transformer::{Transformers, Translate, Replicate}; +use log::{LevelFilter, info, /* warn, */ error}; +use env_logger::Builder; const DEFAULT_CONF_FILE: &str = "settings.toml"; const CENTER: (f32, f32) = (2000.0, 2000.0); @@ -43,6 +33,7 @@ pub fn main() { } fn run_all() -> LJResult<()> { + // Setup configuration file and set up logs let filename = std::env::args().nth(1).unwrap_or_else(|| { DEFAULT_CONF_FILE.to_string() }); @@ -52,37 +43,45 @@ fn run_all() -> LJResult<()> { let config = config?; info!("*** Starting up ***"); + // Setup Redis Service let mut rs = RedisCtrl::new(&config.redis_url)?; + // Setup handler for interrupt Signals let running = Arc::new(AtomicBool::new(true)); let r = running.clone(); ctrlc::set_handler(move || { r.store(false, Ordering::SeqCst); })?; - let mut device = get_helios_device()?; + // Setup Laser Device based on conf + let mut tracer = device_factory(&config)?; + // can't work, but we can add + Debug to Device to make it work... + //dbg!(tracer); + + // Setup geometry transformers on points lists + // @todo use the config let transformers: Vec> = vec![ Box::new(Translate::new(CENTER.0, CENTER.1)), Box::new(Replicate::Until(48)), ]; + // Dispatch based on redis requests while running.load(Ordering::SeqCst) { - let order = rs.get_order(config.laser_id)?; if order != Order::Draw { info!("Order: {:?}", order); } - let frame = get_next_frame(&config, 1000, &transformers, + let frame = get_next_frame(&config, &transformers, &mut rs, order == Order::Black)?; - while let Ok(DeviceStatus::NotReady) = device.status() {} - device.write_frame(frame)?; + // For now, draw all the time + tracer.draw(frame, 1000)?; } info!("Exiting, stoping device."); - device.stop()?; + tracer.stop()?; Ok(()) } @@ -101,23 +100,12 @@ fn init_logging(config: &LJResult) { env_logger::init(); } -fn get_helios_device() -> LJResult { - let controller = NativeHeliosDacController::new()?; - let devices = controller.list_devices()?; - let Some(device) = devices.into_iter().next() else { - return Err(Box::new(LJError::HeliosDeviceMissing)); - }; - let device = device.open()?; - Ok(device) -} - fn get_next_frame( config: &Conf, - speed: u32, transformers: &[Box], rs: &mut RedisCtrl, _black: bool, -) -> LJResult { +) -> LJResult> { let line = rs.get(&format!("/pl/{}/0", config.laser_id))?; let mut line: Vec = line.into_iter().map(|tpl| tpl.into()).collect(); for transformer in transformers { @@ -125,7 +113,5 @@ fn get_next_frame( } info!("Line: {:?}", line); - - let line2: Vec = line.into_iter().map(|p| p.into()).collect(); - Ok(Frame::new(speed, line2)) + Ok(line) }