fix: less warnings, better logging for helios broadcast

copyme.settings.toml

@@ -22,10 +22,10 @@ redis_url = "redis://127.0.0.1:6379/"
 # [dac.etherdream]
 # ip = "192.168.1.68"
 
-#[[transformers]]
+[[transformers]]
-#[transformers.translate]
+[transformers.translate]
-#x = 20
+x = 2000
-#y = 20
+y = 2000
 
 [[transformers]]
 [transformers.replicate]

examples/etherdream.rs

@@ -23,7 +23,7 @@ fn main() {
 	// If we want to create an animation (in our case a moving sine wave) we need a frame rate.
 	let frames_per_second = 60.0;
 	// Lets use the DAC at an eighth the maximum scan rate.
-    let points_per_second = 20_000;
+	let points_per_second = stream.dac().max_point_rate / 32;
 	// Determine the number of points per frame given our target frame and point rates.
 	let points_per_frame = (points_per_second as f32 / frames_per_second) as u16;
 
@@ -70,6 +70,7 @@ fn main() {
 				err
 			);
 		});
+	eprintln!("Stream dac{:?}", stream.dac());
 
 	// Loop and continue to send points forever.
 	loop {
@@ -128,7 +129,7 @@ impl Iterator for SineWave {
 			_ => (std::u16::MAX, std::u16::MAX, std::u16::MAX),
 		};
 		let x_min = std::i16::MIN;
-        let x_max = std::i16::MAX;
+		let x_max = std::i8::MAX as i16;
 		let x = (x_min as f32 + fract * (x_max as f32 - x_min as f32)) as i16;
 		let y = (amp * x_max as f32) as i16;
 		let control = 0;

src/conf.rs

@@ -78,7 +78,7 @@ impl Conf {
 				TransformConf::Intensity(r) => Box::new(*r),
 				TransformConf::Replicate(r) => Box::new(*r),
 				TransformConf::Rotate(r) => Box::new(*r),
-				TransformConf::Translate(r) => Box::new(*r),
+				TransformConf::Translate(t) => Box::new(*t),
 			};
 			v.push(t);
 		}

src/device/etherdream.rs

@@ -14,7 +14,6 @@ use crate::device::{Device, Status, PlaybackState};
 use crate::errors::{LJError, LJResult};
 use crate::point::{Color, Point};
 use ether_dream::protocol::{DacBroadcast, DacResponse};
-use crate::device::PlaybackState::PLAYING;
 
 
 #[warn(dead_code)]
@@ -22,6 +21,18 @@ pub struct EtherdreamDevice {
 	pub conf: EtherDreamConf,
 	dac: DacBroadcast,
 	stream: Stream,
+
+	// "a": ACK   "F": Full  "I": invalid. 64 or 35 for no connection.
+	//     /// The previous command was accepted.
+	//     pub const ACK: u8 = 0x61;
+	//     /// The write command could not be performed because there was not enough buffer space when it
+	//     /// was received.
+	//     pub const NAK_FULL: u8 = 0x46;
+	//     /// The command contained an invalid `command` byte or parameters.
+	//     pub const NAK_INVALID: u8 = 0x49;
+	//     /// An emergency-stop condition still exists.
+	//     pub const NAK_STOP_CONDITION: u8 = 0x21;
+	// }
 	dac_response: u8,
 }
 
