From 108fa4e43b251dde17190b983596931750b2a385 Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 24 Nov 2025 14:24:58 +0100 Subject: [PATCH 1/2] nicla sense: allow uploading with openocd pyocd is not packaged in our default tools so I've changed the commands in order to use openocd --- boards.txt | 15 ++++++--------- platform.txt | 6 +++--- programmers.txt | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/boards.txt b/boards.txt index 2ee6ea555..bfc45cb00 100644 --- a/boards.txt +++ b/boards.txt @@ -371,12 +371,11 @@ niclasense.pid.0=0x0360 niclasense.upload_port.0.vid=0x2341 niclasense.upload_port.0.pid=0x0060 -#niclasense.upload.tool=openocd -#niclasense.upload.tool.default=openocd -niclasense.upload.tool=pyocd -niclasense.upload.tool.default=pyocd +niclasense.upload.tool=openocd +niclasense.upload.tool.default=openocd niclasense.upload.protocol= -niclasense.upload.transport= +niclasense.upload.config=-f target/nrf52.cfg +niclasense.upload.programmer=-f interface/cmsis-dap.cfg niclasense.upload.vid=0x2341 niclasense.upload.pid=0x0060 niclasense.upload.interface=0 @@ -391,10 +390,8 @@ niclasense.upload.target=nrf52 niclasense.upload.maximum_size=786432 niclasense.upload.maximum_data_size=523624 -#niclasense.bootloader.tool=openocd -#niclasense.bootloader.tool.default=openocd -niclasense.bootloader.tool=pyocd -niclasense.bootloader.tool.default=pyocd +niclasense.bootloader.tool=openocd +niclasense.bootloader.tool.default=openocd niclasense.bootloader.vid=0x2341 niclasense.bootloader.pid=0x0360 niclasense.bootloader.interface=0 diff --git a/platform.txt b/platform.txt index 888ee4025..8e8f1c881 100644 --- a/platform.txt +++ b/platform.txt @@ -167,11 +167,11 @@ tools.openocd.cmd.windows=bin/openocd.exe tools.openocd.upload.params.verbose=-d2 tools.openocd.upload.params.quiet=-d0 -tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" {bootloader.programmer} {upload.transport} {bootloader.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; program {{build.path}/{build.project_name}.elf}; reset run; shutdown" +tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" {upload.programmer} {upload.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; flash write_image erase {{build.path}/{build.project_name}.{upload.extension}} {upload.address} bin; reset run; shutdown" tools.openocd.program.params.verbose=-d2 tools.openocd.program.params.quiet=-d0 -tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" {bootloader.programmer} {upload.transport} {bootloader.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; program {{build.path}/{build.project_name}.elf}; reset run; shutdown" +tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" {upload.programmer} {upload.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; flash write_image erase {{build.path}/{build.project_name}.{upload.extension}} {upload.address} bin; reset run; shutdown" tools.openocd.erase.params.verbose=-d2 tools.openocd.erase.params.quiet=-d0 @@ -179,7 +179,7 @@ tools.openocd.erase.pattern= tools.openocd.bootloader.params.verbose=-d2 tools.openocd.bootloader.params.quiet=-d0 -tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" {bootloader.programmer} {upload.transport} {bootloader.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; {bootloader.extra_action.preflash}; program {{runtime.platform.path}/bootloaders/{bootloader.file}}; reset run; shutdown" +tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" {upload.programmer} {upload.config} -c "telnet_port disabled; init; reset init; halt; adapter speed 10000; program {{runtime.platform.path}/firmwares/{bootloader.file}}; reset run; shutdown" # # BOSSA diff --git a/programmers.txt b/programmers.txt index b0df70934..194a71c7f 100644 --- a/programmers.txt +++ b/programmers.txt @@ -2,8 +2,8 @@ cmsis-dap.name=ARM CMSIS-DAP compatible cmsis-dap.communication=USB cmsis-dap.protocol= cmsis-dap.program.protocol= -cmsis-dap.program.tool=pyocd -cmsis-dap.program.tool.default=pyocd +cmsis-dap.program.tool=openocd +cmsis-dap.program.tool.default=openocd cmsis-dap.program.extra_params= cmsis-dap.programmer.protocol=cmsis-dap From b774b27aed95568064436860dee658f9b9d35ded Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 24 Nov 2025 16:15:33 +0100 Subject: [PATCH 2/2] platform: update to openocd-0.12.0 switching to openocd-0.12.0 since it will be added to the core default tools --- platform.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.txt b/platform.txt index 8e8f1c881..81af2c7f4 100644 --- a/platform.txt +++ b/platform.txt @@ -161,7 +161,7 @@ pluggable_monitor.required.serial=builtin:serial-monitor # # OpenOCD # -tools.openocd.path={runtime.tools.openocd-0.11.0-arduino2.path} +tools.openocd.path={runtime.tools.openocd-0.12.0-arduino1-static.path} tools.openocd.cmd=bin/openocd tools.openocd.cmd.windows=bin/openocd.exe