Fixed run config and target selection

Signed-off-by: paulober <[email protected]>
raspberrypi · Oct 1, 2024 · 1dbcd2c · 1dbcd2c
1 parent 64d27cb
commit 1dbcd2c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/commands/launchTargetPath.mts b/src/commands/launchTargetPath.mts
@@ -89,7 +89,7 @@ export default class LaunchTargetPathCommand extends CommandWithResult<string> {
           chip === "rp2040"
             ? "thumbv6m-none-eabi"
             : chip === "rp2350"
-            ? "thumbv8m.main-none-eabi"
+            ? "thumbv8m.main-none-eabihf"
             : "riscv32imac-unknown-none-elf";
 
         return joinPosix(
@@ -179,10 +179,20 @@ export class LaunchTargetPathReleaseCommand extends CommandWithResult<string> {
       | undefined;
 
     if (cargoToml?.package?.name) {
+      const chip = rustProjectGetSelectedChip(
+        workspace.workspaceFolders[0].uri.fsPath
+      );
+      const toolchain =
+        chip === "rp2040"
+          ? "thumbv6m-none-eabi"
+          : chip === "rp2350"
+          ? "thumbv8m.main-none-eabihf"
+          : "riscv32imac-unknown-none-elf";
+
       return joinPosix(
         workspace.workspaceFolders[0].uri.fsPath.replaceAll("\\", "/"),
         "target",
-        "thumbv6m-none-eabi",
+        toolchain,
         "release",
         cargoToml.package.name
       );

diff --git a/src/commands/switchBoard.mts b/src/commands/switchBoard.mts
@@ -135,7 +135,7 @@ export default class SwitchBoardCommand extends Command {
         board === "RP2040"
           ? "thumbv6m-none-eabi"
           : board === "RP2350"
-          ? "thumbv8m.main-none-eabi"
+          ? "thumbv8m.main-none-eabihf"
           : "riscv32imac-unknown-none-elf";
 
       await workspace

diff --git a/src/utils/projectGeneration/projectRust.mts b/src/utils/projectGeneration/projectRust.mts
@@ -147,13 +147,13 @@ async function generateVSCodeConfig(projectRoot: string): Promise<boolean> {
       },
       {
         label: "Run Project",
-        type: "process",
+        type: "shell",
         dependsOn: "Compile Project",
         command: `\${command:${extensionName}.${GetPicotoolPathCommand.id}}`,
         args: [
           "load",
           "-x",
-          "${command:raspberry-pi-pico.launchTargetPath}",
+          "${command:raspberry-pi-pico.launchTargetPathRelease}",
           "-t",
           "elf",
           "-f",