Remove usbtmc

tektronix · Oct 9, 2024 · 20c6371 · 20c6371
1 parent 9e345c9
commit 20c6371
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 635 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,14 +33,12 @@ phf = { version = "0.11.2", features = ["macros"] }
 regex = "1.10.3"
 reqwest = "0.12.0"
 rpassword = "7.3.1"
-rusb = "0.9.3"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 thiserror = "1.0.58"
-tmc = { git = "https://github.com/esarver/rusb-usbtmc" }
 tracing = { version = "0.1.40", features = ["async-await"] }
 tracing-subscriber = { version = "0.3.18", features = ["json"] }
-tsp-toolkit-kic-lib = { git = "https://github.com/tektronix/tsp-toolkit-kic-lib.git", tag = "v0.18.2-0" }
+tsp-toolkit-kic-lib = { git = "https://github.com/tektronix/tsp-toolkit-kic-lib.git", tag = "v0.18.2-1" }
 
 [workspace.lints.rust]
 warnings = "deny"

diff --git a/kic-discover-visa/Cargo.toml b/kic-discover-visa/Cargo.toml
@@ -23,11 +23,9 @@ mdns = { workspace = true }                         # until https://github.com/d
 minidom = { workspace = true }
 reqwest = { workspace = true }
 rpassword = { workspace = true }
-rusb = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-tmc = { workspace = true }
 tokio = { version = "1.36.0", features = ["full"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }

diff --git a/kic-discover-visa/src/instrument_discovery/mod.rs b/kic-discover-visa/src/instrument_discovery/mod.rs
@@ -6,7 +6,6 @@ use tsp_toolkit_kic_lib::{
 };
 
 use crate::ethernet::{LxiDeviceInfo, COMM_PORT};
-use crate::usbtmc::Usbtmc;
 use crate::visa::visa_discover;
 
 #[derive(Debug)]
@@ -62,27 +61,6 @@ impl InstrumentDiscovery {
         Ok(discovery_results)
     }
 
-    /// Discover instruments over USB
-    ///
-    /// # Errors
-    /// If [`Usbtmc::usb_discover`] fails, and error will be returned.
-    pub async fn usb_discover(&self) -> anyhow::Result<HashSet<InstrumentInfo>> {
-        let mut discovery_results: HashSet<InstrumentInfo> = HashSet::new();
-
-        match Usbtmc::usb_discover(self.timeout).await {
-            Ok(instrs) => {
-                for inst in instrs {
-                    discovery_results.insert(inst);
-                }
-            }
-            Err(e) => {
-                eprintln!("Unable to discover USB devices: {e}"); //TODO add color
-                return Err(e);
-            }
-        }
-        Ok(discovery_results)
-    }
-
     pub async fn visa_discover(&self) -> anyhow::Result<HashSet<InstrumentInfo>> {
         visa_discover(self.timeout).await
     }

diff --git a/kic-discover-visa/src/lib.rs b/kic-discover-visa/src/lib.rs
@@ -2,7 +2,6 @@ use std::{collections::HashSet, hash::Hash, io::Error, sync::Mutex};
 
 pub mod ethernet;
 pub mod instrument_discovery;
-pub mod usbtmc;
 pub mod visa;
 
 #[macro_use]
@@ -128,6 +127,6 @@ pub fn insert_disc_device(device: &str) -> Result<(), Error> {
 #[derive(Debug, Clone, Eq, PartialEq, PartialOrd, Hash, serde::Serialize, serde::Deserialize)]
 enum IoType {
     Lan,
-    Usb,
     Visa,
+    Usb,
 }
diff --git a/kic-discover-visa/src/main.rs b/kic-discover-visa/src/main.rs
@@ -45,10 +45,6 @@ struct Cli {
 enum SubCli {
     /// Look for all devices connected on LAN
     Lan(DiscoverCmd),
-
-    /// Look for all devices connected on USB
-    //Usb(DiscoverCmd),
-
     /// Look for all devices that can be connected to via the installed VISA driver
     Visa(DiscoverCmd),
     /// Look for all devices on all interface types.
@@ -264,24 +260,6 @@ async fn main() -> anyhow::Result<()> {
             trace!("Discovered instruments: {lan_instruments:?}");
             lan_instruments
         }
-        //SubCli::Usb(args) => {
-        //    start_logger(&args.verbose, &args.log_file, &args.log_socket)?;
-        //    info!("Discovering USB instruments");
-        //    #[allow(clippy::mutable_key_type)]
-        //    let usb_instruments = match discover_usb().await {
-        //        Ok(i) => i,
-        //        Err(e) => {
-        //            error!("Error in USB discovery: {e}");
-        //            return Err(e);
-        //        }
-        //    };
-        //    info!("USB Discovery complete");
-        //    trace!("Discovered {} USB instruments", usb_instruments.len());
-        //    trace!("Discovered instruments: {usb_instruments:?}");
-        //    for instrument in usb_instruments {
-        //        println!("{instrument}");
-        //    }
-        //}
         SubCli::Visa(args) => {
             start_logger(&args.verbose, &args.log_file, &args.log_socket)?;
             info!("Discovering VISA instruments");
@@ -300,22 +278,6 @@ async fn main() -> anyhow::Result<()> {
         }
         SubCli::All(args) => {
             start_logger(&args.verbose, &args.log_file, &args.log_socket)?;
-            //info!("Discovering USB instruments");
-            //#[allow(clippy::mutable_key_type)]
-            //let usb_instruments = match discover_usb().await {
-            //    Ok(i) => i,
-            //    Err(e) => {
-            //        error!("Error in USB discovery: {e}");
-            //        return Err(e);
-            //    }
-            //};
-            //info!("USB Discovery complete");
-            //trace!("Discovered {} USB instruments", usb_instruments.len());
-            //println!("Discovered {} USB instruments", usb_instruments.len());
-            //trace!("Discovered USB instruments: {usb_instruments:?}");
-            //for instrument in usb_instruments {
-            //    println!("{instrument}");
-            //}
 
             info!("Discovering VISA instruments");
             #[allow(clippy::mutable_key_type)]
@@ -424,11 +386,3 @@ async fn discover_visa(args: DiscoverCmd) -> anyhow::Result<HashSet<InstrumentIn
 
     Ok(instruments)
 }
-
-//async fn discover_usb() -> anyhow::Result<HashSet<InstrumentInfo>> {
-//    let dur = Duration::from_secs(5); //Not used in USB
-//    let discover_instance = InstrumentDiscovery::new(dur);
-//    let instruments = discover_instance.usb_discover().await?;
-//
-//    Ok(instruments)
-//}