Switch to probe-rs for debugging

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

Author: paulober

scripts/rttDecoder.cjs

@@ -227,7 +227,8 @@ export class GetCxxCompilerPathCommand extends CommandWithResult<string> {
     }
 
     return join(
-      buildToolchainPath(toolchainVersion), "bin",
+      buildToolchainPath(toolchainVersion),
+      "bin",
       triple + `-g++${process.platform === "win32" ? ".exe" : ""}`
     );
   }
@@ -236,8 +237,10 @@ export class GetCxxCompilerPathCommand extends CommandWithResult<string> {
 export class GetChipCommand extends CommandWithResult<string> {
   private readonly _logger = new Logger("GetChipCommand");
 
+  public static readonly id = "getChip";
+
   constructor() {
-    super("getChip");
+    super(GetChipCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -260,7 +263,15 @@ export class GetChipCommand extends CommandWithResult<string> {
         return "";
       }
 
-      return chip;
+      switch (chip) {
+        case "rp2040":
+          return "rp2040";
+        case "rp2350":
+        case "rp2350-riscv":
+          return "rp235x";
+        default:
+          return "rp2040";
+      }
     }
 
     const settings = Settings.getInstance();

scripts/rttDecoder.mjs

@@ -94,7 +94,6 @@ import {
 import State from "./state.mjs";
 import { cmakeToolsForcePicoKit } from "./utils/cmakeToolsUtil.mjs";
 import { NewRustProjectPanel } from "./webview/newRustProjectPanel.mjs";
-import GetRTTDecoderPathCommand from "./commands/rttDecoder.mjs";
 import { OPENOCD_VERSION } from "./utils/sharedConstants.mjs";
 
 export async function activate(context: ExtensionContext): Promise<void> {
@@ -275,11 +274,11 @@ export async function activate(context: ExtensionContext): Promise<void> {
       !existsSync(join(workspaceFolder.uri.fsPath, ".vscode")) ||
       !(
         readFileSync(cmakeListsFilePath)
-            .toString("utf-8")
-            .includes(CMAKE_DO_NOT_EDIT_HEADER_PREFIX) ||
+          .toString("utf-8")
+          .includes(CMAKE_DO_NOT_EDIT_HEADER_PREFIX) ||
         readFileSync(cmakeListsFilePath)
-            .toString("utf-8")
-            .includes(CMAKE_DO_NOT_EDIT_HEADER_PREFIX_OLD)
+          .toString("utf-8")
+          .includes(CMAKE_DO_NOT_EDIT_HEADER_PREFIX_OLD)
       )
     ) {
       Logger.warn(
@@ -872,7 +871,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
     await configureCmakeNinja(workspaceFolder.uri);
 
     const ws = workspaceFolder.uri.fsPath;
-    const cMakeCachePath = join(ws, "build","CMakeCache.txt");
+    const cMakeCachePath = join(ws, "build", "CMakeCache.txt");
     const newBuildType = cmakeGetPicoVar(cMakeCachePath, "CMAKE_BUILD_TYPE");
     ui.updateBuildType(newBuildType ?? "unknown");