Add Zephyr support

package.json

@@ -66,6 +66,7 @@
   "activationEvents": [
     "workspaceContains:./pico_sdk_import.cmake",
     "workspaceContains:./.pico-rs",
+    "workspaceContains:./prj.conf",
     "onWebviewPanel:newPicoProject",
     "onWebviewPanel:newPicoMicroPythonProject"
   ],
@@ -80,13 +81,13 @@
         "command": "raspberry-pi-pico.switchSDK",
         "title": "Switch Pico SDK",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject && !raspberry-pi-pico.isZephyrProject"
       },
       {
         "command": "raspberry-pi-pico.switchBoard",
         "title": "Switch Board",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
+        "enablement": "raspberry-pi-pico.isPicoProject"
       },
       {
         "command": "raspberry-pi-pico.launchTargetPath",
@@ -159,13 +160,25 @@
         "title": "Get OpenOCD root",
         "category": "Raspberry Pi Pico",
         "enablement": "false"
-      },
+      },      
       {
         "command": "raspberry-pi-pico.getSVDPath",
         "title": "Get SVD Path (rust only)",
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.getWestPath",
+        "title": "Get West path",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
+      {
+        "command": "raspberry-pi-pico.getZephyrWorkspacePath",
+        "title": "Get Zephyr workspace path",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.compileProject",
         "title": "Compile Pico Project",
@@ -210,7 +223,7 @@
         "command": "raspberry-pi-pico.switchBuildType",
         "title": "Switch Build Type",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject && !raspberry-pi-pico.isZephyrProject"
       },
       {
         "command": "raspberry-pi-pico.importProject",
@@ -244,12 +257,6 @@
         "category": "Raspberry Pi Pico",
         "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
       },
-      {
-        "command": "raspberry-pi-pico.getRTTDecoderPath",
-        "title": "Get RTT Decoder module path",
-        "category": "Raspberry Pi Pico",
-        "enablement": "false"
-      },
       {
         "command": "raspberry-pi-pico.sbomTargetPathDebug",
         "title": "Get path of the project debug SBOM (rust only)",

scripts/pico_project.py

@@ -1159,6 +1159,7 @@ def generateProjectFiles(
                 ]
             }
 
+            # TODO: use get picotool path command!
             tasks = f"""{{
     "version": "2.0.0",
     "tasks": [

src/commands/configureCmake.mts

@@ -47,10 +47,10 @@ export default class ConfigureCmakeCommand extends Command {
     } else {
       void window.showWarningMessage(
         "CMake failed to configure your build. " +
-        "See the developer console for details " +
-        "(Help -> Toggle Developer Tools). " +
-        "You can also use the CMake Tools Extension Integration " +
-        "to get more information about the error."
+          "See the developer console for details " +
+          "(Help -> Toggle Developer Tools). " +
+          "You can also use the CMake Tools Extension Integration " +
+          "to get more information about the error."
       );
     }
   }
@@ -110,15 +110,15 @@ export class CleanCMakeCommand extends Command {
     } else {
       void window.showWarningMessage(
         "CMake could not be reconfigured. " +
-        "See the developer console for details " +
-        "(Help -> Toggle Developer Tools). " +
-        "You can also use the CMake Tools Extension Integration " +
-        "to get more information about the error."
+          "See the developer console for details " +
+          "(Help -> Toggle Developer Tools). " +
+          "You can also use the CMake Tools Extension Integration " +
+          "to get more information about the error."
       );
     }
 
     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");
     this._ui.updateBuildType(newBuildType ?? "unknown");
   }
@@ -159,7 +159,7 @@ export class SwitchBuildTypeCommand extends Command {
     }
 
     const ws = workspaceFolder.uri.fsPath;
-    const cMakeCachePath = join(ws, "build","CMakeCache.txt");
+    const cMakeCachePath = join(ws, "build", "CMakeCache.txt");
     const oldBuildType = cmakeGetPicoVar(cMakeCachePath, "CMAKE_BUILD_TYPE");
 
     // QuickPick for the build type
@@ -173,10 +173,10 @@ export class SwitchBuildTypeCommand extends Command {
     } else {
       void window.showWarningMessage(
         "CMake failed to configure your build. " +
-        "See the developer console for details " +
-        "(Help -> Toggle Developer Tools). " +
-        "You can also use the CMake Tools Extension Integration " +
-        "to get more information about the error."
+          "See the developer console for details " +
+          "(Help -> Toggle Developer Tools). " +
+          "You can also use the CMake Tools Extension Integration " +
+          "to get more information about the error."
       );
     }
 

src/commands/getPaths.mts

@@ -13,6 +13,8 @@ import {
   buildPicotoolPath,
   buildSDKPath,
   buildToolchainPath,
+  buildWestPath,
+  buildZephyrWorkspacePath,
   downloadAndInstallOpenOCD,
   downloadAndInstallPicotool,
 } from "../utils/download.mjs";
@@ -26,10 +28,19 @@ import { getSupportedToolchains } from "../utils/toolchainUtil.mjs";
 import Logger from "../logger.mjs";
 import { rustProjectGetSelectedChip } from "../utils/rustUtil.mjs";
 import { OPENOCD_VERSION } from "../utils/sharedConstants.mjs";
+import {
+  getBoardFromZephyrProject,
+  ZEPHYR_PICO,
+  ZEPHYR_PICO2,
+  ZEPHYR_PICO2_W,
+  ZEPHYR_PICO_W,
+} from "./switchBoard.mjs";
 
 export class GetPythonPathCommand extends CommandWithResult<string> {
+  public static readonly id = "getPythonPath";
+
   constructor() {
-    super("getPythonPath");
+    super(GetPythonPathCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -47,8 +58,10 @@ export class GetPythonPathCommand extends CommandWithResult<string> {
 }
 
 export class GetEnvPathCommand extends CommandWithResult<string> {
+  public static readonly id = "getEnvPath";
+
   constructor() {
-    super("getEnvPath");
+    super(GetEnvPathCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -66,8 +79,10 @@ export class GetEnvPathCommand extends CommandWithResult<string> {
 }
 
 export class GetGDBPathCommand extends CommandWithResult<string> {
+  public static readonly id = "getGDBPath";
+
   constructor(private readonly _extensionUri: Uri) {
-    super("getGDBPath");
+    super(GetGDBPathCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -157,8 +172,10 @@ export class GetGDBPathCommand extends CommandWithResult<string> {
 }
 
 export class GetCompilerPathCommand extends CommandWithResult<string> {
+  public static readonly id = "getCompilerPath";
+
   constructor() {
-    super("getCompilerPath");
+    super(GetCompilerPathCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -196,8 +213,10 @@ export class GetCompilerPathCommand extends CommandWithResult<string> {
 }
 
 export class GetCxxCompilerPathCommand extends CommandWithResult<string> {
+  public static readonly id = "getCxxCompilerPath";
+
   constructor() {
-    super("getCxxCompilerPath");
+    super(GetCxxCompilerPathCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -253,6 +272,37 @@ export class GetChipCommand extends CommandWithResult<string> {
 
     const workspaceFolder = workspace.workspaceFolders?.[0];
     const isRustProject = State.getInstance().isRustProject;
+    const isZephyrProject = State.getInstance().isZephyrProject;
+
+    if (isZephyrProject) {
+      const board = await getBoardFromZephyrProject(
+        join(workspaceFolder.uri.fsPath, ".vscode", "tasks.json")
+      );
+
+      if (board === undefined) {
+        this._logger.error("Failed to read Zephyr board from tasks.json");
+
+        return "";
+      }
+
+      switch (board) {
+        case ZEPHYR_PICO:
+        case ZEPHYR_PICO_W:
+          return "rp2040";
+        case ZEPHYR_PICO2:
+        case ZEPHYR_PICO2_W:
+          return "rp2350";
+        default:
+          this._logger.error(`Unsupported Zephyr board: ${board}`);
+          void window.showErrorMessage(
+            `Unsupported Zephyr board: ${board}. ` +
+              `Supported boards are: ${ZEPHYR_PICO}, ${ZEPHYR_PICO_W}, ` +
+              `${ZEPHYR_PICO2}, ${ZEPHYR_PICO2_W}`
+          );
+
+          return "rp2040";
+      }
+    }
 
     if (isRustProject) {
       // read .pico-rs
@@ -307,8 +357,10 @@ export class GetChipCommand extends CommandWithResult<string> {
 }
 
 export class GetChipUppercaseCommand extends CommandWithResult<string> {
+  public static readonly id = "getChipUppercase";
+
   constructor() {
-    super("getChipUppercase");
+    super(GetChipUppercaseCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -320,8 +372,10 @@ export class GetChipUppercaseCommand extends CommandWithResult<string> {
 }
 
 export class GetTargetCommand extends CommandWithResult<string> {
+  public static readonly id = "getTarget";
+
   constructor() {
-    super("getTarget");
+    super(GetTargetCommand.id);
   }
 
   async execute(): Promise<string> {
@@ -334,7 +388,28 @@ export class GetTargetCommand extends CommandWithResult<string> {
 
     const workspaceFolder = workspace.workspaceFolders?.[0];
     const isRustProject = State.getInstance().isRustProject;
+    const isZephyrProject = State.getInstance().isZephyrProject;
 
+    if (isZephyrProject) {
+      const board = await getBoardFromZephyrProject(
+        join(workspaceFolder.uri.fsPath, ".vscode", "tasks.json")
+      );
+
+      if (board === undefined) {
+        return "rp2040";
+      }
+
+      switch (board) {
+        case ZEPHYR_PICO:
+        case ZEPHYR_PICO_W:
+          return "rp2040";
+        case ZEPHYR_PICO2:
+        case ZEPHYR_PICO2_W:
+          return "rp2350";
+        default:
+          return "rp2040";
+      }
+    }
     if (isRustProject) {
       const chip = rustProjectGetSelectedChip(workspaceFolder.uri.fsPath);
 
@@ -505,3 +580,41 @@ export class GetSVDPathCommand extends CommandWithResult<string | undefined> {
     );
   }
 }
+
+export class GetWestPathCommand extends CommandWithResult<string | undefined> {
+  public static readonly id = "getWestPath";
+
+  constructor() {
+    super(GetWestPathCommand.id);
+  }
+
+  execute(): string | undefined {
+    const result = buildWestPath();
+
+    if (result === null || !result) {
+      return undefined;
+    }
+
+    return result;
+  }
+}
+
+export class GetZephyrWorkspacePathCommand extends CommandWithResult<
+  string | undefined
+> {
+  public static readonly id = "getZephyrWorkspacePath";
+
+  constructor() {
+    super(GetZephyrWorkspacePathCommand.id);
+  }
+
+  execute(): string | undefined {
+    const result = buildZephyrWorkspacePath();
+
+    if (result === null || !result) {
+      return undefined;
+    }
+
+    return result;
+  }
+}