Fix JTAG selection in board menu

Author: me-no-dev

boards.txt

@@ -70,15 +70,13 @@ esp32s3.build.event_core=
 esp32s3.build.psram_type=qspi
 esp32s3.build.memory_type={build.boot}_{build.psram_type}
 
-esp32s3.build.openocdscript=board/esp32s3-builtin.cfg
-
 ## IDE 2.0 Seems to not update the value
-#esp32s3.menu.JTAGAdapter.default=Integrated USB JTAG
-#esp32s3.menu.JTAGAdapter.default.build.openocdscript=board/esp32s3-builtin.cfg
-#esp32s3.menu.JTAGAdapter.external=FTDI Adapter
-#esp32s3.menu.JTAGAdapter.external.build.openocdscript=board/esp32s3-ftdi.cfg
-#esp32s3.menu.JTAGAdapter.bridge=ESP USB Bridge
-#esp32s3.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32s3-bridge.cfg
+esp32s3.menu.JTAGAdapter.default=Integrated USB JTAG
+esp32s3.menu.JTAGAdapter.default.build.openocdscript=board/esp32s3-builtin.cfg
+esp32s3.menu.JTAGAdapter.external=FTDI Adapter
+esp32s3.menu.JTAGAdapter.external.build.openocdscript=board/esp32s3-ftdi.cfg
+esp32s3.menu.JTAGAdapter.bridge=ESP USB Bridge
+esp32s3.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32s3-bridge.cfg
 
 esp32s3.menu.PSRAM.disabled=Disabled
 esp32s3.menu.PSRAM.disabled.build.defines=
@@ -281,15 +279,13 @@ esp32c3.build.boot=qio
 esp32c3.build.partitions=default
 esp32c3.build.defines=
 
-esp32c3.build.openocdscript=board/esp32c3-builtin.cfg
-
 ## IDE 2.0 Seems to not update the value
-#esp32c3.menu.JTAGAdapter.default=Integrated USB JTAG
-#esp32c3.menu.JTAGAdapter.default.build.openocdscript=board/esp32c3-builtin.cfg
-#esp32c3.menu.JTAGAdapter.external=FTDI Adapter
-#esp32c3.menu.JTAGAdapter.external.build.openocdscript=board/esp32c3-ftdi.cfg
-#esp32c3.menu.JTAGAdapter.bridge=ESP USB Bridge
-#esp32c3.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32c3-bridge.cfg
+esp32c3.menu.JTAGAdapter.default=Integrated USB JTAG
+esp32c3.menu.JTAGAdapter.default.build.openocdscript=board/esp32c3-builtin.cfg
+esp32c3.menu.JTAGAdapter.external=FTDI Adapter
+esp32c3.menu.JTAGAdapter.external.build.openocdscript=board/esp32c3-ftdi.cfg
+esp32c3.menu.JTAGAdapter.bridge=ESP USB Bridge
+esp32c3.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32c3-bridge.cfg
 
 esp32c3.menu.CDCOnBoot.default=Disabled
 esp32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
@@ -448,13 +444,11 @@ esp32s2.build.boot=qio
 esp32s2.build.partitions=default
 esp32s2.build.defines=
 
-esp32s2.build.openocdscript=board/esp32s2-kaluga-1.cfg
-
 ## IDE 2.0 Seems to not update the value
-#esp32s2.menu.JTAGAdapter.external=FTDI Adapter
-#esp32s2.menu.JTAGAdapter.external.build.openocdscript=board/esp32s2-kaluga-1.cfg
-#esp32s2.menu.JTAGAdapter.bridge=ESP USB Bridge
-#esp32s2.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32s2-bridge.cfg
+esp32s2.menu.JTAGAdapter.external=FTDI Adapter
+esp32s2.menu.JTAGAdapter.external.build.openocdscript=board/esp32s2-kaluga-1.cfg
+esp32s2.menu.JTAGAdapter.bridge=ESP USB Bridge
+esp32s2.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32s2-bridge.cfg
 
 esp32s2.menu.CDCOnBoot.default=Disabled
 esp32s2.menu.CDCOnBoot.default.build.cdc_on_boot=0
