Make OpenOCD uploading more robust, respect speed for picoprobe config

Author: maxgerhardt

builder/main.py

@@ -368,10 +368,12 @@ def _jlink_cmd_script(env, source):
     ]
     openocd_args.extend(
         debug_tools.get(upload_protocol).get("server").get("arguments", []))
-    if env.GetProjectOption("debug_speed"):
-        openocd_args.extend(
-            ["-c", "adapter speed %s" % env.GetProjectOption("debug_speed")]
-        )
+    # always use a default speed directive of 1000khz or an otherwise configured speed
+    # otherwise, flash failures were observed
+    speed = env.GetProjectOption("debug_speed") or "1000"
+    openocd_args.extend(
+        ["-c", "adapter speed %s" % speed]
+    )
     if "uploadfs" in COMMAND_LINE_TARGETS:
         # filesystem upload. use FS_START.
         openocd_args.extend([

platform.py

@@ -128,10 +128,10 @@ def _add_default_debug_tools(self, board):
         return board
 
     def configure_debug_session(self, debug_config):
-        adapter_speed = debug_config.speed or "5000"
+        adapter_speed = debug_config.speed or "1000"
         server_options = debug_config.server or {}
         server_arguments = server_options.get("arguments", [])
-        if "interface/cmsis-dap.cfg" in server_arguments:
+        if "interface/cmsis-dap.cfg" in server_arguments or "interface/picoprobe.cfg":
             server_arguments.extend(
                 ["-c", "adapter speed %s" % adapter_speed]
             )