Change Language of an Instrument to TSP On Info (#47)

CHANGELOG.md

@@ -22,9 +22,15 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 - Determining supported instruments now depends on `kic-lib` implementation, not
   a local re-implementation.
+- Change instrument language during an `info` command.
 
 ## [0.19.0]
 
+### Changed
+
+- For instruments that support both SCPI and TSP command languages, force the
+  command language to TSP when doing `kic info`
+
 ### Added
 
 - Added the `dump` subcommand to connect to an instrument and dump out the contents

Cargo.toml

@@ -39,7 +39,7 @@ serde_json = "1.0.114"
 thiserror = "2.0.3"
 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.19.0" }
+tsp-toolkit-kic-lib = { git = "https://github.com/tektronix/tsp-toolkit-kic-lib.git", tag = "v0.19.1" }
 
 [workspace.lints.rust]
 warnings = "deny"

kic-visa/src/main.rs

@@ -36,7 +36,10 @@ use tracing::{debug, error, info, instrument, level_filters::LevelFilter, trace,
 use tracing_subscriber::{layer::SubscriberExt, Layer, Registry};
 
 use tsp_toolkit_kic_lib::{
-    instrument::Instrument, interface::async_stream::AsyncStream, protocol::Protocol, Interface,
+    instrument::{CmdLanguage, Instrument},
+    interface::async_stream::AsyncStream,
+    protocol::Protocol,
+    Interface,
 };
 
 #[derive(Debug, Subcommand)]
@@ -998,6 +1001,15 @@ fn info(args: &ArgMatches) -> anyhow::Result<()> {
         unreachable!("arguments didn't exist")
     };
 
+    match instrument.get_language() {
+        Ok(CmdLanguage::Tsp) => {}
+        Ok(_) => match instrument.change_language(CmdLanguage::Tsp) {
+            Ok(_) => {}
+            Err(e) => error!("Error setting instrument language to TSP: {e}"),
+        },
+        Err(e) => error!("Unable to determine instrument language: {e}"),
+    }
+
     let json: bool = *args.get_one::<bool>("json").unwrap_or(&true);
 
     let info = match instrument.info() {

kic/src/main.rs

@@ -34,7 +34,10 @@ use tracing::{debug, error, info, instrument, level_filters::LevelFilter, trace,
 use tracing_subscriber::{layer::SubscriberExt, Layer, Registry};
 
 use tsp_toolkit_kic_lib::{
-    instrument::Instrument, interface::async_stream::AsyncStream, protocol::Protocol, Interface,
+    instrument::{CmdLanguage, Instrument},
+    interface::async_stream::AsyncStream,
+    protocol::Protocol,
+    Interface,
 };
 
 #[derive(Debug, Subcommand)]
@@ -987,6 +990,15 @@ fn info(args: &ArgMatches) -> anyhow::Result<()> {
         unreachable!("arguments didn't exist")
     };
 
+    match instrument.get_language() {
+        Ok(CmdLanguage::Tsp) => {}
+        Ok(_) => match instrument.change_language(CmdLanguage::Tsp) {
+            Ok(_) => {}
+            Err(e) => error!("Error setting instrument language to TSP: {e}"),
+        },
+        Err(e) => error!("Unable to determine instrument language: {e}"),
+    }
+
     let json: bool = *args.get_one::<bool>("json").unwrap_or(&true);
 
     let info = match instrument.info() {