Merge f3498de into a2b78bd

Author: jharajeev55

.vscode/settings.json

@@ -21,9 +21,11 @@
     "typescript.tsc.autoDetect": "off",
     "cSpell.words": [
         "categ",
+        "hislip",
         "IIDN",
         "LOGLOC",
-        "rclick"
+        "rclick",
+        "TCPIP"
     ],
     "Lua.workspace.ignoreDir": [],
     "Lua.diagnostics.libraryFiles": "Disable",

CHANGELOG.md

@@ -31,6 +31,9 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 - (**tsp-toolkit-kic-cli**) Fixed timeout issue with upgrading instruments over USB
 - (**tsp-toolkit-kic-cli**) Fixed issue with writing a zero-sized TSP script to an instrument
 
+### Changed
+- (**tsp-toolkit-kic-cli**) When discovering VISA instruments, enumerate from VISA multiple times
+
 ## [1.4.0]
 
 ### Fixed

README.md

@@ -81,6 +81,8 @@ The Instrument Explorer provides an intuitive interface for discovering, connect
 - **Firmware Upgrade**: Upgrade instrument firmware directly from the explorer interface.
 - **Terminal Integration**: Open terminal connections to instruments with a single click.
 - **Reset & Abort**: Control instrument state with reset and abort functions.
+- **\[Beta] Save Buffers to File**: Save the contents of a reading buffer to a CSV-format file
+- **\[Beta] Save Commands and Output to File**: Save any proceeding commands and their output to a file
 
 ### Terminal Usage
 
@@ -107,6 +109,7 @@ To execute your TSP scripts on connected instruments, you can perform one of the
 
 1. Right-click a TSP file in the explorer or editor and select "Send Script to Terminal"
 2. Click the Run icon in the editor title bar when a TSP file is open
+3. \[Beta] Save the output of a script to a file by clicking on the "\[Beta] Save TSP Script Output" option under the run/debug icon drop down at the top of the editor
 
 ### Automated TSP Script Generation
 

package-lock.json

@@ -206,8 +206,8 @@
                 "icon": "$(edit)"
             },
             {
-                "command": "InstrumentsExplorer.updateIPAddr",
-                "title": "Update IP Address",
+                "command": "InstrumentsExplorer.updateInstrumentAddr",
+                "title": "Update Instrument Address",
                 "icon": "$(edit)"
             },
             {
@@ -451,7 +451,7 @@
                     "group": "inline"
                 },
                 {
-                    "command": "InstrumentsExplorer.updateIPAddr",
+                    "command": "InstrumentsExplorer.updateInstrumentAddr",
                     "when": "view == InstrumentsExplorer && viewItem =~ /CONN.*Enabled.*/ && viewItem =~ /CONN.*Active.*/ && !(viewItem =~ /.*Connected.*/)",
                     "group": "inline"
                 },
@@ -673,9 +673,9 @@
         "xml-js": "1.6.11"
     },
     "optionalDependencies": {
-        "@tektronix/kic-cli-darwin-arm64": "0.21.2-4",
-        "@tektronix/kic-cli-linux-x64": "0.21.2-4",
-        "@tektronix/kic-cli-win32-x64": "0.21.2-4",
+        "@tektronix/kic-cli-darwin-arm64": "0.21.2-8",
+        "@tektronix/kic-cli-linux-x64": "0.21.2-8",
+        "@tektronix/kic-cli-win32-x64": "0.21.2-8",
         "@tektronix/script-gen-darwin-arm64": "0.1.1-0",
         "@tektronix/script-gen-linux-x64": "0.1.1-0",
         "@tektronix/script-gen-win32-x64": "0.1.1-0"

package.json

@@ -48,6 +48,7 @@ export function activateTspDebug(
                     Log.error("No connection available for debugging", LOGLOC)
                     return
                 }
+                await conn.exitConnection()
 
                 // Set up debug helper
                 DebugHelper.debuggeeFilePath = targetResource.fsPath
@@ -184,16 +185,5 @@ class InlineDebugAdapterFactory implements DebugAdapterDescriptorFactory {
 }
 
 async function get_connection(): Promise<Connection | undefined> {
-    let connection = await getActiveConnection()
-
-    if (!connection) {
-        connection = await pickConnection()
-    }
-    if (!connection) {
-        return undefined
-    }
-
-    await connection.connectAndExit()
-
-    return connection
+    return (await getActiveConnection()) || (await pickConnection())
 }