fix: format using rustfmt
This commit is contained in:
alban
parent
4ce35dfd0d
commit
ae14cb600d
32
src/conf.rs
32
src/conf.rs
@ -1,32 +1,28 @@
|
||||
|
||||
use config::Config;
|
||||
use serde::Deserialize;
|
||||
|
||||
|
||||
#[derive(Deserialize,Debug)]
|
||||
#[derive(Deserialize, Debug)]
|
||||
pub enum DacFamily {
|
||||
Helios,
|
||||
Etherdream
|
||||
}
|
||||
|
||||
#[derive(Deserialize,Debug)]
|
||||
pub struct Conf {
|
||||
laser_id : u8,
|
||||
debug : bool,
|
||||
redis_url : String,
|
||||
dac_family: DacFamily,
|
||||
dac_id : Option<u8>,
|
||||
dac_url : Option<String>
|
||||
Etherdream,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug)]
|
||||
pub struct Conf {
|
||||
laser_id: u8,
|
||||
debug: bool,
|
||||
redis_url: String,
|
||||
dac_family: DacFamily,
|
||||
dac_id: Option<u8>,
|
||||
dac_url: Option<String>,
|
||||
}
|
||||
|
||||
pub fn load_config( path : &str )-> Result<Conf, Box<dyn std::error::Error>> {
|
||||
pub fn load_config(path: &str) -> Result<Conf, Box<dyn std::error::Error>> {
|
||||
let settings = Config::builder()
|
||||
.add_source(config::File::with_name(path))
|
||||
.build()?;
|
||||
.build()?;
|
||||
|
||||
let conf = settings
|
||||
.try_deserialize::<Conf>()?;
|
||||
let conf = settings.try_deserialize::<Conf>()?;
|
||||
|
||||
Ok(conf)
|
||||
}
|
||||
|
||||
96
src/main.rs
96
src/main.rs
@ -1,60 +1,57 @@
|
||||
mod conf;
|
||||
///
|
||||
/// Configure udev:
|
||||
/// https://github.com/Grix/helios_dac/blob/master/docs/udev_rules_for_linux.md
|
||||
///
|
||||
|
||||
mod redis_ctrl;
|
||||
mod conf;
|
||||
|
||||
use helios_dac::{Frame,
|
||||
Point,
|
||||
DeviceStatus,
|
||||
// Coordinate,
|
||||
Color};
|
||||
use helios_dac::NativeHeliosDacController;
|
||||
use helios_dac::{
|
||||
// Coordinate,
|
||||
Color,
|
||||
DeviceStatus,
|
||||
Frame,
|
||||
Point,
|
||||
};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::Arc;
|
||||
|
||||
use redis_ctrl::{RedisCtrl,Order};
|
||||
use conf::{load_config,Conf};
|
||||
use conf::{load_config, Conf};
|
||||
use redis_ctrl::{Order, RedisCtrl};
|
||||
|
||||
|
||||
const CENTER : (u16,u16) = (2000, 2000);
|
||||
const CENTER: (u16, u16) = (2000, 2000);
|
||||
|
||||
pub fn main() {
|
||||
|
||||
let config = match load_config("Settings") {
|
||||
Ok(c) => c,
|
||||
Err(err) => {
|
||||
panic!("Unable to load config file: {:?}", err)
|
||||
}
|
||||
Ok(c) => c,
|
||||
Err(err) => {
|
||||
panic!("Unable to load config file: {:?}", err)
|
||||
}
|
||||
};
|
||||
|
||||
let rs = match RedisCtrl::new() {
|
||||
Ok(rs) => rs,
|
||||
Err(err) => {
|
||||
panic!("Unable to connect to redis: {:?}", err);
|
||||
}
|
||||
Ok(rs) => rs,
|
||||
Err(err) => {
|
||||
panic!("Unable to connect to redis: {:?}", err);
|
||||
}
|
||||
};
|
||||
|
||||
match run_dac(config, rs) {
|
||||
Ok(()) => {},
|
||||
Err(err) => {
|
||||
panic!("Error: {:?}", err)
|
||||
}
|
||||
Ok(()) => {}
|
||||
Err(err) => {
|
||||
panic!("Error: {:?}", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn run_dac(
|
||||
config: Conf,
|
||||
mut rs: RedisCtrl
|
||||
) -> Result<(), Box<dyn std::error::Error>> {
|
||||
fn run_dac(config: Conf, mut rs: RedisCtrl) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let running = Arc::new(AtomicBool::new(true));
|
||||
let r = running.clone();
|
||||
|
||||
ctrlc::set_handler(move || {
|
||||
r.store(false, Ordering::SeqCst);
|
||||
}).expect("Error setting Ctrl-C handler");
|
||||
})
|
||||
.expect("Error setting Ctrl-C handler");
|
||||
|
||||
let controller = NativeHeliosDacController::new()?;
|
||||
let devices = controller.list_devices()?;
|
||||
@ -67,15 +64,14 @@ fn run_dac(
|
||||
let mut device = device.open()?;
|
||||
|
||||
while running.load(Ordering::SeqCst) {
|
||||
let order = rs.get_order(0)?;
|
||||
if order != Order::Draw {
|
||||
println!("{:?}", order);
|
||||
}
|
||||
let order = rs.get_order(0)?;
|
||||
if order != Order::Draw {
|
||||
println!("{:?}", order);
|
||||
}
|
||||
|
||||
let frame = get_next_frame(1000, &mut rs)?;
|
||||
let frame = get_next_frame(1000, &mut rs)?;
|
||||
|
||||
while let Ok(DeviceStatus::NotReady) = device.status() {
|
||||
}
|
||||
while let Ok(DeviceStatus::NotReady) = device.status() {}
|
||||
device.write_frame(frame)?;
|
||||
}
|
||||
|
||||
@ -84,38 +80,32 @@ fn run_dac(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn get_next_frame(
|
||||
speed: u32,
|
||||
rs: &mut RedisCtrl
|
||||
) -> Result<Frame, Box<dyn std::error::Error>> {
|
||||
|
||||
fn get_next_frame(speed: u32, rs: &mut RedisCtrl) -> Result<Frame, Box<dyn std::error::Error>> {
|
||||
let line = rs.get("/pl/0/0")?;
|
||||
let line : Vec<Point> = line.iter()
|
||||
.map(tuple_to_point)
|
||||
.collect();
|
||||
let line: Vec<Point> = line.iter().map(tuple_to_point).collect();
|
||||
|
||||
let mut line2 = vec![];
|
||||
while line2.len() < 48 {
|
||||
for p in &line {
|
||||
line2.push(*p);
|
||||
}
|
||||
for p in &line {
|
||||
line2.push(*p);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(Frame::new(speed, line2))
|
||||
}
|
||||
|
||||
fn tuple_to_point(tpl: &(f32,f32,u32)) -> Point {
|
||||
fn tuple_to_point(tpl: &(f32, f32, u32)) -> Point {
|
||||
let (x, y, col) = tpl;
|
||||
|
||||
let r = (col >> 16) as u8 ;
|
||||
let g = ((col >> 8) & 255) as u8 ;
|
||||
let b = (col & 255) as u8 ;
|
||||
let r = (col >> 16) as u8;
|
||||
let g = ((col >> 8) & 255) as u8;
|
||||
let b = (col & 255) as u8;
|
||||
|
||||
let x = CENTER.0 + *x as u16;
|
||||
let y = CENTER.1 + *y as u16;
|
||||
|
||||
if x >= 4096 || y >= 4096 {
|
||||
println!("WARN: coordinate out of range: {} {}", x, y);
|
||||
println!("WARN: coordinate out of range: {} {}", x, y);
|
||||
}
|
||||
let x = x.clamp(0, 4095);
|
||||
let y = y.clamp(0, 4095);
|
||||
@ -123,6 +113,6 @@ fn tuple_to_point(tpl: &(f32,f32,u32)) -> Point {
|
||||
Point {
|
||||
coordinate: (x, y).into(),
|
||||
color: Color::new(r, g, b),
|
||||
intensity: 0xFF
|
||||
intensity: 0xFF,
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,12 +1,8 @@
|
||||
use redis::{
|
||||
Client,
|
||||
Connection,
|
||||
Commands
|
||||
};
|
||||
use redis::{Client, Commands, Connection};
|
||||
use ron::de::from_str;
|
||||
|
||||
#[repr(u8)]
|
||||
#[derive(Debug,PartialEq)]
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum Order {
|
||||
Draw = 0,
|
||||
Edh, //homography
|
||||
@ -16,71 +12,62 @@ pub enum Order {
|
||||
ClientKey,
|
||||
Intensity,
|
||||
Kpps,
|
||||
ColorBalance
|
||||
ColorBalance,
|
||||
}
|
||||
|
||||
impl TryFrom<u8> for Order {
|
||||
type Error = String;
|
||||
|
||||
fn try_from(value: u8) -> Result<Self, Self::Error> {
|
||||
use Order::*;
|
||||
use Order::*;
|
||||
|
||||
if value > 8 {
|
||||
return Err("order out of range".to_string());
|
||||
}
|
||||
if value > 8 {
|
||||
return Err("order out of range".to_string());
|
||||
}
|
||||
|
||||
Ok(match value {
|
||||
0 => Draw,
|
||||
1 => Edh,
|
||||
2 => Black,
|
||||
3 => Grid,
|
||||
4 => Resampler,
|
||||
5 => ClientKey,
|
||||
6 => Intensity,
|
||||
7 => Kpps,
|
||||
8 => ColorBalance,
|
||||
_ => panic!("Can't be there")
|
||||
})
|
||||
Ok(match value {
|
||||
0 => Draw,
|
||||
1 => Edh,
|
||||
2 => Black,
|
||||
3 => Grid,
|
||||
4 => Resampler,
|
||||
5 => ClientKey,
|
||||
6 => Intensity,
|
||||
7 => Kpps,
|
||||
8 => ColorBalance,
|
||||
_ => panic!("Can't be there"),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
pub type Line = Vec<(f32,f32,u32)>;
|
||||
pub type Line = Vec<(f32, f32, u32)>;
|
||||
|
||||
pub struct RedisCtrl {
|
||||
pub client: Client,
|
||||
pub connection: Connection
|
||||
pub connection: Connection,
|
||||
}
|
||||
|
||||
impl RedisCtrl {
|
||||
|
||||
pub fn new() -> Result<Self, Box<dyn std::error::Error>> {
|
||||
let client = Client::open("redis://127.0.0.1/")?;
|
||||
let connection = client.get_connection()?;
|
||||
Ok(RedisCtrl { client, connection })
|
||||
let client = Client::open("redis://127.0.0.1/")?;
|
||||
let connection = client.get_connection()?;
|
||||
Ok(RedisCtrl { client, connection })
|
||||
}
|
||||
|
||||
pub fn get(
|
||||
&mut self,
|
||||
key: &str
|
||||
) -> Result<Line, Box<dyn std::error::Error>> {
|
||||
let val : String = self.connection.get(key)?;
|
||||
let line : Line = from_str(&val)?;
|
||||
Ok(line)
|
||||
pub fn get(&mut self, key: &str) -> Result<Line, Box<dyn std::error::Error>> {
|
||||
let val: String = self.connection.get(key)?;
|
||||
let line: Line = from_str(&val)?;
|
||||
Ok(line)
|
||||
}
|
||||
|
||||
pub fn get_order(
|
||||
&mut self,
|
||||
id: u8
|
||||
) -> Result<Order, Box<dyn std::error::Error>> {
|
||||
let path = format!("/order/{id}");
|
||||
let val : u8 = self.connection.get(path.clone())?;
|
||||
pub fn get_order(&mut self, id: u8) -> Result<Order, Box<dyn std::error::Error>> {
|
||||
let path = format!("/order/{id}");
|
||||
let val: u8 = self.connection.get(path.clone())?;
|
||||
|
||||
if val == 1 || val >= 4 {
|
||||
self.connection.set(path, 0)?;
|
||||
}
|
||||
if val == 1 || val >= 4 {
|
||||
self.connection.set(path, 0)?;
|
||||
}
|
||||
|
||||
Ok(val.try_into()?)
|
||||
Ok(val.try_into()?)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user