@@ -632,13 +626,11 @@ esp32.build.defines=
 esp32.build.loop_core=
 esp32.build.event_core=
 
-esp32.build.openocdscript=board/esp32-wrover-kit-3.3v.cfg
-
 ## IDE 2.0 Seems to not update the value
-#esp32.menu.JTAGAdapter.external=FTDI Adapter
-#esp32.menu.JTAGAdapter.external.build.openocdscript=board/esp32-wrover-kit-3.3v.cfg
-#esp32.menu.JTAGAdapter.bridge=ESP USB Bridge
-#esp32.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32-bridge.cfg
+esp32.menu.JTAGAdapter.external=FTDI Adapter
+esp32.menu.JTAGAdapter.external.build.openocdscript=board/esp32-wrover-kit-3.3v.cfg
+esp32.menu.JTAGAdapter.bridge=ESP USB Bridge
+esp32.menu.JTAGAdapter.bridge.build.openocdscript=board/esp32-bridge.cfg
 
 esp32.menu.PSRAM.disabled=Disabled
 esp32.menu.PSRAM.disabled.build.defines=

platform.txt

@@ -179,9 +179,13 @@ recipe.hooks.prebuild.6.pattern=bash -c "[ -f "{build.path}"/build_opt.h ] || to
 recipe.hooks.prebuild.5.pattern.windows=cmd /c if exist "{build.source.path}\build_opt.h" COPY /y "{build.source.path}\build_opt.h" "{build.path}\build_opt.h"
 recipe.hooks.prebuild.6.pattern.windows=cmd /c if not exist "{build.path}\build_opt.h" type nul > "{build.path}\build_opt.h"
 
+# Generate debug.cfg (must be postbuild)
+recipe.hooks.postbuild.1.pattern=bash -c "cp -f "{debug.server.openocd.scripts_dir}"/{build.openocdscript} "{build.source.path}"/debug.cfg"
+recipe.hooks.postbuild.1.pattern.windows=cmd /c COPY /y "{debug.server.openocd.scripts_dir}\{build.openocdscript}" "{build.source.path}\debug.cfg"
+
 # Generate debug_custom.json
-recipe.hooks.prebuild.7.pattern=bash -c "cp -f "{runtime.platform.path}"/tools/ide-debug/{build.mcu}.json "{build.source.path}"/debug_custom.json"
-recipe.hooks.prebuild.7.pattern.windows=cmd /c COPY /y "{runtime.platform.path}\tools\ide-debug\{build.mcu}.json" "{build.source.path}\debug_custom.json"
+recipe.hooks.postbuild.2.pattern=bash -c "cp -f "{runtime.platform.path}"/tools/ide-debug/{build.mcu}.json "{build.source.path}"/debug_custom.json"
+recipe.hooks.postbuild.2.pattern.windows=cmd /c COPY /y "{runtime.platform.path}\tools\ide-debug\{build.mcu}.json" "{build.source.path}\debug_custom.json"
 
 ## Compile c files
 recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" -DARDUINO_VARIANT="{build.variant}" -DARDUINO_PARTITION_{build.partitions} {compiler.c.extra_flags} {build.extra_flags} "@{build.opt.path}" {includes} "{source_file}" -o "{object_file}"
@@ -221,6 +225,10 @@ pluggable_discovery.required.0=builtin:serial-discovery
 pluggable_discovery.required.1=builtin:mdns-discovery
 pluggable_monitor.required.serial=builtin:serial-monitor
 
+## ------------------
+## Upload/Debug tools
+## ------------------
+
 # Debugger configuration (general options)
 # ----------------------------------------
 # EXPERIMENTAL feature:
@@ -230,11 +238,7 @@ debug.toolchain=gcc
 debug.toolchain.path={compiler.path}
 debug.toolchain.prefix={compiler.prefix}
 debug.server=openocd
-debug.server.openocd.script={build.openocdscript}
-
-## ------------------
-## Upload/Debug tools
-## ------------------
+debug.server.openocd.script=debug.cfg
 
 ##
 ## ESPTool