@@ -41,7 +52,7 @@ impl EtherdreamDevice {
 		dac_broadcast.set_timeout(Some(time::Duration::new(10, 0)))?;
 		info!("Attempting to get DAC broadcast...");
 		let broadcast = dac_broadcast
-			.take(5)
+			.take(3)
 			.filter_map(|result| {
 				match result {
 					Err(err) => {
@@ -51,8 +62,15 @@ impl EtherdreamDevice {
 					}
 					Ok((dac, source_addr)) => {
 						info!("Valid broadcast, source_addr: {}", source_addr);
-						if source_addr.is_ipv6() { return None; }
+						if source_addr.is_ipv6() {
-						if &source_addr.ip().to_string() != ip { return None; }
+							warn!("Broadcast ignored: ipv6 address.");
+							return None;
+					        }
+						let src_ip = source_addr.ip().to_string();
+						if &src_ip != ip {
+							warn!("Broadcast ignored: expected {ip}, got: {src_ip} ");
+							return None;
+						}
 						Some(Ok((dac, source_addr)))
 					}
 				}
@@ -74,20 +92,6 @@ impl EtherdreamDevice {
 
 	fn get_tcp_stream(dac: &DacBroadcast, source_address: &SocketAddr) -> LJResult<Stream> {
 		let mut stream = connect(dac, source_address.ip())?;
-		debug!("Stream dac BEFORE PREPARE {:?}", stream.dac());
-		debug!("Playback State BEFORE PREPARE {:?}, {:?}", stream.dac().dac.status.playback,  Playback::Playing );
-		if stream.dac().dac.status.playback == Playback::Playing {
-			warn!("DAC was in playback PLAYING, attempting to stop");
-			match stream
-				.queue_commands()
-				.stop()
-				.submit() {
-				Err(err) => warn!("err occurred when submitting STOP command: {}",err),
-				Ok(_) => info!("Prepared Stream.")
-			}
-		}
-		if stream.dac().dac.status.playback != Playback::Prepared {
-			warn!("DAC was not in playback state PREPARED, attempting to prepare");
 		match stream
 			.queue_commands()
 			.prepare_stream()
@@ -95,13 +99,10 @@ impl EtherdreamDevice {
 			Err(err) => warn!("err occurred when submitting PREPARE_STREAM command and listening for response: {}",err),
 			Ok(_) => info!("Prepared Stream.")
 		}
-		}
 		// If we want to create an animation (in our case a moving sine wave) we need a frame rate.
 		let frames_per_second = 60.0;
 		// Lets use the DAC at an eighth the maximum scan rate.
-		let points_per_second = 20_000;
+		let points_per_second = stream.dac().max_point_rate / 32;
-		// let points_per_second = 30_000;
-		debug!("points per second {:?}", points_per_second);
 		// Determine the number of points per frame given our target frame and point rates.
 		let points_per_frame = (points_per_second as f32 / frames_per_second) as u16;
 
@@ -110,7 +111,6 @@ impl EtherdreamDevice {
 			points_per_frame,
 			frames_per_second,
 		};
-		debug!("Stream dac BEFORE BEGIN {:?}", stream.dac());
 
 		match stream
 			.queue_commands()
@@ -129,15 +129,15 @@ impl EtherdreamDevice {
 		/***
 		Determine the number of points needed to fill the DAC.
 		 ***/
-		let cap = self.dac.buffer_capacity as usize;
+		// Fixme thread 'main' panicked at 'attempt to subtract with overflow', src/device/etherdream.rs:144:24
-		let fullness = self.stream.dac().dac.status.buffer_fullness as usize;
+		let n_points = self.dac.buffer_capacity as usize - self.stream.dac().dac.status.buffer_fullness as usize - 1;
-		// Sometimes we had thread 'main' panicked at 'attempt to subtract with overflow', src/device/etherdream.rs:144:24
-		let n_points = if cap > fullness { cap - fullness } else { 0 };
 		n_points
 	}
 
 	fn ping(&mut self) -> LJResult<()> {
+
 		Ok(self.stream.queue_commands().ping().submit()?)
+
 	}
 }
 
@@ -151,9 +151,6 @@ impl Device for EtherdreamDevice {
 		let now = SystemTime::now();
 		let now: DateTime<Utc> = now.into();
 		let now = now.to_rfc3339();
-		// debug!("Dac Status: {:?} ", status );
-		// debug!("Etherdream Dac {:?} ", self.dac );
-		debug!("Stream dac{:?}", self.stream.dac());
 
 		Status {
 			last_traced_at: now,
@@ -162,6 +159,9 @@ impl Device for EtherdreamDevice {
 			capacity: self.points_capacity(),
 			lack: self.dac_response.to_string(),
 		}
+		// debug!("Dac Status: {:?} ", status );
+		// debug!("Etherdream Dac {:?} ", self.dac );
+		// debug!("Stream dac{:?}", self.stream.dac());
 		// status
 	}
 
@@ -169,30 +169,28 @@ impl Device for EtherdreamDevice {
 	        line: Vec<Point>,
 	        _speed: u32,
 	) -> LJResult<()> {
-		let chunk_size = 512;
+		let chunk_size = 64;
 		let points_iter = line.into_iter();
 		for chunk in  points_iter.as_slice().chunks(chunk_size){
 			debug!("New chunk length: {:?}", chunk.len());
-			let capacity = self.points_capacity();
-			debug!("capacity : {:?}", capacity);
 			loop {
-				if chunk.len() > capacity as usize {
+				let capacity = self.points_capacity();
-					debug!("Sleep");
+				if chunk.len() > capacity {
+					debug!("Sleep, capacity : {:?}", capacity);
 					// Sleep for 1/100th of a sec
-					sleep(Duration::new(0, 100_000_000));
+					sleep(Duration::new( 0,     10000000));
-					break;
+					self.ping()?;
-					// self.ping();
 				} else {
 					break;
 				}
 			}
-			debug!("Drawing");
+			debug!("drawing");
 			match self.stream
 				.queue_commands()
 				.data(
-					chunk.into_iter()
+					chunk.iter()
 						.map(|point| (*point).into())
-						.take(chunk_size as usize)
+						.take(chunk_size)
 				)
 				.submit() {
 				Err(err) => {
@@ -225,7 +223,6 @@ impl Device for EtherdreamDevice {
 
 	fn stop(&mut self) -> LJResult<()> {
 		info!("Stopping Etherdream device...");
-		info!("Stream dac{:?}", self.stream.dac());
 		match self.stream
 			.queue_commands()
 			.stop()
@@ -243,8 +240,8 @@ impl Device for EtherdreamDevice {
 	}
 
 	fn grid(&mut self) -> Vec<Point> {
-		let dim_mid = 16000 as f32;
+		let dim_mid = 16000.0;
-		let dim_max = 32000 as f32;
+		let dim_max = 32000.0;
 		let col_min = Color { r: 0, g: 0, b: 0 };
 		let col_max = Color { r: 255, g: 255, b: 255 };
 
@@ -285,10 +282,10 @@ impl Iterator for SineWave {
 		let amp = (hz * (fract + phase) * 2.0 * std::f32::consts::PI).sin();
 		let (r, g, b) = match i {
 			i if i == coloured_points_per_frame || i < 13 => (0, 0, 0),
-			_ => (std::u16::MAX, std::u16::MAX, std::u16::MAX),
+			_ => (u16::MAX, u16::MAX, u16::MAX),
 		};
-		let x_min = std::i16::MIN;
+		let x_min = i16::MIN;
-		let x_max = std::i16::MAX;
+		let x_max = i16::MAX;
 		let x = (x_min as f32 + fract * (x_max as f32 - x_min as f32)) as i16;
 		let y = (amp * x_max as f32) as i16;
 		let control = 0;

src/device/helios.rs

@@ -85,8 +85,8 @@ impl Device for HeliosDevice {
 
 	fn grid(&mut self) -> Vec<Point> {
 		let dim_min = 0 as f32;
-		let dim_mid = 2047 as f32;
+		let dim_mid = 2047.0;
-		let dim_max = 4095 as f32;
+		let dim_max = 4095.0;
 		let col_min = Color { r: 0, g: 0, b: 0 };
 		let col_max = Color { r: 255, g: 255, b: 255 };
 

src/main.rs

@@ -76,7 +76,7 @@ fn run_all() -> LJResult<()> {
 	// Dispatch based on redis requests
 	while running.load(Ordering::SeqCst) {
 		rs.set_status(tracer.status())?;
-		// let _ = framerate_handler.handle_time()?;
+		framerate_handler.handle_time()?;
 		let order = rs.get_order(config.laser_id)?;
 		match order {
 			Order::Draw | Order::Black | Order::Grid => {

src/point.rs

@@ -15,7 +15,6 @@ pub struct Color {
 	pub g: u8,
 	pub b: u8,
 }
-
 impl Mul<u8> for Color {
     type Output = Self;
 

src/redis_ctrl.rs

@@ -98,10 +98,10 @@ impl RedisCtrl {
 
 	pub fn init_world_state(&mut self) -> LJResult<WorldState> {
 		Ok(WorldState {
-			client_key: self.get_client_key().unwrap(),
+			client_key: self.get_client_key()?,
-			edh: self.get_edh().unwrap(),
+			edh: self.get_edh()?,
-			kpps: self.get_int("kpps").unwrap().try_into().unwrap(),
+			kpps: self.get_int("kpps")?.try_into()?,
-			intensity: self.get_int("intensity").unwrap().try_into().unwrap(),
+			intensity: self.get_int("intensity")?.try_into()?,
 			..WorldState::default()
 		})
 	}

src/transformer/helios_to_etherdream.rs

@@ -7,15 +7,16 @@ use serde::{Serialize, Deserialize};
 /// Converts helios Geometry to Helios
 #[allow(dead_code)]
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
-pub struct HeliosToEtherdream {}
+pub struct HeliosToEtherdream {
+}
 
 impl Transformers for HeliosToEtherdream {
 	fn apply(&self, point_list: &[Point], _ws: &WorldState) -> Vec<Point> {
 		// debug!("list helios {:?}", point_list);
 		let out = point_list.iter().map(|pt| {
 			Point {
-				x: 50.0 * (320.0 - pt.x),
+				x: 8.0 * (pt.x - 2047.0),
-				y: 40.0 * (240.0 - pt.y),
+				y: 8.0 * (pt.y - 2047.0),
 				..*pt
 			}
 		}).collect();

src/transformer/intensity.rs

@@ -8,18 +8,20 @@ use serde::{Serialize, Deserialize};
 /// Converts helios Geometry to Helios
 #[allow(dead_code)]
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
-pub struct Intensity {}
+pub struct Intensity {
+}
 
 impl Transformers for Intensity {
 	fn apply(&self, point_list: &[Point], ws: &WorldState) -> Vec<Point> {
 		// debug!("list helios {:?}", point_list);
 		let out = point_list.iter().map(|pt| {
 			Point {
-				color: pt.color * ws.intensity,
+				x: pt.x,
-				..*pt
+				y: pt.y,
+				color: pt.color * ws.intensity
 			}
 		}).collect();
-		// debug!("list intensity {:?}", out);
+		debug!("list intensity {:?}", out);
 		out
 	}
 }