Fix: Terminal Closure Does Not Clean up Instrument (#37)

tektronix · Jul 31, 2024 · afbb658 · afbb658
1 parent e69c8d2
commit afbb658
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ## [0.17.0]
 
 ### Added
+- Reset instrument if closed unexpectedly using the trashcan on the terminal (TSP-730)
 - Add logging for terminal and discover
 - Default friendly name if user doesn't provide one (TSP-757)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -325,7 +325,7 @@
     },
     "dependencies": {
         "@tektronix/keithley_instrument_libraries": "0.16.0",
-        "@tektronix/kic-cli": "0.17.0-1",
+        "@tektronix/kic-cli": "0.17.0-2",
         "@tektronix/web-help-documents": "0.15.3",
         "@types/cheerio": "^0.22.35",
         "cheerio": "^1.0.0-rc.12",

diff --git a/src/resourceManager.ts b/src/resourceManager.ts
@@ -408,6 +408,24 @@ export class KicCell extends EventEmitter {
             })
         }
 
+        vscode.window.onDidCloseTerminal((t) => {
+            if (
+                t.creationOptions.iconPath !== undefined &&
+                t.creationOptions.iconPath.toString().search("keithley-logo") &&
+                t.exitStatus !== undefined &&
+                t.exitStatus.reason !== vscode.TerminalExitReason.Process
+            ) {
+                setTimeout(() => {
+                    child.spawnSync(EXECUTABLE, [
+                        "-v",
+                        "reset",
+                        connType,
+                        unique_id,
+                    ])
+                }, 500)
+            }
+        })
+
         this.terminalPid = this._term.processId
 
         if (this._term != undefined) {