report error if USBTMC refresh button fails

eez-open · Feb 5, 2025 · f719719 · f719719
1 parent 4587c03
commit f719719
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/packages/eez-studio-ui/notification.tsx b/packages/eez-studio-ui/notification.tsx
@@ -22,7 +22,7 @@ export function warn(message: string, options?: ToastOptions) {
 }
 
 export function error(message: string, options?: ToastOptions) {
-    return toast.error(message, options);
+    return toast.error(message, Object.assign({ autoClose: false }, options));
 }
 
 export function update(toastId: ToastId, options: UpdateOptions) {

diff --git a/packages/instrument/window/connection-dialog.tsx b/packages/instrument/window/connection-dialog.tsx
@@ -4,6 +4,8 @@ import { observable, action, runInAction, autorun, makeObservable } from "mobx";
 import { observer } from "mobx-react";
 const os = require("os");
 
+import * as notification from "eez-studio-ui/notification";
+
 import { objectClone } from "eez-studio-shared/util";
 
 import {
@@ -181,7 +183,7 @@ export const ConnectionProperties = observer(
 
                     // TODO doesn't work on Raspbian
                     if (process.arch != "arm") {
-                        await this.refreshUsbDevices();
+                        await this.refreshUsbDevices(false);
                     }
                 } else {
                     this.initUsbDevices();
@@ -357,22 +359,28 @@ export const ConnectionProperties = observer(
             this.selectedUsbDeviceIndex = selectedUsbDeviceIndex;
         }
 
-        async refreshUsbDevices() {
+        async refreshUsbDevices(reportError: boolean) {
             const { getUsbDevices } =
                 require("instrument/connection/interfaces/usbtmc") as typeof UsbTmcModule;
 
-            const usbDevices = await getUsbDevices();
+            try {
+                const usbDevices = await getUsbDevices();
 
-            runInAction(() => {
-                devices.usbDevices = usbDevices;
-            });
+                runInAction(() => {
+                    devices.usbDevices = usbDevices;
+                });
 
-            this.initUsbDevices();
+                this.initUsbDevices();
+            } catch (err) {
+                if (reportError) {
+                    notification.error(err.toString());
+                }
+            }
         }
 
         onRefreshUsbDevices = (event: React.MouseEvent) => {
             event.preventDefault();
-            this.refreshUsbDevices();
+            this.refreshUsbDevices(true);
         };
 
         refreshVisaResources(includeNetworkResources: boolean) {