WIP

Signed-off-by: paulober <[email protected]>

Author: paulober

package.json

@@ -94,6 +94,12 @@
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.launchTargetPathRelease",
+        "title": "Get path of the project release executable (rust only)",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.getPythonPath",
         "title": "Get python path",
@@ -148,6 +154,12 @@
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.getOpenOCDRoot",
+        "title": "Get OpenOCD root",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.compileProject",
         "title": "Compile Pico Project",
@@ -158,7 +170,7 @@
         "command": "raspberry-pi-pico.runProject",
         "title": "Run Pico Project (USB)",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
+        "enablement": "raspberry-pi-pico.isPicoProject"
       },
       {
         "command": "raspberry-pi-pico.clearGithubApiCache",
@@ -169,7 +181,7 @@
         "command": "raspberry-pi-pico.conditionalDebugging",
         "title": "Conditional Debugging",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject && !inQuickOpen && !raspberry-pi-pico.isRustProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !inQuickOpen"
       },
       {
         "command": "raspberry-pi-pico.debugLayout",

src/commands/conditionalDebugging.mts

@@ -1,6 +1,8 @@
-import { Command } from "./command.mjs";
+import { Command, extensionName } from "./command.mjs";
 import Logger from "../logger.mjs";
-import { commands } from "vscode";
+import { commands, window, workspace, debug } from "vscode";
+import State from "../state.mjs";
+import DebugLayoutCommand from "./debugLayout.mjs";
 
 /**
  * Relay command for the default buildin debug select and start command.
@@ -16,6 +18,23 @@ export default class ConditionalDebuggingCommand extends Command {
   }
 
   async execute(): Promise<void> {
+    const isRustProject = State.getInstance().isRustProject;
+
+    if (isRustProject) {
+      const wsFolder = workspace.workspaceFolders?.[0];
+      if (!wsFolder) {
+        this._logger.error("No workspace folder found.");
+        void window.showErrorMessage("No workspace folder found.");
+
+        return;
+      }
+
+      void commands.executeCommand(`${extensionName}.${DebugLayoutCommand.id}`);
+      void debug.startDebugging(wsFolder, "rp2040-project");
+
+      return;
+    }
+
     await commands.executeCommand("workbench.action.debug.selectandstart");
   }
 }

src/commands/getPaths.mts

@@ -8,14 +8,17 @@ import {
 } from "../utils/cmakeUtil.mjs";
 import { join } from "path";
 import {
+  buildOpenOCDPath,
   buildPicotoolPath,
   buildToolchainPath,
+  downloadAndInstallOpenOCD,
   downloadAndInstallPicotool,
 } from "../utils/download.mjs";
 import Settings, { SettingsKey } from "../settings.mjs";
 import which from "which";
 import { execSync } from "child_process";
 import { getPicotoolReleases } from "../utils/githubREST.mjs";
+import { openOCDVersion } from "../webview/newProjectPanel.mjs";
 
 export class GetPythonPathCommand extends CommandWithResult<string> {
   constructor() {
@@ -143,7 +146,8 @@ export class GetCompilerPathCommand extends CommandWithResult<string> {
     }
 
     return join(
-      buildToolchainPath(toolchainVersion), "bin",
+      buildToolchainPath(toolchainVersion),
+      "bin",
       triple + `-gcc${process.platform === "win32" ? ".exe" : ""}`
     );
   }
@@ -301,8 +305,10 @@ export class GetPicotoolPathCommand extends CommandWithResult<
 > {
   private running: boolean = false;
 
+  public static readonly id = "getPicotoolPath";
+
   constructor() {
-    super("getPicotoolPath");
+    super(GetPicotoolPathCommand.id);
   }
 
   async execute(): Promise<string | undefined> {
@@ -343,3 +349,35 @@ export class GetPicotoolPathCommand extends CommandWithResult<
     );
   }
 }
+
+export class GetOpenOCDRootCommand extends CommandWithResult<
+  string | undefined
+> {
+  private running: boolean = false;
+
+  public static readonly id = "getOpenOCDRoot";
+
+  constructor() {
+    super(GetOpenOCDRootCommand.id);
+  }
+
+  async execute(): Promise<string | undefined> {
+    if (this.running) {
+      return undefined;
+    }
+    this.running = true;
+
+    // check if it is installed if not install it
+    const result = await downloadAndInstallOpenOCD(openOCDVersion);
+
+    if (result === null || !result) {
+      this.running = false;
+
+      return undefined;
+    }
+
+    this.running = false;
+
+    return buildOpenOCDPath(openOCDVersion);
+  }
+}

src/commands/launchTargetPath.mts

@@ -3,10 +3,15 @@ import { CommandWithResult } from "./command.mjs";
 import { commands, window, workspace } from "vscode";
 import { join } from "path";
 import Settings, { SettingsKey } from "../settings.mjs";
+import State from "../state.mjs";
+import { parse as parseToml } from "toml";
+import { join as joinPosix } from "path/posix";
 
 export default class LaunchTargetPathCommand extends CommandWithResult<string> {
+  public static readonly id = "launchTargetPath";
+
   constructor() {
-    super("launchTargetPath");
+    super(LaunchTargetPathCommand.id);
   }
 
   private async readProjectNameFromCMakeLists(
@@ -61,6 +66,33 @@ export default class LaunchTargetPathCommand extends CommandWithResult<string> {
       return "";
     }
 
+    const isRustProject = State.getInstance().isRustProject;
+
+    if (isRustProject) {
+      const cargoTomlPath = join(
+        workspace.workspaceFolders[0].uri.fsPath,
+        "Cargo.toml"
+      );
+      const contents = readFileSync(cargoTomlPath, "utf-8");
+      const cargoToml = (await parseToml(contents)) as
+        | {
+            package?: { name?: string };
+          }
+        | undefined;
+
+      if (cargoToml?.package?.name) {
+        return joinPosix(
+          workspace.workspaceFolders[0].uri.fsPath.replaceAll("\\", "/"),
+          "target",
+          "thumbv6m-none-eabi",
+          "debug",
+          cargoToml.package.name
+        );
+      }
+
+      return "";
+    }
+
     const settings = Settings.getInstance();
     if (
       settings !== undefined &&
@@ -102,3 +134,49 @@ export default class LaunchTargetPathCommand extends CommandWithResult<string> {
     );
   }
 }
+
+export class LaunchTargetPathReleaseCommand extends CommandWithResult<string> {
+  public static readonly id = "launchTargetPathRelease";
+
+  constructor() {
+    super(LaunchTargetPathReleaseCommand.id);
+  }
+
+  async execute(): Promise<string> {
+    if (
+      workspace.workspaceFolders === undefined ||
+      workspace.workspaceFolders.length === 0
+    ) {
+      return "";
+    }
+
+    const isRustProject = State.getInstance().isRustProject;
+
+    if (!isRustProject) {
+      return "";
+    }
+
+    const cargoTomlPath = join(
+      workspace.workspaceFolders[0].uri.fsPath,
+      "Cargo.toml"
+    );
+    const contents = readFileSync(cargoTomlPath, "utf-8");
+    const cargoToml = (await parseToml(contents)) as
+      | {
+          package?: { name?: string };
+        }
+      | undefined;
+
+    if (cargoToml?.package?.name) {
+      return joinPosix(
+        workspace.workspaceFolders[0].uri.fsPath.replaceAll("\\", "/"),
+        "target",
+        "thumbv6m-none-eabi",
+        "release",
+        cargoToml.package.name
+      );
+    }
+
+    return "";
+  }
+}