diff --git a/src/scan.rs b/src/scan.rs index 6bdddd4..55e138f 100644 --- a/src/scan.rs +++ b/src/scan.rs @@ -11,7 +11,7 @@ static TIMEOUT: u64 = 2000; use crate::structs::TinyError; use crate::{info, structs::ConnectionInfo}; -use log::error; +use log::{error, trace, warn}; use memchr::memmem; use packed_struct::prelude::*; use serialport::SerialPort; @@ -279,11 +279,11 @@ pub fn parse_data( let mut out = BufWriter::new(File::create(&name)?); let mut csvdata = Vec::with_capacity(points); if let Some(begining) = memchr::memchr(b'{', &v) { - // Finds the } marking the end - // Assert no bogus data is sent ? just check lenght answer ? let end_tmp = v.len(); - // if let Some(end) = memchr::memchr(b'}', &v) { - let data = &v[begining + 1..end_tmp]; + let data = &v[begining + 1..end_tmp - 4]; // -4 since ch>\r will always be ignored + // TODO: Fix weird data + info!("The begining looks like :{:?}", &v[begining..begining + 10]); + info!("The end looks like :{:?}", &v[end_tmp - 10..end_tmp - 1]); let mut end = end_tmp; let chunks_exact = data.chunks_exact(3); @@ -292,10 +292,12 @@ pub fn parse_data( "The data received doesn't have a end char (empty)".to_owned(), )); } else if chunks_exact.remainder()[0] != b'}' { + error!("Incorrect right end char {:?}", chunks_exact.remainder()); // No end char, bogus - return Err(TinyError::ParseEnd( - "The returned data doesn't have the right end char".to_owned(), - )); + return Err(TinyError::ParseEnd(format!( + "The returned data doesn't have the right end char expected }} found {:?}", + chunks_exact.remainder() + ))); } for (i, slice) in chunks_exact.enumerate() { let s: &[u8; 3] = &[slice[0], slice[1], slice[2]]; @@ -304,7 +306,7 @@ pub fn parse_data( // Found an end and the rest is garbage end = i * 3; // TODO: why doesn't it pop ? - info!("Found an end at {end}"); + warn!("Found an end at {end}"); break; } else if d.align != b'x' { // The alignment char is wrong @@ -315,7 +317,7 @@ pub fn parse_data( (i as f64 * increment + start as f64) / 1000000., u16_to_f64(d.value), ); - info!("{},{},{} : {pos},{val}", i, increment, start); + trace!("{},{},{} : {pos},{val}", i, increment, start); csvdata.push((pos, val)); writeln!(out, "{},{}", pos, val,)?; diff --git a/src/structs.rs b/src/structs.rs index 21ec9d1..9223af3 100644 --- a/src/structs.rs +++ b/src/structs.rs @@ -84,7 +84,7 @@ pub enum TinyUIError { #[error("No port was selected")] NoPortSelected, /// Any Scan Error - #[error("An error occured while trying to scan: {0}")] + #[error("An error occured while trying to scan: \n => {0}")] ScanError(#[from] TinyError), /// No connection object was created #[error("An error occured while trying to acquire the connection info structure")] diff --git a/src/ui.rs b/src/ui.rs index bf03b1e..2ff8fc9 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -258,11 +258,8 @@ impl<'a> AppInfo<'a> { fn init_progress(&mut self) -> Result<(), TinyUIError> { self.menu_items.progress_bar = Some( LineGauge::default() - // .block(title) .filled_style(Style::default().fg(Color::Blue)) .unfilled_style(Style::default().fg(Color::Red)) - // .filled_style(Style::default().fg(Color::Blue).bg(Color::Blue)) - // .unfilled_style(Style::default().fg(Color::Red).bg(Color::Red)) .label("Progress:"), ); Ok(()) @@ -304,7 +301,10 @@ impl<'a> AppInfo<'a> { /// Draw the progress, updates as the progress is being done fn draw_progress(&mut self, frame: &mut Frame<'_>) -> Result<(), TinyUIError> { if !self.logged_message { - info!("An error was raised {:#?}", self.get_connection_info()?); + info!( + "First pass of the draw process {:#?}", + self.get_connection_info()? + ); self.logged_message = true; } let [_, main_s, _] = Layout::horizontal([