Skip to content

Commit 6f0c55e

Browse files
committed
Fix copy of debug config on Windows
1 parent d382ddf commit 6f0c55e

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

boards.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ esp32s3.build.memory_type={build.boot}_{build.psram_type}
7272

7373
## IDE 2.0 Seems to not update the value
7474
esp32s3.menu.JTAGAdapter.default=Integrated USB JTAG
75-
esp32s3.menu.JTAGAdapter.default.build.openocdscript=board/esp32s3-builtin.cfg
75+
esp32s3.menu.JTAGAdapter.default.build.openocdscript=esp32s3-builtin.cfg
7676
esp32s3.menu.JTAGAdapter.external=FTDI Adapter
77-
esp32s3.menu.JTAGAdapter.external.build.openocdscript=board/esp32s3-ftdi.cfg
77+
esp32s3.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
7878
esp32s3.menu.JTAGAdapter.bridge=ESP USB Bridge
79-
esp32s3.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32s3-bridge.cfg
79+
esp32s3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
8080

8181
esp32s3.menu.PSRAM.disabled=Disabled
8282
esp32s3.menu.PSRAM.disabled.build.defines=
@@ -281,11 +281,11 @@ esp32c3.build.defines=
281281

282282
## IDE 2.0 Seems to not update the value
283283
esp32c3.menu.JTAGAdapter.default=Integrated USB JTAG
284-
esp32c3.menu.JTAGAdapter.default.build.openocdscript=board/esp32c3-builtin.cfg
284+
esp32c3.menu.JTAGAdapter.default.build.openocdscript=esp32c3-builtin.cfg
285285
esp32c3.menu.JTAGAdapter.external=FTDI Adapter
286-
esp32c3.menu.JTAGAdapter.external.build.openocdscript=board/esp32c3-ftdi.cfg
286+
esp32c3.menu.JTAGAdapter.external.build.openocdscript=esp32c3-ftdi.cfg
287287
esp32c3.menu.JTAGAdapter.bridge=ESP USB Bridge
288-
esp32c3.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32c3-bridge.cfg
288+
esp32c3.menu.JTAGAdapter.bridge.build.openocdscript=esp32c3-bridge.cfg
289289

290290
esp32c3.menu.CDCOnBoot.default=Disabled
291291
esp32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
@@ -446,9 +446,9 @@ esp32s2.build.defines=
446446

447447
## IDE 2.0 Seems to not update the value
448448
esp32s2.menu.JTAGAdapter.external=FTDI Adapter
449-
esp32s2.menu.JTAGAdapter.external.build.openocdscript=board/esp32s2-kaluga-1.cfg
449+
esp32s2.menu.JTAGAdapter.external.build.openocdscript=esp32s2-kaluga-1.cfg
450450
esp32s2.menu.JTAGAdapter.bridge=ESP USB Bridge
451-
esp32s2.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32s2-bridge.cfg
451+
esp32s2.menu.JTAGAdapter.bridge.build.openocdscript=esp32s2-bridge.cfg
452452

453453
esp32s2.menu.CDCOnBoot.default=Disabled
454454
esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
@@ -628,9 +628,9 @@ esp32.build.event_core=
628628

629629
## IDE 2.0 Seems to not update the value
630630
esp32.menu.JTAGAdapter.external=FTDI Adapter
631-
esp32.menu.JTAGAdapter.external.build.openocdscript=board/esp32-wrover-kit-3.3v.cfg
631+
esp32.menu.JTAGAdapter.external.build.openocdscript=esp32-wrover-kit-3.3v.cfg
632632
esp32.menu.JTAGAdapter.bridge=ESP USB Bridge
633-
esp32.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32-bridge.cfg
633+
esp32.menu.JTAGAdapter.bridge.build.openocdscript=esp32-bridge.cfg
634634

635635
esp32.menu.PSRAM.disabled=Disabled
636636
esp32.menu.PSRAM.disabled.build.defines=

platform.txt

+7-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ runtime.tools.riscv32-esp-elf-gcc.path={runtime.platform.path}/tools/riscv32-esp
88

99
debug.server.openocd.path={runtime.platform.path}/tools/openocd-esp32/bin/openocd
1010
debug.server.openocd.scripts_dir={runtime.platform.path}/tools/openocd-esp32/share/openocd/scripts/
11+
debug.server.openocd.scripts_dir.windows={runtime.platform.path}\tools\openocd-esp32\share\openocd\scripts\
1112

1213
tools.esptool_py.path={runtime.platform.path}/tools/esptool
1314
tools.esptool_py.cmd=esptool
@@ -147,10 +148,10 @@ build.extra_libs=
147148
build.memory_type={build.boot}_qspi
148149

149150
# OpenOCD default configs
150-
build.openocdscript.esp32=board/esp32-wrover-kit-3.3v.cfg
151-
build.openocdscript.esp32s2=board/esp32s2-kaluga-1.cfg
152-
build.openocdscript.esp32s3=board/esp32s3-builtin.cfg
153-
build.openocdscript.esp32c3=board/esp32c3-builtin.cfg
151+
build.openocdscript.esp32=esp32-wrover-kit-3.3v.cfg
152+
build.openocdscript.esp32s2=esp32s2-kaluga-1.cfg
153+
build.openocdscript.esp32s3=esp32s3-builtin.cfg
154+
build.openocdscript.esp32c3=esp32c3-builtin.cfg
154155
build.openocdscript={build.openocdscript.{build.mcu}}
155156

156157
# Custom build options
@@ -180,8 +181,8 @@ recipe.hooks.prebuild.5.pattern.windows=cmd /c if exist "{build.source.path}\bui
180181
recipe.hooks.prebuild.6.pattern.windows=cmd /c if not exist "{build.path}\build_opt.h" type nul > "{build.path}\build_opt.h"
181182

182183
# Generate debug.cfg (must be postbuild)
183-
recipe.hooks.postbuild.1.pattern=bash -c "cp -f "{debug.server.openocd.scripts_dir}"/{build.openocdscript} "{build.source.path}"/debug.cfg"
184-
recipe.hooks.postbuild.1.pattern.windows=cmd /c COPY /y "{debug.server.openocd.scripts_dir}\{build.openocdscript}" "{build.source.path}\debug.cfg"
184+
recipe.hooks.postbuild.1.pattern=bash -c "cp -f "{debug.server.openocd.scripts_dir}"board/{build.openocdscript} "{build.source.path}"/debug.cfg"
185+
recipe.hooks.postbuild.1.pattern.windows=cmd /c COPY /y "{debug.server.openocd.scripts_dir}board\{build.openocdscript}" "{build.source.path}\debug.cfg"
185186

186187
# Generate debug_custom.json
187188
recipe.hooks.postbuild.2.pattern=bash -c "cp -f "{runtime.platform.path}"/tools/ide-debug/{build.mcu}.json "{build.source.path}"/debug_custom.json"

0 commit comments

Comments
 (0)