Initial support for new OpenOCD package

valeros · valeros · commit f5ffb5896c69 · 2020-10-26T16:02:27.000+02:00
diff --git a/platform.json b/platform.json
@@ -114,7 +114,7 @@
       "type": "debugger",
       "optional": true,
       "owner": "platformio",
-      "version": "~1.1000.20181026"
+      "version": "~2.1000.0"
     },
     "tool-mkspiffs": {
       "type": "uploader",
diff --git a/platform.py b/platform.py
@@ -122,7 +122,8 @@ def _add_dynamic_options(self, board):
             server_args = [
                 "-s", "$PACKAGE_DIR/share/openocd/scripts",
                 "-f", "interface/%s.cfg" % openocd_interface,
-                "-f", "board/%s" % debug.get("openocd_board")
+                "-f", "board/%s" % debug.get("openocd_board"),
+                "-c", "adapter_khz %d" % debug.get("adapter_speed", 20000)
             ]
 
             debug['tools'][link] = {

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,8 @@ def _add_dynamic_options(self, board):`
`122`	`122`	`server_args = [`
`123`	`123`	`"-s", "$PACKAGE_DIR/share/openocd/scripts",`
`124`	`124`	`"-f", "interface/%s.cfg" % openocd_interface,`
`125`		`- "-f", "board/%s" % debug.get("openocd_board")`
	`125`	`+ "-f", "board/%s" % debug.get("openocd_board"),`
	`126`	`+ "-c", "adapter_khz %d" % debug.get("adapter_speed", 20000)`
`126`	`127`	`]`
`127`	`128`
`128`	`129`	`debug['tools'][link] = {`