diff --git a/src/serial.rs b/src/serial.rs index 32ee2b71367d3b82f9cbd813055ba8050c04e7cd..fdb7df3efda491d53e730da62587af6a3a0d5134 100644 --- a/src/serial.rs +++ b/src/serial.rs @@ -3,7 +3,7 @@ use std::{ ops::Deref, sync::Arc, thread::{self, JoinHandle}, - time::{Duration, Instant}, + time::Duration, }; use crossbeam_channel::{unbounded, Receiver, RecvTimeoutError, Sender}; @@ -67,9 +67,13 @@ impl SerialManager { let mut buf = vec![0; n]; // implement a read exact to allow better error messages let mut filled = 0; - let timeout = Instant::now() + port.read_timeout; while filled < n { - match port.reader_ch.as_ref().unwrap().recv_deadline(timeout) { + match port + .reader_ch + .as_ref() + .unwrap() + .recv_timeout(port.read_timeout) + { Ok(b) => { buf[filled] = b; filled += 1; @@ -125,7 +129,8 @@ impl SerialQueue { let ser = Arc::clone(&serial); handles.push(thread::spawn(move || { while let Ok(data) = wrx.recv() { - ser.lock().as_mut().unwrap().write_all(&data).unwrap(); + data.chunks(256) + .for_each(|chunk| ser.lock().as_mut().unwrap().write_all(chunk).unwrap()); } })); @@ -133,7 +138,7 @@ impl SerialQueue { let (rtx, rrx) = unbounded::<u8>(); let ser = Arc::clone(&serial); handles.push(thread::spawn(move || { - let mut buf = [0; 1024]; + let mut buf = [0; 256]; loop { match ser.lock().as_mut().map(|p| p.read(&mut buf)) { Some(Ok(n)) => {