Cargo.toml

@@ -6,7 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ctrlc = "3.4.0"
 helios-dac = { version = "0.1", default-features = false, features = ["native"] }
 redis = "0.23.0"
 ron = "0.8.0"

src/main.rs

@@ -3,31 +3,30 @@
 /// https://github.com/Grix/helios_dac/blob/master/docs/udev_rules_for_linux.md
 ///
 
-mod redis_ctrl;
-
 use helios_dac::{Frame,
 		 Point,
 		 DeviceStatus,
 		 // Coordinate,
 		 Color};
-use helios_dac::NativeHeliosDacController;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
 
-use redis_ctrl::RedisCtrl;
+use redis::{ //RedisResult,
+    Client,
+    Connection,
+    Commands
+};
+
+use ron::de::from_str;
+
+type Line = Vec<(f32,f32,u32)>;
+
 
 const CENTER : (u16,u16) = (2000, 2000);
 
-
 pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let running = Arc::new(AtomicBool::new(true));
+    use helios_dac::NativeHeliosDacController;
-    let r = running.clone();
 
-    ctrlc::set_handler(move || {
+    let client = Client::open("redis://127.0.0.1/")?;
-        r.store(false, Ordering::SeqCst);
+    let mut con = client.get_connection()?;
-    }).expect("Error setting Ctrl-C handler");
-    
-    let mut rs = RedisCtrl::new()?;
 
     let controller = NativeHeliosDacController::new()?;
     let devices = controller.list_devices()?;
@@ -35,25 +34,24 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     let device = devices.into_iter().next().unwrap();
     let mut device = device.open()?;
     
-    while running.load(Ordering::SeqCst) {	
+    for _ in 0..100 {
-	let frame = get_next_frame(1000, &mut rs)?;
+	let frame = get_next_frame(1000, &mut con)?;
 
 	while let Ok(DeviceStatus::NotReady) = device.status() {
 	}
         device.write_frame(frame)?;
     }
     
-    println!("Exiting, stoping device.");
     device.stop()?;
     Ok(())
 }
 
 fn get_next_frame(
     speed: u32,
-    rs: &mut RedisCtrl
+    con: &mut Connection
 ) -> Result<Frame, Box<dyn std::error::Error>> {
-
+    let val : String = con.get("/pl/0/0")?;
-    let line = rs.get("/pl/0/0")?;
+    let line : Line = from_str(&val)?;
     let line : Vec<Point> = line.iter()
 	.map(tuple_to_point)
 	.collect();
@@ -71,9 +69,9 @@ fn get_next_frame(
 fn tuple_to_point(tpl: &(f32,f32,u32)) -> Point {
     let (x, y, col) = tpl;
     
-    let r = (col >> 16) as u8 ;
+    let r = (col >> 16) as u8;
-    let g = ((col >> 8) & 255) as u8 ;
+    let g = ((col >> 8) & 255) as u8;
-    let b = (col & 255) as u8 ;
+    let b = (col & 255) as u8;
     
     let x = CENTER.0 + *x as u16;
     let y = CENTER.1 + *y as u16;

src/redis_ctrl.rs

@@ -1,32 +0,0 @@
-use redis::{
-    Client,
-    Connection,
-    Commands
-};
-use ron::de::from_str;
-
-pub type Line = Vec<(f32,f32,u32)>;
-
-pub struct RedisCtrl {
-    pub client: Client,
-    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 })
-    }
-
-    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)
-    }
-}
-