Fix/tsp 1254 cli gets all messed up on usbtmc

CHANGELOG.md

@@ -16,6 +16,11 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
     Security -- in case of vulnerabilities.
 -->
 
+## [0.21.1]
+
+### Fixed
+- CLI gets all messed up on USBTMC
+
 ## [0.21.0]
 
 ### Added
@@ -273,7 +278,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 - Feature to retrieve TSP-Link network details
 
 <!--Version Comparison Links-->
-[Unreleased]: https://github.com/tektronix/tsp-toolkit-kic-cli/compare/v0.21.0...HEAD
+[Unreleased]: https://github.com/tektronix/tsp-toolkit-kic-cli/compare/v0.21.1...HEAD
+[0.21.1]: https://github.com/tektronix/tsp-toolkit-kic-cli/releases/tag/v0.21.1
 [0.21.0]: https://github.com/tektronix/tsp-toolkit-kic-cli/releases/tag/v0.21.0
 [0.20.1]: https://github.com/tektronix/tsp-toolkit-kic-cli/releases/tag/v0.20.1
 [0.20.0]: https://github.com/tektronix/tsp-toolkit-kic-cli/releases/tag/v0.20.0

Cargo.toml

@@ -12,7 +12,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.21.0"
+version = "0.21.1"
 authors = ["Tektronix, Inc."]
 edition = "2021"
 repository = "https://github.com/tektronix/tsp-toolkit-kic-cli"

instrument-repl/src/repl.rs

@@ -161,12 +161,12 @@ impl Repl {
                 }
             }
             if get_error {
-                let errors = self.get_errors()?;
+                let (errors, new_prompt) = self.get_errors()?;
                 for e in errors {
                     error!("TSP error: {e}");
                     Self::print_data(*state, ParsedResponse::TspError(e.to_string()))?;
                 }
-                prompt = true;
+                prompt = new_prompt;
                 *state = Some(ReadState::DataReadEnd);
             }
             debug!("Data handling complete");
@@ -203,7 +203,7 @@ impl Repl {
         debug!("Writing common script to instrument completed");
 
         self.inst.write_all(b"_KIC.prompts_enable(true)\n")?;
-        let errors = self.get_errors()?;
+        let (errors, _) = self.get_errors()?;
         for e in errors {
             error!("TSP error: {e}");
             Self::print_data(None, ParsedResponse::TspError(e.to_string()))?;
@@ -260,7 +260,7 @@ impl Repl {
                             prev_state = None;
                         }
                         Request::GetError => {
-                            let errors = self.get_errors()?;
+                            let (errors, _) = self.get_errors()?;
                             for e in errors {
                                 error!("TSP error: {e}");
                                 Self::print_data(state, ParsedResponse::TspError(e.to_string()))?;
@@ -418,10 +418,11 @@ impl Repl {
     }
 
     #[instrument(skip(self))]
-    fn get_errors(&mut self) -> Result<Vec<TspError>> {
+    fn get_errors(&mut self) -> Result<(Vec<TspError>, bool)> {
         self.inst.write_all(b"print(_KIC.error_message())\n")?;
         let mut errors: Vec<TspError> = Vec::new();
         let mut err: String = String::new();
+        let mut prompt = false;
         'error_loop: loop {
             std::thread::sleep(Duration::from_micros(1));
             let mut read_buf: Vec<u8> = vec![0; 1024];
@@ -446,12 +447,16 @@ impl Repl {
 
         let parser = ResponseParser::new(err.as_bytes());
         for response in parser {
-            if let ParsedResponse::TspError(e) = response {
+            if let ParsedResponse::TspError(e) = &response {
                 let x: TspError = serde_json::from_str(e.trim())?;
                 errors.push(x);
             }
+            // in trebuchet for usbtmc connection prompt is getting in error query output, which got handled here
+            if response == ParsedResponse::Prompt {
+                prompt = true;
+            }
         }
-        Ok(errors)
+        Ok((errors, prompt))
     }
 
     fn print_flush<D: Display>(string: &D) -> Result<()> {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tektronix/kic-cli",
-    "version": "0.21.0",
+    "version": "0.21.1",
     "main": "index.js",
     "bin": {
         "windows-kic": "./bin/kic.exe",