adeck/platform-raspberrypi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make OpenOCD uploading more robust, respect speed for picoprobe config

Browse Source
This commit is contained in:
unknown 2022-06-09 22:05:42 +02:00
parent 4eedf9eac0
commit e568d578ab
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/main.py
View File

@ -368,9 +368,11 @@ elif upload_protocol in debug_tools:
]
openocd_args.extend(
debug_tools.get(upload_protocol).get("server").get("arguments", []))
if 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" % env.GetProjectOption("debug_speed")]
["-c", "adapter speed %s" % speed]
)
if "uploadfs" in COMMAND_LINE_TARGETS:
# filesystem upload. use FS_START.

4
platform.py
View File

@ -128,10 +128,10 @@ class RaspberrypiPlatform(PlatformBase):
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]
)