Add getChipUppercase command, for use in launch.json

Fixes #58
raspberrypi · Aug 26, 2024 · 35a78cc · 35a78cc
1 parent ccc0697
commit 35a78cc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -114,6 +114,12 @@
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.getChipUppercase",
+        "title": "Get Chip Uppercase",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.getTarget",
         "title": "Get OpenOCD Target",

diff --git a/scripts/pico_project.py b/scripts/pico_project.py
@@ -785,12 +785,12 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
             "servertype": "openocd",\
 {f'{server_path}: "{openocd_path}",' if openocd_path else ""}
             "gdbPath": "${{command:raspberry-pi-pico.getGDBPath}}",
-            "device": "${{command:raspberry-pi-pico.getChip}}",
+            "device": "${{command:raspberry-pi-pico.getChipUppercase}}",
             "configFiles": [
                 "{debugger}",
                 "target/${{command:raspberry-pi-pico.getTarget}}.cfg"
             ],
-            "svdFile": "{codeSdkPath(sdkVersion)}/src/${{command:raspberry-pi-pico.getChip}}/hardware_regs/${{command:raspberry-pi-pico.getChip}}.svd",
+            "svdFile": "{codeSdkPath(sdkVersion)}/src/${{command:raspberry-pi-pico.getChip}}/hardware_regs/${{command:raspberry-pi-pico.getChipUppercase}}.svd",
             "runToEntryPoint": "main",
             // Fix for no_flash binaries, where monitor reset halt doesn't do what is expected
             // Also works fine for flash binaries
@@ -811,8 +811,8 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
             "servertype": "external",
             "gdbTarget": "localhost:3333",
             "gdbPath": "${{command:raspberry-pi-pico.getGDBPath}}",
-            "device": "${{command:raspberry-pi-pico.getChip}}",
-            "svdFile": "{codeSdkPath(sdkVersion)}/src/${{command:raspberry-pi-pico.getChip}}/hardware_regs/${{command:raspberry-pi-pico.getChip}}.svd",
+            "device": "${{command:raspberry-pi-pico.getChipUppercase}}",
+            "svdFile": "{codeSdkPath(sdkVersion)}/src/${{command:raspberry-pi-pico.getChip}}/hardware_regs/${{command:raspberry-pi-pico.getChipUppercase}}.svd"
             "runToEntryPoint": "main",
             // Give restart the same functionality as runToEntryPoint - main
             "postRestartCommands": [
@@ -838,7 +838,7 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
                 "limit": 4
             }},
             "preLaunchTask": "Flash",
-            "svdPath": "{codeSdkPath(sdkVersion)}/src/${{command:raspberry-pi-pico.getChip}}/hardware_regs/${{command:raspberry-pi-pico.getChip}}.svd"
+            "svdPath": "{codeSdkPath(sdkVersion)}/src/${{command:raspberry-pi-pico.getChip}}/hardware_regs/${{command:raspberry-pi-pico.getChipUppercase}}.svd"
         }},
     ]
 }}

diff --git a/src/commands/getPaths.mts b/src/commands/getPaths.mts
@@ -152,6 +152,19 @@ export class GetChipCommand extends CommandWithResult<string> {
   }
 }
 
+export class GetChipUppercaseCommand extends CommandWithResult<string> {
+  constructor() {
+    super("getChipUppercase");
+  }
+
+  async execute(): Promise<string> {
+    const cmd = new GetChipCommand();
+    const chip = await cmd.execute();
+
+    return chip.toUpperCase();
+  }
+}
+
 export class GetTargetCommand extends CommandWithResult<string> {
   constructor() {
     super("getTarget");

diff --git a/src/extension.mts b/src/extension.mts
@@ -37,6 +37,7 @@ import {
   GetGDBPathCommand,
   GetChipCommand,
   GetTargetCommand,
+  GetChipUppercaseCommand,
 } from "./commands/getPaths.mjs";
 import {
   downloadAndInstallCmake,
@@ -103,6 +104,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
     new GetEnvPathCommand(),
     new GetGDBPathCommand(),
     new GetChipCommand(),
+    new GetChipUppercaseCommand(),
     new GetTargetCommand(),
     new CompileProjectCommand(),
     new RunProjectCommand(),