merge
This commit is contained in:
commit
80ec78efd3
@ -2,7 +2,7 @@ use config::Config;
|
|||||||
use serde::{Serialize,Deserialize};
|
use serde::{Serialize,Deserialize};
|
||||||
use crate::errors::LJResult;
|
use crate::errors::LJResult;
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
pub struct Conf {
|
pub struct Conf {
|
||||||
pub laser_id: u8,
|
pub laser_id: u8,
|
||||||
pub debug: bool,
|
pub debug: bool,
|
||||||
@ -10,7 +10,7 @@ pub struct Conf {
|
|||||||
pub dac: DacFamily
|
pub dac: DacFamily
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
pub enum DacFamily {
|
pub enum DacFamily {
|
||||||
#[serde(rename = "helios")]
|
#[serde(rename = "helios")]
|
||||||
Helios(HeliosConf),
|
Helios(HeliosConf),
|
||||||
@ -18,12 +18,12 @@ pub enum DacFamily {
|
|||||||
Etherdream(EtherDreamConf),
|
Etherdream(EtherDreamConf),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
pub struct HeliosConf {
|
pub struct HeliosConf {
|
||||||
pub id: u8
|
pub id: u8
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug)]
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
pub struct EtherDreamConf {
|
pub struct EtherDreamConf {
|
||||||
pub url: String
|
pub url: String
|
||||||
}
|
}
|
||||||
|
@ -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<dyn Device> {
|
|
||||||
let device = match config.dac {
|
|
||||||
DacFamily::Helios(conf) => Box::new(HeliosDevice::new(conf)),
|
|
||||||
DacFamily::Etherdream(_conf) => todo!(),
|
|
||||||
};
|
|
||||||
|
|
||||||
device
|
|
||||||
}
|
|
@ -2,29 +2,35 @@
|
|||||||
/// Configure udev:
|
/// Configure udev:
|
||||||
/// https://github.com/Grix/helios_dac/blob/master/docs/udev_rules_for_linux.md
|
/// https://github.com/Grix/helios_dac/blob/master/docs/udev_rules_for_linux.md
|
||||||
///
|
///
|
||||||
/*
|
use helios_dac::{NativeHeliosDac, NativeHeliosDacController};
|
||||||
use helios_dac::NativeHeliosDacController;
|
|
||||||
use helios_dac::{
|
use helios_dac::{
|
||||||
// Coordinate,
|
// Coordinate,
|
||||||
Color,
|
Color,
|
||||||
DeviceStatus,
|
DeviceStatus,
|
||||||
Frame,
|
Frame,
|
||||||
Point,
|
Point as HeliosPoint,
|
||||||
};
|
};
|
||||||
*/
|
|
||||||
use crate::conf::HeliosConf;
|
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 struct HeliosDevice {
|
||||||
pub conf: HeliosConf,
|
pub conf: HeliosConf,
|
||||||
|
dac: NativeHeliosDac,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl HeliosDevice {
|
impl HeliosDevice {
|
||||||
|
pub fn new(conf: &HeliosConf) -> LJResult<Self> {
|
||||||
pub fn new ( conf: HeliosConf) -> Self{
|
let id = conf.id;
|
||||||
Self{ conf }
|
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 {
|
impl Device for HeliosDevice {
|
||||||
@ -35,4 +41,20 @@ impl Device for HeliosDevice {
|
|||||||
properties: vec!["foo".to_string()],
|
properties: vec!["foo".to_string()],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn draw(&self,
|
||||||
|
line: Vec<Point>,
|
||||||
|
speed: u32,
|
||||||
|
) -> LJResult<()> {
|
||||||
|
while let Ok(DeviceStatus::NotReady) = self.dac.status() {}
|
||||||
|
|
||||||
|
let points: Vec<helios_dac::Point> = line.into_iter().map(|p| p.into()).collect();
|
||||||
|
let frame = Frame::new(speed, points);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stop(&mut self) -> LJResult<()> {
|
||||||
|
self.dac.stop()?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
45
src/device/mod.rs
Normal file
45
src/device/mod.rs
Normal file
@ -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<String>
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait Device {
|
||||||
|
fn status( &self ) -> Status;
|
||||||
|
fn draw(
|
||||||
|
&self,
|
||||||
|
frame: Vec<Point>,
|
||||||
|
speed: u32,
|
||||||
|
) -> LJResult<()> ;
|
||||||
|
fn stop(&mut self) -> LJResult<()>;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn device_factory(config: &Conf) -> LJResult<Box<dyn Device>> {
|
||||||
|
let device = match &config.dac {
|
||||||
|
DacFamily::Helios(conf) => Box::new(HeliosDevice::new(conf)?),
|
||||||
|
DacFamily::Etherdream(_conf) => todo!(),
|
||||||
|
};
|
||||||
|
Ok(device)
|
||||||
|
}
|
@ -2,3 +2,4 @@ pub mod conf;
|
|||||||
pub mod redis_ctrl;
|
pub mod redis_ctrl;
|
||||||
pub mod errors;
|
pub mod errors;
|
||||||
pub mod device;
|
pub mod device;
|
||||||
|
pub mod point;
|
||||||
|
60
src/main.rs
60
src/main.rs
@ -9,26 +9,16 @@ mod point;
|
|||||||
mod transformer;
|
mod transformer;
|
||||||
mod device;
|
mod device;
|
||||||
|
|
||||||
use helios_dac::{
|
use device::device_factory;
|
||||||
self,
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
NativeHeliosDacController,
|
use std::sync::Arc;
|
||||||
NativeHeliosDac,
|
|
||||||
DeviceStatus,
|
|
||||||
Frame,
|
|
||||||
};
|
|
||||||
use std::sync::{
|
|
||||||
atomic::{AtomicBool, Ordering},
|
|
||||||
Arc
|
|
||||||
};
|
|
||||||
use redis_ctrl::{RedisCtrl, Order};
|
use redis_ctrl::{RedisCtrl, Order};
|
||||||
use log::{LevelFilter, info, /* warn, */ error};
|
|
||||||
use env_logger::Builder;
|
|
||||||
|
|
||||||
use conf::Conf;
|
use conf::Conf;
|
||||||
use errors::{LJError, LJResult};
|
use errors::{LJError, LJResult};
|
||||||
use point::Point;
|
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 DEFAULT_CONF_FILE: &str = "settings.toml";
|
||||||
const CENTER: (f32, f32) = (2000.0, 2000.0);
|
const CENTER: (f32, f32) = (2000.0, 2000.0);
|
||||||
@ -43,6 +33,7 @@ pub fn main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn run_all() -> LJResult<()> {
|
fn run_all() -> LJResult<()> {
|
||||||
|
// Setup configuration file and set up logs
|
||||||
let filename = std::env::args().nth(1).unwrap_or_else(|| {
|
let filename = std::env::args().nth(1).unwrap_or_else(|| {
|
||||||
DEFAULT_CONF_FILE.to_string()
|
DEFAULT_CONF_FILE.to_string()
|
||||||
});
|
});
|
||||||
@ -52,37 +43,45 @@ fn run_all() -> LJResult<()> {
|
|||||||
let config = config?;
|
let config = config?;
|
||||||
info!("*** Starting up ***");
|
info!("*** Starting up ***");
|
||||||
|
|
||||||
|
// Setup Redis Service
|
||||||
let mut rs = RedisCtrl::new(&config.redis_url)?;
|
let mut rs = RedisCtrl::new(&config.redis_url)?;
|
||||||
|
|
||||||
|
// Setup handler for interrupt Signals
|
||||||
let running = Arc::new(AtomicBool::new(true));
|
let running = Arc::new(AtomicBool::new(true));
|
||||||
let r = running.clone();
|
let r = running.clone();
|
||||||
ctrlc::set_handler(move || {
|
ctrlc::set_handler(move || {
|
||||||
r.store(false, Ordering::SeqCst);
|
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<Box<dyn Transformers>> = vec![
|
let transformers: Vec<Box<dyn Transformers>> = vec![
|
||||||
Box::new(Translate::new(CENTER.0, CENTER.1)),
|
Box::new(Translate::new(CENTER.0, CENTER.1)),
|
||||||
Box::new(Replicate::Until(48)),
|
Box::new(Replicate::Until(48)),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Dispatch based on redis requests
|
||||||
while running.load(Ordering::SeqCst) {
|
while running.load(Ordering::SeqCst) {
|
||||||
|
|
||||||
let order = rs.get_order(config.laser_id)?;
|
let order = rs.get_order(config.laser_id)?;
|
||||||
if order != Order::Draw {
|
if order != Order::Draw {
|
||||||
info!("Order: {:?}", order);
|
info!("Order: {:?}", order);
|
||||||
}
|
}
|
||||||
|
|
||||||
let frame = get_next_frame(&config, 1000, &transformers,
|
let frame = get_next_frame(&config, &transformers,
|
||||||
&mut rs, order == Order::Black)?;
|
&mut rs, order == Order::Black)?;
|
||||||
|
|
||||||
while let Ok(DeviceStatus::NotReady) = device.status() {}
|
// For now, draw all the time
|
||||||
device.write_frame(frame)?;
|
tracer.draw(frame, 1000)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("Exiting, stoping device.");
|
info!("Exiting, stoping device.");
|
||||||
device.stop()?;
|
tracer.stop()?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,23 +100,12 @@ fn init_logging(config: &LJResult<Conf>) {
|
|||||||
env_logger::init();
|
env_logger::init();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_helios_device() -> LJResult<NativeHeliosDac> {
|
|
||||||
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(
|
fn get_next_frame(
|
||||||
config: &Conf,
|
config: &Conf,
|
||||||
speed: u32,
|
|
||||||
transformers: &[Box<dyn Transformers>],
|
transformers: &[Box<dyn Transformers>],
|
||||||
rs: &mut RedisCtrl,
|
rs: &mut RedisCtrl,
|
||||||
_black: bool,
|
_black: bool,
|
||||||
) -> LJResult<Frame> {
|
) -> LJResult<Vec<Point>> {
|
||||||
let line = rs.get(&format!("/pl/{}/0", config.laser_id))?;
|
let line = rs.get(&format!("/pl/{}/0", config.laser_id))?;
|
||||||
let mut line: Vec<Point> = line.into_iter().map(|tpl| tpl.into()).collect();
|
let mut line: Vec<Point> = line.into_iter().map(|tpl| tpl.into()).collect();
|
||||||
for transformer in transformers {
|
for transformer in transformers {
|
||||||
@ -125,7 +113,5 @@ fn get_next_frame(
|
|||||||
}
|
}
|
||||||
|
|
||||||
info!("Line: {:?}", line);
|
info!("Line: {:?}", line);
|
||||||
|
Ok(line)
|
||||||
let line2: Vec<helios_dac::Point> = line.into_iter().map(|p| p.into()).collect();
|
|
||||||
Ok(Frame::new(speed, line2))
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user