Fix #62, OpenOCD missing adapter

Signed-off-by: paulober <[email protected]>
raspberrypi · Sep 9, 2024 · 706de01 · 706de01
1 parent 3a0cb66
commit 706de01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 28 deletions.
diff --git a/scripts/pico_project.py b/scripts/pico_project.py
@@ -759,8 +759,10 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
         file.close()
 
     debugger = debugger_config_list[debugger]
+    debugger_supports_configurable_speed = True
 
     if debugger == "raspberrypi-swd.cfg":
+        debugger_supports_configurable_speed = False
         shutil.copyfile(sourcefolder + "/" +  "raspberrypi-swd.cfg", projectPath / "raspberrypi-swd.cfg")
 
     # Need to escape windows files paths backslashes
@@ -804,10 +806,10 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
             "overrideLaunchCommands": [
                 "monitor reset init",
                 "load \\"${{command:raspberry-pi-pico.launchTargetPath}}\\""
-            ],
+            ]{''',
             "openOCDLaunchCommands": [
                 "adapter speed 5000"
-            ]
+            ]''' if debugger_supports_configurable_speed else ""}
         }},
         {{
             "name": "Pico Debug (Cortex-Debug with external OpenOCD)",
@@ -837,7 +839,7 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
             "miDebuggerPath": "${{command:raspberry-pi-pico.getGDBPath}}",
             "miDebuggerServerAddress": "localhost:3333",
             "debugServerPath": "{openocd_path if openocd_path else "openocd"}",
-            "debugServerArgs": "-f {debugger} -f target/${{command:raspberry-pi-pico.getTarget}}.cfg -c \\"adapter speed 5000\\"",
+            "debugServerArgs": "-f {debugger} -f target/${{command:raspberry-pi-pico.getTarget}}.cfg{' -c \\"adapter speed 5000\\"' if debugger_supports_configurable_speed else ""}",
             "serverStarted": "Listening on port .* for gdb connections",
             "filterStderr": true,
             "hardwareBreakpoints": {{
@@ -1017,7 +1019,7 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
                 "-f",
                 "target/${{command:raspberry-pi-pico.getTarget}}.cfg",
                 "-c",
-                "adapter speed 5000; program \\"${{command:raspberry-pi-pico.launchTargetPath}}\\" verify reset exit"
+                "{"adapter speed 5000; " if debugger_supports_configurable_speed else ""}program \\"${{command:raspberry-pi-pico.launchTargetPath}}\\" verify reset exit"
             ],
             "problemMatcher": [],
             "windows": {{

diff --git a/scripts/raspberrypi-swd.cfg b/scripts/raspberrypi-swd.cfg
@@ -1,24 +1,4 @@
-proc read_file { name } {
-	if {[catch {open $name r} fd]} {
-		return ""
-	}
-	set result [read $fd]
-	close $fd
-	return $result
-}
+adapter driver linuxgpiod
 
-set compat [read_file /proc/device-tree/compatible]
-
-if {[string match *bcm2712* $compat]} {
-	adapter driver linuxgpiod
-
-	adapter gpio swdio -chip 4 24
-	adapter gpio swclk -chip 4 25
-} else {
-	source [find interface/raspberrypi-native.cfg]
-
-	adapter gpio swdio -chip 0 24
-	adapter gpio swclk -chip 0 25
-
-	adapter speed 5000
-}
+adapter gpio swdio -chip 0 24
+adapter gpio swclk -chip 0 25
diff --git a/src/webview/newProjectPanel.mts b/src/webview/newProjectPanel.mts
@@ -1959,7 +1959,7 @@ export class NewProjectPanel {
                     </div>
                     <div class="flex items-center px-4 py-2 border border-gray-200 rounded dark:border-gray-700">
                         <input id="debugger-radio-swd" type="radio" value="1" name="debugger-radio" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 outline-none focus:ring-0 focus:ring-offset-5 dark:bg-gray-700 dark:border-gray-600">
-                        <label for="debugger-radio-swd" class="w-full py-4 ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">SWD (Pi host)</label>
+                        <label for="debugger-radio-swd" class="w-full py-4 ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">SWD (Pi host, on Pi 5 it requires Linux Kernel >= 6.6.47)</label>
                     </div>
                 </div>
             </div>