move flash/clean to title commands

microsoft · Sep 25, 2023 · 966a659 · 966a659
1 parent 132d010
commit 966a659
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 36 deletions.
diff --git a/vscode/package.json b/vscode/package.json
@@ -338,6 +338,14 @@
                     "when": "view == extension.devicescript.jdom && extension.devicescript.console.data",
                     "group": "navigation"
                 },
+                {
+                    "command": "extension.devicescript.device.flash",
+                    "when": "!inDebugMode && view == extension.devicescript.jdom"
+                },
+                {
+                    "command": "extension.devicescript.device.clean",
+                    "when": "!inDebugMode && view == extension.devicescript.jdom"
+                },
                 {
                     "command": "extension.devicescript.watch.clear",
                     "when": "view =~ /extension\\.devicescript\\.(dbg)?watch/",
@@ -521,6 +529,10 @@
                     "command": "extension.devicescript.device.flash",
                     "when": "workbenchState != empty"
                 },
+                {
+                    "command": "extension.devicescript.device.clean",
+                    "when": "workbenchState != empty"
+                },
                 {
                     "command": "extension.devicescript.simulator.start",
                     "when": "workbenchState != empty"
@@ -651,6 +663,11 @@
                 "title": "Flash Firmware...",
                 "category": "DeviceScript"
             },
+            {
+                "command": "extension.devicescript.device.clean",
+                "title": "Clean Flash...",
+                "category": "DeviceScript"
+            },
             {
                 "command": "extension.devicescript.sims.add",
                 "title": "Add Sim...",

diff --git a/vscode/src/activateDeviceScript.ts b/vscode/src/activateDeviceScript.ts
@@ -151,6 +151,15 @@ export function activateDeviceScript(context: vscode.ExtensionContext) {
                         : device
                 )
         ),
+        vscode.commands.registerCommand(
+            "extension.devicescript.device.clean",
+            (device?: JDomDeviceTreeItem | JDDevice) =>
+                extensionState.cleanFirmware(
+                    device instanceof JDomDeviceTreeItem
+                        ? device.device
+                        : device
+                )
+        ),
         vscode.commands.registerCommand(
             "extension.devicescript.connect",
             async () => extensionState.connect()

diff --git a/vscode/src/state.ts b/vscode/src/state.ts
@@ -580,15 +580,16 @@ export class DeviceScriptExtensionState extends JDEventSource {
     }
 
     async cleanFirmware(device?: JDDevice) {
-        const board = await this.resolveBoardDefinition(device)
-        if (!board) return
         if (
             !(await showConfirmBox(
-                `The entire flash on ${board.devName} will be erased. There is NO undo. Confirm?`
+                `The entire flash will be erased. There is NO undo. Confirm?`
             ))
         )
             return
 
+        const board = await this.resolveBoardDefinition(device)
+        if (!board) return
+
         // force disconnect
         await this.disconnect()
 
@@ -652,7 +653,10 @@ export class DeviceScriptExtensionState extends JDEventSource {
     get isRemote() {
         const config = vscode.workspace.getConfiguration("devicescript.connect")
         const { extensionKind } = this.context.extension
-        return extensionKind === vscode.ExtensionKind.Workspace || !!config.get("web")
+        return (
+            extensionKind === vscode.ExtensionKind.Workspace ||
+            !!config.get("web")
+        )
     }
 
     async connect() {
@@ -675,20 +679,19 @@ export class DeviceScriptExtensionState extends JDEventSource {
                 transport: "web",
                 label: "WebSerial/WebUSB",
                 detail: "ESP32, RP2040, ...",
-                description: "Connect through an external web page running client side."
+                description:
+                    "Connect through an external web page running client side.",
             })
-
         } else {
             const serial = transports.find(t => t.type === "serial")
-            items.push(
-                {
-                    transport: "serial",
-                    label: "Serial",
-                    detail: "ESP32, RP2040, ...",
-                    description: serial
-                        ? `${serial.description || ""}(${serial.connectionState})`
-                        : "",
-                })
+            items.push({
+                transport: "serial",
+                label: "Serial",
+                detail: "ESP32, RP2040, ...",
+                description: serial
+                    ? `${serial.description || ""}(${serial.connectionState})`
+                    : "",
+            })
         }
         items.push(
             !!connecteds.length && {
@@ -707,20 +710,6 @@ export class DeviceScriptExtensionState extends JDEventSource {
                 description: `Simulator`,
                 detail: `A virtual DeviceScript interpreter running in a separate process.`,
                 transport: simulatorScriptManagerId,
-            },
-            {
-                label: "Firmware Tools",
-                kind: vscode.QuickPickItemKind.Separator,
-            },
-            {
-                label: "Flash Firmware...",
-                transport: "flash",
-                detail: "Flash the DeviceScript runtime on new devices.",
-            },
-            {
-                label: "Clean Flash...",
-                transport: "clean",
-                detail: "Erase the entire flash.",
             }
         )
         items = items.filter(m => !!m)
@@ -730,8 +719,6 @@ export class DeviceScriptExtensionState extends JDEventSource {
         if (res === undefined || !res.transport) return
 
         if (res.transport === "web") await this.openExternalConnect()
-        else if (res.transport === "flash") await this.flashFirmware()
-        else if (res.transport === "clean") await this.cleanFirmware()
         else if (res.transport === simulatorScriptManagerId)
             await this.startSimulator()
         else
@@ -747,9 +734,7 @@ export class DeviceScriptExtensionState extends JDEventSource {
 
     private async openExternalConnect() {
         const darkMode = resolveDarkMode()
-        const connectUri = await resolveDevtoolsPath(
-            `connect?${darkMode}=1`
-        )
+        const connectUri = await resolveDevtoolsPath(`connect?${darkMode}=1`)
         console.log({ connectUri })
         await vscode.env.openExternal(connectUri)
     }
@@ -900,8 +885,9 @@ export class DeviceScriptExtensionState extends JDEventSource {
                     .register(ControlReg.DeviceDescription)
                 await description.refresh(true)
 
-                return `${description.stringValue || ""} (${runtimeVersion || "?"
-                    })`
+                return `${description.stringValue || ""} (${
+                    runtimeVersion || "?"
+                })`
             }
             const items: DeviceQuickItem[] = await Promise.all(
                 services.map(