Merge 41bddf7 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

@@ -19,9 +19,10 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ## [1.4.1]
 
 ### Added
-- \[Beta] Add ability to save script output to a file
-- \[Beta] Add ability to save buffer contents to a file
-- \[Beta] Add ability to start and stop saving commands and output to a file
+- \[Beta] Data Export Feature
+    - \[Beta] Add ability to save script output to a file
+    - \[Beta] Add ability to save buffer contents to a file
+    - \[Beta] Add ability to start and stop saving commands and output to a file
 - Instrument login support for debugger
 
 ### Fixed
@@ -31,6 +32,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

@@ -17,6 +17,10 @@ TSP-enabled Tektronix and Keithley instruments. This toolkit delivers a complete
 * **Script Debugging** - On-instrument debugging with breakpoints, step execution, and variable inspection.
 * **Automated Script Generation** - Configuration-driven interface to create TSP scripts without manual coding.
 * **System Configuration Management** - Support for TSP-Link™ networks and multi-instrument setups.
+* **\[Beta] Data Export**
+    - **\[Beta]** Save script output to a file
+    - **\[Beta]** Save buffer contents to a file
+    - **\[Beta]** Start and stop saving commands and output to a file
 
 ## Quick Start
 
@@ -39,7 +43,7 @@ TSP-enabled Tektronix and Keithley instruments. This toolkit delivers a complete
 
 ## Demo Video
 
-<a href="https://www.youtube.com/watch?v=Srq5LtOH5UA"><img width="560" height="315" src="./resources/DemoVideoThumbnail.png" altText="TSP Toolkit Demo Video"></img></a>
+<a href="https://www.youtube.com/watch?v=Srq5LtOH5UA"><img width="560" height="315" src="https://github.com/tektronix/tsp-toolkit/blob/main/resources/DemoVideoThumbnail.png?raw=true" altText="TSP Toolkit Demo Video"></img></a>
 
 
 ## TSP View Container
@@ -81,6 +85,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 +113,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
 
@@ -230,6 +237,8 @@ Extensions installed through the marketplace are subject to the [Marketplace Ter
 - [App Note: How to Write TSP Scripts for TSP][app-note-how-to-write-tsp-scripts]
 - [App Note: Effortless Script Generation with TSP Toolkit ][app-note-script-gen]
 - [TSP Script Example Repository][tsp-script-examples]
+    - Clone or download the ZIP file of the repository using the "Code" button
+    ![Clone or download from GitHub using the "Code" button][pic-example-repo-download]
 
 ### Supported Locales
 
@@ -313,3 +322,4 @@ for more information.
 <!--Pics-->
 [pic-send-script-to-terminal]: https://github.com/tektronix/tsp-toolkit/blob/main/images/SendScriptToTerminal.png?raw=true
 [pic-open-folder]: https://github.com/tektronix/tsp-toolkit/blob/main/images/OpenFolder.png?raw=true
+[pic-example-repo-download]: https://github.com/tektronix/tsp-toolkit/blob/main/images/ExampleRepoDownload.png?raw=true

images/ExampleRepoDownload.png

@@ -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,12 +673,12 @@
         "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/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"
+        "@tektronix/kic-cli-darwin-arm64": "0.21.2",
+        "@tektronix/kic-cli-linux-x64": "0.21.2",
+        "@tektronix/kic-cli-win32-x64": "0.21.2",
+        "@tektronix/script-gen-darwin-arm64": "0.1.1",
+        "@tektronix/script-gen-linux-x64": "0.1.1",
+        "@tektronix/script-gen-win32-x64": "0.1.1"
     },
     "extensionDependencies": [
         "sumneko.lua"

package-lock.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())
 }