Configure debug session as required for pio 5.2+

See also https://github.com/platformio/platformio-core/issues/4020

Additionally, this commit replaces deprecated openocd option `adapter_khz` with
`adapter speed`
This commit is contained in:
Philipp Serr 2022-03-11 08:55:44 +01:00
parent eca3b40879
commit 01a0447aa7

View File

@ -100,19 +100,16 @@ class RaspberrypiPlatform(PlatformBase):
board.manifest["debug"] = debug board.manifest["debug"] = debug
return board return board
def configure_debug_options(self, initial_debug_options, ide_data): def configure_debug_session(self, debug_config):
debug_options = copy.deepcopy(initial_debug_options) adapter_speed = debug_config.speed or "5000"
adapter_speed = initial_debug_options.get("speed", "5000")
if adapter_speed: server_options = debug_config.server or {}
server_options = debug_options.get("server") or {} server_arguments = server_options.get("arguments", [])
server_executable = server_options.get("executable", "").lower() if "interface/cmsis-dap.cfg" in server_arguments:
if "target/cmsis-dap.cfg" in server_options.get("arguments", []): server_arguments.extend(
debug_options["server"]["arguments"].extend( ["-c", "adapter speed %s" % adapter_speed]
["-c", "adapter_khz %s" % adapter_speed] )
) elif "jlink" in server_options.get("executable", "").lower():
elif "jlink" in server_executable: server_arguments.extend(
debug_options["server"]["arguments"].extend( ["-speed", adapter_speed]
["-speed", adapter_speed] )
)
return debug_options