From 01a0447aa7e467e59c2e24c16004e3e381565418 Mon Sep 17 00:00:00 2001 From: Philipp Serr Date: Fri, 11 Mar 2022 08:55:44 +0100 Subject: [PATCH] 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` --- platform.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/platform.py b/platform.py index c4e29da..bd68da0 100644 --- a/platform.py +++ b/platform.py @@ -100,19 +100,16 @@ def _add_default_debug_tools(self, board): board.manifest["debug"] = debug return board - def configure_debug_options(self, initial_debug_options, ide_data): - debug_options = copy.deepcopy(initial_debug_options) - adapter_speed = initial_debug_options.get("speed", "5000") - if adapter_speed: - server_options = debug_options.get("server") or {} - server_executable = server_options.get("executable", "").lower() - if "target/cmsis-dap.cfg" in server_options.get("arguments", []): - debug_options["server"]["arguments"].extend( - ["-c", "adapter_khz %s" % adapter_speed] - ) - elif "jlink" in server_executable: - debug_options["server"]["arguments"].extend( - ["-speed", adapter_speed] - ) - - return debug_options + def configure_debug_session(self, debug_config): + adapter_speed = debug_config.speed or "5000" + + server_options = debug_config.server or {} + server_arguments = server_options.get("arguments", []) + if "interface/cmsis-dap.cfg" in server_arguments: + server_arguments.extend( + ["-c", "adapter speed %s" % adapter_speed] + ) + elif "jlink" in server_options.get("executable", "").lower(): + server_arguments.extend( + ["-speed", adapter_speed] + )