Update version

RP2040::memcpyDMA implements a DMA-controlled memory copy call identical in
function to standard memcpy, but using an onboard DMA engine.  For large
memory transfers this can be significantly faster than using the CPU-based
memcpy.  Only 4-byte aligned source, destination, and counts are allowed.
If any inputs are not 4-byte aligned, then standard memcpy will occur so
it will behave correctly for any inputs.

.github/workflows/pull-request.yml

@@ -6,11 +6,6 @@ name: Arduino-Pico CI
 on:
   pull_request:
 
-env:
-  TRAVIS_BUILD_DIR: ${{ github.workspace }}
-  TRAVIS_TAG: ${{ github.ref }}
-
-
 jobs:
 
 # Consistent style, spelling

.github/workflows/release-to-publish.yml

@@ -33,7 +33,6 @@ jobs:
 #         pip install --upgrade platformio
     - name: Deploy updated JSON
       env:
-        TRAVIS_BUILD_DIR: ${{ github.workspace }}
         BUILD_TYPE: package
         CI_GITHUB_API_KEY: ${{ secrets.GITHUB_TOKEN }}
         PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }}

.github/workflows/tag-to-draft-release.yml

@@ -24,7 +24,6 @@ jobs:
         python-version: '3.x'
     - name: Build package JSON
       env:
-        TRAVIS_BUILD_DIR: ${{ github.workspace }}
         BUILD_TYPE: package
         CI_GITHUB_API_KEY: ${{ secrets.GITHUB_TOKEN }}
       run: |

boards.txt

@@ -235,7 +235,7 @@ rpipico.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 rpipico.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 rpipico.menu.uploadmethod.picotool.upload.tool=picotool
 rpipico.menu.uploadmethod.picotool.upload.tool.default=picotool
-rpipico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+rpipico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 rpipico.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 rpipico.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 rpipico.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -547,7 +547,7 @@ rpipicow.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 rpipicow.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 rpipicow.menu.uploadmethod.picotool.upload.tool=picotool
 rpipicow.menu.uploadmethod.picotool.upload.tool.default=picotool
-rpipicow.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+rpipicow.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 rpipicow.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 rpipicow.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 rpipicow.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -849,7 +849,7 @@ rpipicow.menu.uploadmethod.picodebug.upload.tool.default=picodebug
 0xcb_helios.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 0xcb_helios.menu.uploadmethod.picotool.upload.tool=picotool
 0xcb_helios.menu.uploadmethod.picotool.upload.tool.default=picotool
-0xcb_helios.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+0xcb_helios.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 0xcb_helios.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 0xcb_helios.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 0xcb_helios.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -1107,7 +1107,7 @@ adafruit_feather.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTO
 adafruit_feather.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -1361,7 +1361,7 @@ adafruit_feather_scorpio.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 adafruit_feather_scorpio.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_scorpio.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_scorpio.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_scorpio.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_scorpio.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_scorpio.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_scorpio.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_scorpio.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -1615,7 +1615,7 @@ adafruit_feather_dvi.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 adafruit_feather_dvi.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_dvi.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_dvi.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -1869,7 +1869,7 @@ adafruit_feather_adalogger.menu.uploadmethod.picotool.build.picodebugflags=-DENA
 adafruit_feather_adalogger.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_adalogger.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_adalogger.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_adalogger.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_adalogger.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_adalogger.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_adalogger.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_adalogger.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -2123,7 +2123,7 @@ adafruit_feather_rfm.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 adafruit_feather_rfm.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_rfm.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_rfm.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_rfm.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_rfm.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_rfm.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_rfm.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_rfm.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -2377,7 +2377,7 @@ adafruit_feather_thinkink.menu.uploadmethod.picotool.build.picodebugflags=-DENAB
 adafruit_feather_thinkink.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_thinkink.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_thinkink.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_thinkink.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_thinkink.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_thinkink.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_thinkink.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_thinkink.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -2631,7 +2631,7 @@ adafruit_feather_usb_host.menu.uploadmethod.picotool.build.picodebugflags=-DENAB
 adafruit_feather_usb_host.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_usb_host.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_usb_host.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_usb_host.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_usb_host.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_usb_host.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_usb_host.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_usb_host.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -2885,7 +2885,7 @@ adafruit_feather_can.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 adafruit_feather_can.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_can.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_can.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_can.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_can.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_can.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_can.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_can.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -3139,7 +3139,7 @@ adafruit_feather_prop_maker.menu.uploadmethod.picotool.build.picodebugflags=-DEN
 adafruit_feather_prop_maker.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_feather_prop_maker.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_feather_prop_maker.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_feather_prop_maker.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_prop_maker.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_feather_prop_maker.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_feather_prop_maker.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_feather_prop_maker.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -3401,7 +3401,7 @@ adafruit_itsybitsy.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICO
 adafruit_itsybitsy.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_itsybitsy.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_itsybitsy.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_itsybitsy.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_itsybitsy.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_itsybitsy.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_itsybitsy.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_itsybitsy.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -3711,7 +3711,7 @@ adafruit_metro.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL
 adafruit_metro.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_metro.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_metro.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_metro.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_metro.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_metro.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_metro.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_metro.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -3973,7 +3973,7 @@ adafruit_qtpy.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_
 adafruit_qtpy.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_qtpy.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_qtpy.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_qtpy.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_qtpy.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_qtpy.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_qtpy.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_qtpy.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -4235,7 +4235,7 @@ adafruit_stemmafriend.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 adafruit_stemmafriend.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_stemmafriend.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_stemmafriend.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_stemmafriend.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_stemmafriend.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_stemmafriend.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_stemmafriend.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_stemmafriend.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -4489,7 +4489,7 @@ adafruit_trinkeyrp2040qt.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 adafruit_trinkeyrp2040qt.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_trinkeyrp2040qt.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_trinkeyrp2040qt.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_trinkeyrp2040qt.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_trinkeyrp2040qt.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_trinkeyrp2040qt.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_trinkeyrp2040qt.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_trinkeyrp2040qt.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -4743,7 +4743,7 @@ adafruit_macropad2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 adafruit_macropad2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_macropad2040.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_macropad2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_macropad2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_macropad2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_macropad2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_macropad2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_macropad2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -4997,7 +4997,7 @@ adafruit_kb2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOO
 adafruit_kb2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 adafruit_kb2040.menu.uploadmethod.picotool.upload.tool=picotool
 adafruit_kb2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-adafruit_kb2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_kb2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 adafruit_kb2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 adafruit_kb2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 adafruit_kb2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -6084,7 +6084,7 @@ amken_bunny.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_US
 amken_bunny.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 amken_bunny.menu.uploadmethod.picotool.upload.tool=picotool
 amken_bunny.menu.uploadmethod.picotool.upload.tool.default=picotool
-amken_bunny.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+amken_bunny.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 amken_bunny.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 amken_bunny.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 amken_bunny.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -6499,7 +6499,7 @@ amken_revelop.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_
 amken_revelop.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 amken_revelop.menu.uploadmethod.picotool.upload.tool=picotool
 amken_revelop.menu.uploadmethod.picotool.upload.tool.default=picotool
-amken_revelop.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+amken_revelop.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 amken_revelop.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 amken_revelop.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 amken_revelop.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -6914,7 +6914,7 @@ amken_revelop_plus.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICO
 amken_revelop_plus.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 amken_revelop_plus.menu.uploadmethod.picotool.upload.tool=picotool
 amken_revelop_plus.menu.uploadmethod.picotool.upload.tool.default=picotool
-amken_revelop_plus.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+amken_revelop_plus.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 amken_revelop_plus.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 amken_revelop_plus.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 amken_revelop_plus.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -7217,7 +7217,7 @@ amken_revelop_es.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTO
 amken_revelop_es.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 amken_revelop_es.menu.uploadmethod.picotool.upload.tool=picotool
 amken_revelop_es.menu.uploadmethod.picotool.upload.tool.default=picotool
-amken_revelop_es.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+amken_revelop_es.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 amken_revelop_es.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 amken_revelop_es.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 amken_revelop_es.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -7531,7 +7531,7 @@ arduino_nano_connect.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 arduino_nano_connect.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 arduino_nano_connect.menu.uploadmethod.picotool.upload.tool=picotool
 arduino_nano_connect.menu.uploadmethod.picotool.upload.tool.default=picotool
-arduino_nano_connect.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+arduino_nano_connect.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 arduino_nano_connect.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 arduino_nano_connect.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 arduino_nano_connect.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -7763,7 +7763,7 @@ artronshop_rp2_nano.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PIC
 artronshop_rp2_nano.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 artronshop_rp2_nano.menu.uploadmethod.picotool.upload.tool=picotool
 artronshop_rp2_nano.menu.uploadmethod.picotool.upload.tool.default=picotool
-artronshop_rp2_nano.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+artronshop_rp2_nano.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 artronshop_rp2_nano.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 artronshop_rp2_nano.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 artronshop_rp2_nano.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -8093,7 +8093,7 @@ breadstick_raspberry.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 breadstick_raspberry.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 breadstick_raspberry.menu.uploadmethod.picotool.upload.tool=picotool
 breadstick_raspberry.menu.uploadmethod.picotool.upload.tool.default=picotool
-breadstick_raspberry.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+breadstick_raspberry.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 breadstick_raspberry.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 breadstick_raspberry.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 breadstick_raspberry.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -8368,7 +8368,7 @@ bridgetek_idm2040_7a.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 bridgetek_idm2040_7a.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 bridgetek_idm2040_7a.menu.uploadmethod.picotool.upload.tool=picotool
 bridgetek_idm2040_7a.menu.uploadmethod.picotool.upload.tool.default=picotool
-bridgetek_idm2040_7a.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+bridgetek_idm2040_7a.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 bridgetek_idm2040_7a.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 bridgetek_idm2040_7a.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 bridgetek_idm2040_7a.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -8619,7 +8619,7 @@ bridgetek_idm2040_43a.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 bridgetek_idm2040_43a.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 bridgetek_idm2040_43a.menu.uploadmethod.picotool.upload.tool=picotool
 bridgetek_idm2040_43a.menu.uploadmethod.picotool.upload.tool.default=picotool
-bridgetek_idm2040_43a.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+bridgetek_idm2040_43a.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 bridgetek_idm2040_43a.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 bridgetek_idm2040_43a.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 bridgetek_idm2040_43a.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -8851,7 +8851,7 @@ cytron_maker_nano_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 cytron_maker_nano_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 cytron_maker_nano_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 cytron_maker_nano_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-cytron_maker_nano_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+cytron_maker_nano_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 cytron_maker_nano_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 cytron_maker_nano_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 cytron_maker_nano_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -9083,7 +9083,7 @@ cytron_maker_pi_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_
 cytron_maker_pi_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 cytron_maker_pi_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 cytron_maker_pi_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-cytron_maker_pi_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+cytron_maker_pi_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 cytron_maker_pi_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 cytron_maker_pi_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 cytron_maker_pi_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -9315,7 +9315,7 @@ cytron_maker_uno_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 cytron_maker_uno_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 cytron_maker_uno_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 cytron_maker_uno_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-cytron_maker_uno_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+cytron_maker_uno_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 cytron_maker_uno_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 cytron_maker_uno_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 cytron_maker_uno_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -9547,7 +9547,7 @@ datanoisetv_picoadk.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PIC
 datanoisetv_picoadk.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 datanoisetv_picoadk.menu.uploadmethod.picotool.upload.tool=picotool
 datanoisetv_picoadk.menu.uploadmethod.picotool.upload.tool.default=picotool
-datanoisetv_picoadk.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+datanoisetv_picoadk.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 datanoisetv_picoadk.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 datanoisetv_picoadk.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 datanoisetv_picoadk.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -9853,7 +9853,7 @@ degz_suibo.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 degz_suibo.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 degz_suibo.menu.uploadmethod.picotool.upload.tool=picotool
 degz_suibo.menu.uploadmethod.picotool.upload.tool.default=picotool
-degz_suibo.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+degz_suibo.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 degz_suibo.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 degz_suibo.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 degz_suibo.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -10099,7 +10099,7 @@ flyboard2040_core.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOT
 flyboard2040_core.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 flyboard2040_core.menu.uploadmethod.picotool.upload.tool=picotool
 flyboard2040_core.menu.uploadmethod.picotool.upload.tool.default=picotool
-flyboard2040_core.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+flyboard2040_core.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 flyboard2040_core.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 flyboard2040_core.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 flyboard2040_core.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -10315,7 +10315,7 @@ dfrobot_beetle_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 dfrobot_beetle_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 dfrobot_beetle_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 dfrobot_beetle_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-dfrobot_beetle_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+dfrobot_beetle_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 dfrobot_beetle_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 dfrobot_beetle_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 dfrobot_beetle_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -10561,7 +10561,7 @@ DudesCab.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 DudesCab.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 DudesCab.menu.uploadmethod.picotool.upload.tool=picotool
 DudesCab.menu.uploadmethod.picotool.upload.tool.default=picotool
-DudesCab.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+DudesCab.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 DudesCab.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 DudesCab.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 DudesCab.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -10793,7 +10793,7 @@ electroniccats_huntercat_nfc.menu.uploadmethod.picotool.build.picodebugflags=-DE
 electroniccats_huntercat_nfc.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 electroniccats_huntercat_nfc.menu.uploadmethod.picotool.upload.tool=picotool
 electroniccats_huntercat_nfc.menu.uploadmethod.picotool.upload.tool.default=picotool
-electroniccats_huntercat_nfc.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+electroniccats_huntercat_nfc.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 electroniccats_huntercat_nfc.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 electroniccats_huntercat_nfc.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 electroniccats_huntercat_nfc.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -11099,7 +11099,7 @@ evn_alpha.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 evn_alpha.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 evn_alpha.menu.uploadmethod.picotool.upload.tool=picotool
 evn_alpha.menu.uploadmethod.picotool.upload.tool.default=picotool
-evn_alpha.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+evn_alpha.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 evn_alpha.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 evn_alpha.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 evn_alpha.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -11307,7 +11307,7 @@ extelec_rc2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL
 extelec_rc2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 extelec_rc2040.menu.uploadmethod.picotool.upload.tool=picotool
 extelec_rc2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-extelec_rc2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+extelec_rc2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 extelec_rc2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 extelec_rc2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 extelec_rc2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -11581,7 +11581,7 @@ groundstudio_marble_pico.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 groundstudio_marble_pico.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 groundstudio_marble_pico.menu.uploadmethod.picotool.upload.tool=picotool
 groundstudio_marble_pico.menu.uploadmethod.picotool.upload.tool.default=picotool
-groundstudio_marble_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+groundstudio_marble_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 groundstudio_marble_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 groundstudio_marble_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 groundstudio_marble_pico.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -11855,7 +11855,7 @@ challenger_2040_lte.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PIC
 challenger_2040_lte.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_lte.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_lte.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_lte.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_lte.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_lte.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_lte.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_lte.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -12129,7 +12129,7 @@ challenger_2040_lora.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 challenger_2040_lora.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_lora.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_lora.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_lora.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_lora.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_lora.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_lora.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_lora.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -12403,7 +12403,7 @@ challenger_2040_subghz.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_
 challenger_2040_subghz.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_subghz.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_subghz.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_subghz.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_subghz.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_subghz.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_subghz.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_subghz.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -12678,7 +12678,7 @@ challenger_2040_wifi.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 challenger_2040_wifi.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_wifi.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_wifi.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -12953,7 +12953,7 @@ challenger_2040_wifi_ble.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 challenger_2040_wifi_ble.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_wifi_ble.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_wifi_ble.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -13228,7 +13228,7 @@ challenger_2040_wifi6_ble.menu.uploadmethod.picotool.build.picodebugflags=-DENAB
 challenger_2040_wifi6_ble.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_wifi6_ble.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_wifi6_ble.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_wifi6_ble.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_wifi6_ble.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_wifi6_ble.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_wifi6_ble.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_wifi6_ble.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -13503,7 +13503,7 @@ challenger_nb_2040_wifi.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 challenger_nb_2040_wifi.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_nb_2040_wifi.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_nb_2040_wifi.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_nb_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_nb_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_nb_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_nb_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_nb_2040_wifi.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -13777,7 +13777,7 @@ challenger_2040_sdrtc.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 challenger_2040_sdrtc.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_sdrtc.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_sdrtc.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_sdrtc.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_sdrtc.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_sdrtc.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_sdrtc.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_sdrtc.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -14051,7 +14051,7 @@ challenger_2040_nfc.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PIC
 challenger_2040_nfc.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_nfc.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_nfc.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_nfc.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_nfc.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_nfc.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_nfc.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_nfc.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -14325,7 +14325,7 @@ challenger_2040_uwb.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PIC
 challenger_2040_uwb.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 challenger_2040_uwb.menu.uploadmethod.picotool.upload.tool=picotool
 challenger_2040_uwb.menu.uploadmethod.picotool.upload.tool.default=picotool
-challenger_2040_uwb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+challenger_2040_uwb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 challenger_2040_uwb.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 challenger_2040_uwb.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 challenger_2040_uwb.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -14600,7 +14600,7 @@ connectivity_2040_lte_wifi_ble.menu.uploadmethod.picotool.build.picodebugflags=-
 connectivity_2040_lte_wifi_ble.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 connectivity_2040_lte_wifi_ble.menu.uploadmethod.picotool.upload.tool=picotool
 connectivity_2040_lte_wifi_ble.menu.uploadmethod.picotool.upload.tool.default=picotool
-connectivity_2040_lte_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+connectivity_2040_lte_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 connectivity_2040_lte_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 connectivity_2040_lte_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 connectivity_2040_lte_wifi_ble.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -14875,7 +14875,7 @@ ilabs_rpico32.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_
 ilabs_rpico32.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 ilabs_rpico32.menu.uploadmethod.picotool.upload.tool=picotool
 ilabs_rpico32.menu.uploadmethod.picotool.upload.tool.default=picotool
-ilabs_rpico32.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+ilabs_rpico32.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 ilabs_rpico32.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 ilabs_rpico32.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 ilabs_rpico32.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -15149,7 +15149,7 @@ melopero_cookie_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_
 melopero_cookie_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 melopero_cookie_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 melopero_cookie_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-melopero_cookie_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+melopero_cookie_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 melopero_cookie_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 melopero_cookie_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 melopero_cookie_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -15479,7 +15479,7 @@ melopero_shake_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 melopero_shake_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 melopero_shake_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 melopero_shake_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-melopero_shake_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+melopero_shake_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 melopero_shake_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 melopero_shake_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 melopero_shake_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -15760,7 +15760,7 @@ akana_r1.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 akana_r1.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 akana_r1.menu.uploadmethod.picotool.upload.tool=picotool
 akana_r1.menu.uploadmethod.picotool.upload.tool.default=picotool
-akana_r1.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+akana_r1.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 akana_r1.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 akana_r1.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 akana_r1.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -16006,7 +16006,7 @@ nekosystems_bl2040_mini.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 nekosystems_bl2040_mini.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 nekosystems_bl2040_mini.menu.uploadmethod.picotool.upload.tool=picotool
 nekosystems_bl2040_mini.menu.uploadmethod.picotool.upload.tool.default=picotool
-nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -16252,7 +16252,7 @@ newsan_archi.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_U
 newsan_archi.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 newsan_archi.menu.uploadmethod.picotool.upload.tool=picotool
 newsan_archi.menu.uploadmethod.picotool.upload.tool.default=picotool
-newsan_archi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+newsan_archi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 newsan_archi.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 newsan_archi.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 newsan_archi.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -16482,7 +16482,7 @@ nullbits_bit_c_pro.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICO
 nullbits_bit_c_pro.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 nullbits_bit_c_pro.menu.uploadmethod.picotool.upload.tool=picotool
 nullbits_bit_c_pro.menu.uploadmethod.picotool.upload.tool.default=picotool
-nullbits_bit_c_pro.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+nullbits_bit_c_pro.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 nullbits_bit_c_pro.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 nullbits_bit_c_pro.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 nullbits_bit_c_pro.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -16714,7 +16714,7 @@ olimex_rp2040pico30_2mb.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 olimex_rp2040pico30_2mb.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 olimex_rp2040pico30_2mb.menu.uploadmethod.picotool.upload.tool=picotool
 olimex_rp2040pico30_2mb.menu.uploadmethod.picotool.upload.tool.default=picotool
-olimex_rp2040pico30_2mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+olimex_rp2040pico30_2mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 olimex_rp2040pico30_2mb.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 olimex_rp2040pico30_2mb.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 olimex_rp2040pico30_2mb.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -17044,7 +17044,7 @@ olimex_rp2040pico30_16mb.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 olimex_rp2040pico30_16mb.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 olimex_rp2040pico30_16mb.menu.uploadmethod.picotool.upload.tool=picotool
 olimex_rp2040pico30_16mb.menu.uploadmethod.picotool.upload.tool.default=picotool
-olimex_rp2040pico30_16mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+olimex_rp2040pico30_16mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 olimex_rp2040pico30_16mb.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 olimex_rp2040pico30_16mb.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 olimex_rp2040pico30_16mb.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -17318,7 +17318,7 @@ pimoroni_pga2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTO
 pimoroni_pga2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 pimoroni_pga2040.menu.uploadmethod.picotool.upload.tool=picotool
 pimoroni_pga2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-pimoroni_pga2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+pimoroni_pga2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 pimoroni_pga2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 pimoroni_pga2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 pimoroni_pga2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -17550,7 +17550,7 @@ pimoroni_plasma2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PIC
 pimoroni_plasma2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 pimoroni_plasma2040.menu.uploadmethod.picotool.upload.tool=picotool
 pimoroni_plasma2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-pimoroni_plasma2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+pimoroni_plasma2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 pimoroni_plasma2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 pimoroni_plasma2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 pimoroni_plasma2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -17810,7 +17810,7 @@ pimoroni_tiny2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOT
 pimoroni_tiny2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 pimoroni_tiny2040.menu.uploadmethod.picotool.upload.tool=picotool
 pimoroni_tiny2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-pimoroni_tiny2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+pimoroni_tiny2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 pimoroni_tiny2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 pimoroni_tiny2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 pimoroni_tiny2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -18032,7 +18032,7 @@ pintronix_pinmax.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTO
 pintronix_pinmax.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 pintronix_pinmax.menu.uploadmethod.picotool.upload.tool=picotool
 pintronix_pinmax.menu.uploadmethod.picotool.upload.tool.default=picotool
-pintronix_pinmax.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+pintronix_pinmax.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 pintronix_pinmax.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 pintronix_pinmax.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 pintronix_pinmax.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -18264,7 +18264,7 @@ rakwireless_rak11300.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 rakwireless_rak11300.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 rakwireless_rak11300.menu.uploadmethod.picotool.upload.tool=picotool
 rakwireless_rak11300.menu.uploadmethod.picotool.upload.tool.default=picotool
-rakwireless_rak11300.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+rakwireless_rak11300.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 rakwireless_rak11300.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 rakwireless_rak11300.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 rakwireless_rak11300.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -18578,7 +18578,7 @@ redscorp_rp2040_eins.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 redscorp_rp2040_eins.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 redscorp_rp2040_eins.menu.uploadmethod.picotool.upload.tool=picotool
 redscorp_rp2040_eins.menu.uploadmethod.picotool.upload.tool.default=picotool
-redscorp_rp2040_eins.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+redscorp_rp2040_eins.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 redscorp_rp2040_eins.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 redscorp_rp2040_eins.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 redscorp_rp2040_eins.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -18892,7 +18892,7 @@ redscorp_rp2040_promini.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 redscorp_rp2040_promini.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 redscorp_rp2040_promini.menu.uploadmethod.picotool.upload.tool=picotool
 redscorp_rp2040_promini.menu.uploadmethod.picotool.upload.tool.default=picotool
-redscorp_rp2040_promini.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+redscorp_rp2040_promini.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 redscorp_rp2040_promini.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 redscorp_rp2040_promini.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 redscorp_rp2040_promini.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -19142,7 +19142,7 @@ sea_picro.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 sea_picro.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 sea_picro.menu.uploadmethod.picotool.upload.tool=picotool
 sea_picro.menu.uploadmethod.picotool.upload.tool.default=picotool
-sea_picro.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+sea_picro.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 sea_picro.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 sea_picro.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 sea_picro.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -19360,7 +19360,7 @@ silicognition_rp2040_shim.menu.uploadmethod.picotool.build.picodebugflags=-DENAB
 silicognition_rp2040_shim.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 silicognition_rp2040_shim.menu.uploadmethod.picotool.upload.tool=picotool
 silicognition_rp2040_shim.menu.uploadmethod.picotool.upload.tool.default=picotool
-silicognition_rp2040_shim.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+silicognition_rp2040_shim.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 silicognition_rp2040_shim.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 silicognition_rp2040_shim.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 silicognition_rp2040_shim.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -19610,7 +19610,7 @@ solderparty_rp2040_stamp.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 solderparty_rp2040_stamp.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 solderparty_rp2040_stamp.menu.uploadmethod.picotool.upload.tool=picotool
 solderparty_rp2040_stamp.menu.uploadmethod.picotool.upload.tool.default=picotool
-solderparty_rp2040_stamp.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+solderparty_rp2040_stamp.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 solderparty_rp2040_stamp.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 solderparty_rp2040_stamp.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 solderparty_rp2040_stamp.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -19940,7 +19940,7 @@ sparkfun_micromodrp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 sparkfun_micromodrp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 sparkfun_micromodrp2040.menu.uploadmethod.picotool.upload.tool=picotool
 sparkfun_micromodrp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-sparkfun_micromodrp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+sparkfun_micromodrp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 sparkfun_micromodrp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 sparkfun_micromodrp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 sparkfun_micromodrp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -20270,7 +20270,7 @@ sparkfun_promicrorp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 sparkfun_promicrorp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 sparkfun_promicrorp2040.menu.uploadmethod.picotool.upload.tool=picotool
 sparkfun_promicrorp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-sparkfun_promicrorp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+sparkfun_promicrorp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 sparkfun_promicrorp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 sparkfun_promicrorp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 sparkfun_promicrorp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -20600,7 +20600,7 @@ sparkfun_thingplusrp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 sparkfun_thingplusrp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 sparkfun_thingplusrp2040.menu.uploadmethod.picotool.upload.tool=picotool
 sparkfun_thingplusrp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-sparkfun_thingplusrp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+sparkfun_thingplusrp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 sparkfun_thingplusrp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 sparkfun_thingplusrp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 sparkfun_thingplusrp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -20832,7 +20832,7 @@ upesy_rp2040_devkit.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PIC
 upesy_rp2040_devkit.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 upesy_rp2040_devkit.menu.uploadmethod.picotool.upload.tool=picotool
 upesy_rp2040_devkit.menu.uploadmethod.picotool.upload.tool.default=picotool
-upesy_rp2040_devkit.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+upesy_rp2040_devkit.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 upesy_rp2040_devkit.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 upesy_rp2040_devkit.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 upesy_rp2040_devkit.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -21064,7 +21064,7 @@ seeed_indicator_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_
 seeed_indicator_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 seeed_indicator_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 seeed_indicator_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-seeed_indicator_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+seeed_indicator_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 seeed_indicator_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 seeed_indicator_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 seeed_indicator_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -21296,7 +21296,7 @@ seeed_xiao_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOT
 seeed_xiao_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 seeed_xiao_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 seeed_xiao_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-seeed_xiao_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+seeed_xiao_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 seeed_xiao_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 seeed_xiao_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 seeed_xiao_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -21582,7 +21582,7 @@ vccgnd_yd_rp2040.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTO
 vccgnd_yd_rp2040.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 vccgnd_yd_rp2040.menu.uploadmethod.picotool.upload.tool=picotool
 vccgnd_yd_rp2040.menu.uploadmethod.picotool.upload.tool.default=picotool
-vccgnd_yd_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+vccgnd_yd_rp2040.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 vccgnd_yd_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 vccgnd_yd_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 vccgnd_yd_rp2040.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -21856,7 +21856,7 @@ viyalab_mizu.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_U
 viyalab_mizu.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 viyalab_mizu.menu.uploadmethod.picotool.upload.tool=picotool
 viyalab_mizu.menu.uploadmethod.picotool.upload.tool.default=picotool
-viyalab_mizu.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+viyalab_mizu.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 viyalab_mizu.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 viyalab_mizu.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 viyalab_mizu.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -22088,7 +22088,7 @@ waveshare_rp2040_zero.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 waveshare_rp2040_zero.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_zero.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_zero.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_zero.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_zero.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_zero.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_zero.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_zero.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -22334,7 +22334,7 @@ waveshare_rp2040_one.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 waveshare_rp2040_one.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_one.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_one.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_one.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_one.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_one.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_one.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_one.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -22566,7 +22566,7 @@ waveshare_rp2040_matrix.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 waveshare_rp2040_matrix.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_matrix.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_matrix.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_matrix.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_matrix.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_matrix.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_matrix.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_matrix.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -22896,7 +22896,7 @@ waveshare_rp2040_pizero.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE
 waveshare_rp2040_pizero.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_pizero.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_pizero.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_pizero.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_pizero.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_pizero.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_pizero.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_pizero.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -23142,7 +23142,7 @@ waveshare_rp2040_plus_4mb.menu.uploadmethod.picotool.build.picodebugflags=-DENAB
 waveshare_rp2040_plus_4mb.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_plus_4mb.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_plus_4mb.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_plus_4mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_plus_4mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_plus_4mb.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_plus_4mb.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_plus_4mb.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -23472,7 +23472,7 @@ waveshare_rp2040_plus_16mb.menu.uploadmethod.picotool.build.picodebugflags=-DENA
 waveshare_rp2040_plus_16mb.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_plus_16mb.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_plus_16mb.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_plus_16mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_plus_16mb.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_plus_16mb.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_plus_16mb.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_plus_16mb.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -23704,7 +23704,7 @@ waveshare_rp2040_lcd_0_96.menu.uploadmethod.picotool.build.picodebugflags=-DENAB
 waveshare_rp2040_lcd_0_96.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_lcd_0_96.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_lcd_0_96.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_lcd_0_96.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_lcd_0_96.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_lcd_0_96.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_lcd_0_96.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_lcd_0_96.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -23936,7 +23936,7 @@ waveshare_rp2040_lcd_1_28.menu.uploadmethod.picotool.build.picodebugflags=-DENAB
 waveshare_rp2040_lcd_1_28.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 waveshare_rp2040_lcd_1_28.menu.uploadmethod.picotool.upload.tool=picotool
 waveshare_rp2040_lcd_1_28.menu.uploadmethod.picotool.upload.tool.default=picotool
-waveshare_rp2040_lcd_1_28.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+waveshare_rp2040_lcd_1_28.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 waveshare_rp2040_lcd_1_28.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 waveshare_rp2040_lcd_1_28.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 waveshare_rp2040_lcd_1_28.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -24168,7 +24168,7 @@ wiznet_5100s_evb_pico.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_P
 wiznet_5100s_evb_pico.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 wiznet_5100s_evb_pico.menu.uploadmethod.picotool.upload.tool=picotool
 wiznet_5100s_evb_pico.menu.uploadmethod.picotool.upload.tool.default=picotool
-wiznet_5100s_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+wiznet_5100s_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 wiznet_5100s_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 wiznet_5100s_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 wiznet_5100s_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -24400,7 +24400,7 @@ wiznet_wizfi360_evb_pico.menu.uploadmethod.picotool.build.picodebugflags=-DENABL
 wiznet_wizfi360_evb_pico.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 wiznet_wizfi360_evb_pico.menu.uploadmethod.picotool.upload.tool=picotool
 wiznet_wizfi360_evb_pico.menu.uploadmethod.picotool.upload.tool.default=picotool
-wiznet_wizfi360_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+wiznet_wizfi360_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 wiznet_wizfi360_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 wiznet_wizfi360_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 wiznet_wizfi360_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -24632,7 +24632,7 @@ wiznet_5500_evb_pico.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PI
 wiznet_5500_evb_pico.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 wiznet_5500_evb_pico.menu.uploadmethod.picotool.upload.tool=picotool
 wiznet_5500_evb_pico.menu.uploadmethod.picotool.upload.tool.default=picotool
-wiznet_5500_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+wiznet_5500_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 wiznet_5500_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 wiznet_5500_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 wiznet_5500_evb_pico.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
@@ -24932,7 +24932,7 @@ generic.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
 generic.menu.uploadmethod.picotool.upload.maximum_data_size=262144
 generic.menu.uploadmethod.picotool.upload.tool=picotool
 generic.menu.uploadmethod.picotool.upload.tool.default=picotool
-generic.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+generic.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe/Debugprobe (CMSIS-DAP)
 generic.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
 generic.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
 generic.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144

cores/rp2040/RP2040Support.h

@@ -27,6 +27,7 @@
 #include <hardware/structs/rosc.h>
 #include <hardware/structs/systick.h>
 #include <pico/multicore.h>
+#include <hardware/dma.h>
 #include <pico/rand.h>
 #include <pico/util/queue.h>
 #include <pico/bootrom.h>
@@ -311,6 +312,36 @@ public:
         return id;
     }
 
+#pragma GCC push_options
+#pragma GCC optimize ("Os")
+    void *memcpyDMA(void *dest, const void *src, size_t n) {
+        // Allocate a DMA channel on 1st call, reuse it every call after
+        if (memcpyDMAChannel < 1) {
+            memcpyDMAChannel = dma_claim_unused_channel(true);
+            dma_channel_config c = dma_channel_get_default_config(memcpyDMAChannel);
+            channel_config_set_transfer_data_size(&c, DMA_SIZE_32);
+            channel_config_set_read_increment(&c, true);
+            channel_config_set_write_increment(&c, true);
+            channel_config_set_irq_quiet(&c, true);
+            dma_channel_set_config(memcpyDMAChannel, &c, false);
+        }
+        // If there's any misalignment or too small, use regular memcpy which can handle it
+        if ((n < 64) || (((uint32_t)dest) | ((uint32_t)src) | n) & 3) {
+            return memcpy(dest, src, n);
+        }
+
+        int words = n / 4;
+        dma_channel_set_read_addr(memcpyDMAChannel, src, false);
+        dma_channel_set_write_addr(memcpyDMAChannel, dest, false);
+        dma_channel_set_trans_count(memcpyDMAChannel, words, false);
+        dma_channel_start(memcpyDMAChannel);
+        while (dma_channel_is_busy(memcpyDMAChannel)) {
+            /* busy wait dma */
+        }
+        return dest;
+    }
+#pragma GCC pop_options
+
     // Multicore comms FIFO
     _MFIFO fifo;
 
@@ -336,4 +367,5 @@ private:
     PIO _pio;
     int _sm;
     PIOProgram *_ccountPgm;
+    int memcpyDMAChannel = -1;
 };

cores/rp2040/RP2040USB.cpp

@@ -36,6 +36,7 @@
 #include <hardware/watchdog.h>
 #include <pico/bootrom.h>
 #include "sdkoverride/tusb_absmouse.h"
+#include "sdkoverride/tusb_gamepad16.h"
 #include <device/usbd_pvt.h>
 
 // Big, global USB mutex, shared with all USB devices to make sure we don't
@@ -155,47 +156,6 @@ static uint8_t *GetDescHIDReport(int *len) {
     return __hid_report;
 }
 
-#define TUD_HID_REPORT_DESC_GAMEPAD16(...) \
-  HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     )                 ,\
-  HID_USAGE      ( HID_USAGE_DESKTOP_GAMEPAD  )                 ,\
-  HID_COLLECTION ( HID_COLLECTION_APPLICATION )                 ,\
-    /* Report ID if any */\
-    __VA_ARGS__ \
-    /* 16 bit X, Y, Z, Rz, Rx, Ry (min -32767, max 32767 ) */ \
-    HID_USAGE_PAGE     ( HID_USAGE_PAGE_DESKTOP                 ) ,\
-    HID_USAGE          ( HID_USAGE_DESKTOP_X                    ) ,\
-    HID_USAGE          ( HID_USAGE_DESKTOP_Y                    ) ,\
-    HID_USAGE          ( HID_USAGE_DESKTOP_Z                    ) ,\
-    HID_USAGE          ( HID_USAGE_DESKTOP_RZ                   ) ,\
-    HID_USAGE          ( HID_USAGE_DESKTOP_RX                   ) ,\
-    HID_USAGE          ( HID_USAGE_DESKTOP_RY                   ) ,\
-    HID_LOGICAL_MIN_N  ( -32767, 2                              ) ,\
-    HID_LOGICAL_MAX_N  ( 32767, 2                               ) ,\
-    HID_REPORT_COUNT   ( 6                                      ) ,\
-    HID_REPORT_SIZE    ( 16                                     ) ,\
-    HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
-    /* 8 bit DPad/Hat Button Map  */ \
-    HID_USAGE_PAGE     ( HID_USAGE_PAGE_DESKTOP                 ) ,\
-    HID_USAGE          ( HID_USAGE_DESKTOP_HAT_SWITCH           ) ,\
-    HID_LOGICAL_MIN    ( 1                                      ) ,\
-    HID_LOGICAL_MAX    ( 8                                      ) ,\
-    HID_PHYSICAL_MIN   ( 0                                      ) ,\
-    HID_PHYSICAL_MAX_N ( 315, 2                                 ) ,\
-    HID_REPORT_COUNT   ( 1                                      ) ,\
-    HID_REPORT_SIZE    ( 8                                      ) ,\
-    HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
-    /* 32 bit Button Map */ \
-    HID_USAGE_PAGE     ( HID_USAGE_PAGE_BUTTON                  ) ,\
-    HID_USAGE_MIN      ( 1                                      ) ,\
-    HID_USAGE_MAX      ( 32                                     ) ,\
-    HID_LOGICAL_MIN    ( 0                                      ) ,\
-    HID_LOGICAL_MAX    ( 1                                      ) ,\
-    HID_REPORT_COUNT   ( 32                                     ) ,\
-    HID_REPORT_SIZE    ( 1                                      ) ,\
-    HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
-  HID_COLLECTION_END \
-
-
 void __SetupDescHIDReport() {
     //allocate memory for the HID report descriptors. We don't use them, but need the size here.
     uint8_t desc_hid_report_mouse[] = { TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(1)) };

cores/rp2040/RP2040Version.h

@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 3
 #define ARDUINO_PICO_MINOR 9
-#define ARDUINO_PICO_REVISION 4
-#define ARDUINO_PICO_VERSION_STR "3.9.4"
+#define ARDUINO_PICO_REVISION 5
+#define ARDUINO_PICO_VERSION_STR "3.9.5"

cores/rp2040/lwip_wrap.cpp

@@ -247,19 +247,19 @@ extern "C" {
     extern void __real_tcp_setprio(struct tcp_pcb *pcb, u8_t prio);
     void __wrap_tcp_setprio(struct tcp_pcb *pcb, u8_t prio) {
         LWIPMutex m;
-        return __real_tcp_setprio(pcb, prio);
+        __real_tcp_setprio(pcb, prio);
     }
 
     extern void __real_tcp_backlog_delayed(struct tcp_pcb* pcb);
     void __wrap_tcp_backlog_delayed(struct tcp_pcb* pcb) {
         LWIPMutex m;
-        return __real_tcp_backlog_delayed(pcb);
+        __real_tcp_backlog_delayed(pcb);
     }
 
     extern void __real_tcp_backlog_accepted(struct tcp_pcb* pcb);
     void __wrap_tcp_backlog_accepted(struct tcp_pcb* pcb) {
         LWIPMutex m;
-        return __real_tcp_backlog_accepted(pcb);
+        __real_tcp_backlog_accepted(pcb);
     }
     extern struct udp_pcb *__real_udp_new(void);
     struct udp_pcb *__wrap_udp_new(void) {

cores/rp2040/sdkoverride/tusb_gamepad16.h

@@ -0,0 +1,75 @@
+/*
+    16-bit axis gamepad definition
+    Copyright (c) 2024 Earle F. Philhower, III <earlephilhower@yahoo.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#pragma once
+
+#include "tusb.h"
+#include "class/hid/hid_device.h"
+
+#define TUD_HID_REPORT_DESC_GAMEPAD16(...) \
+  HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     )                 ,\
+  HID_USAGE      ( HID_USAGE_DESKTOP_GAMEPAD  )                 ,\
+  HID_COLLECTION ( HID_COLLECTION_APPLICATION )                 ,\
+    /* Report ID if any */\
+    __VA_ARGS__ \
+    /* 16 bit X, Y, Z, Rz, Rx, Ry (min -32767, max 32767 ) */ \
+    HID_USAGE_PAGE     ( HID_USAGE_PAGE_DESKTOP                 ) ,\
+    HID_USAGE          ( HID_USAGE_DESKTOP_X                    ) ,\
+    HID_USAGE          ( HID_USAGE_DESKTOP_Y                    ) ,\
+    HID_USAGE          ( HID_USAGE_DESKTOP_Z                    ) ,\
+    HID_USAGE          ( HID_USAGE_DESKTOP_RZ                   ) ,\
+    HID_USAGE          ( HID_USAGE_DESKTOP_RX                   ) ,\
+    HID_USAGE          ( HID_USAGE_DESKTOP_RY                   ) ,\
+    HID_LOGICAL_MIN_N  ( -32767, 2                              ) ,\
+    HID_LOGICAL_MAX_N  ( 32767, 2                               ) ,\
+    HID_REPORT_COUNT   ( 6                                      ) ,\
+    HID_REPORT_SIZE    ( 16                                     ) ,\
+    HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
+    /* 8 bit DPad/Hat Button Map  */ \
+    HID_USAGE_PAGE     ( HID_USAGE_PAGE_DESKTOP                 ) ,\
+    HID_USAGE          ( HID_USAGE_DESKTOP_HAT_SWITCH           ) ,\
+    HID_LOGICAL_MIN    ( 1                                      ) ,\
+    HID_LOGICAL_MAX    ( 8                                      ) ,\
+    HID_PHYSICAL_MIN   ( 0                                      ) ,\
+    HID_PHYSICAL_MAX_N ( 315, 2                                 ) ,\
+    HID_REPORT_COUNT   ( 1                                      ) ,\
+    HID_REPORT_SIZE    ( 8                                      ) ,\
+    HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
+    /* 32 bit Button Map */ \
+    HID_USAGE_PAGE     ( HID_USAGE_PAGE_BUTTON                  ) ,\
+    HID_USAGE_MIN      ( 1                                      ) ,\
+    HID_USAGE_MAX      ( 32                                     ) ,\
+    HID_LOGICAL_MIN    ( 0                                      ) ,\
+    HID_LOGICAL_MAX    ( 1                                      ) ,\
+    HID_REPORT_COUNT   ( 32                                     ) ,\
+    HID_REPORT_SIZE    ( 1                                      ) ,\
+    HID_INPUT          ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ) ,\
+  HID_COLLECTION_END \
+
+// HID Gamepad Protocol Report.
+typedef struct TU_ATTR_PACKED {
+    int16_t x;         ///< Delta x  movement of left analog-stick
+    int16_t y;         ///< Delta y  movement of left analog-stick
+    int16_t z;         ///< Delta z  movement of right analog-joystick
+    int16_t rz;        ///< Delta Rz movement of right analog-joystick
+    int16_t rx;        ///< Delta Rx movement of analog left trigger
+    int16_t ry;        ///< Delta Ry movement of analog right trigger
+    uint8_t hat;       ///< Buttons mask for currently pressed buttons in the DPad/hat
+    uint32_t buttons;  ///< Buttons mask for currently pressed buttons
+} hid_gamepad16_report_t;

docs/bearssl-client-secure-class.rst

@@ -120,7 +120,7 @@ Valid values for min and max are `BR_TLS10`, `BR_TLS11`, `BR_TLS12`.  Min and ma
 
 
 ESP32 Compatibility
-===================
+~~~~~~~~~~~~~~~~~~~
 Simple ESP32 ``WiFiClientSecure`` compatibility is built-in, allow for some sketches to run without any modification.
 The following methods are implemented:
 

docs/conf.py

@@ -54,9 +54,9 @@ author = u'Earle F. Philhower, III'
 # built documents.
 #
 # The short X.Y version.
-version = u'3.9.4'
+version = u'3.9.5'
 # The full version, including alpha/beta/rc tags.
-release = u'3.9.4'
+release = u'3.9.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/rp2040.rst

@@ -99,3 +99,13 @@ bootloader.
 void rp2040.rebootToBootloader()
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Will reboot the RP2040 into USB UF2 upload mode.
+
+DMA-based MEMCPY
+----------------
+The onboard DMA engines can copy 4-byte aligned quantities faster than the CPU.
+
+void \*rp2040.memcpyDMA(void \*dest, const void \*src, size_t count);
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Uses a DMA engine to transfer data from src to dest in 4-byte chunks without CPU
+intervention.  If any arguments are not 4-byte aligned, or if the count is not a
+multiple of 4, then it will fall back to CPU-managed memcpy.

include/bearssl/bearssl_git.h

@@ -1,2 +1,2 @@
 // Do not edit -- Automatically generated by tools/sdk/ssl/bearssl/Makefile
-#define BEARSSL_GIT f294aa0
+#define BEARSSL_GIT 5166f2b

lib/platform_wrap.txt

@@ -166,6 +166,7 @@
 
 -Wl,--wrap=tcp_arg
 -Wl,--wrap=tcp_new
+-Wl,--wrap=tcp_bind
 -Wl,--wrap=tcp_listen
 -Wl,--wrap=tcp_listen_with_backlog
 -Wl,--wrap=tcp_accept

libraries/ArduinoOTA/src/ArduinoOTA.cpp

@@ -22,23 +22,22 @@
 #include <functional>
 #include <WiFiUdp.h>
 #include "ArduinoOTA.h"
-#include "MD5Builder.h"
+#include <MD5Builder.h>
 #include <PicoOTA.h>
 #include <StreamString.h>
 
-#include "lwip/udp.h"
-#include "include/UdpContext.h"
+#include <lwip/udp.h>
+#include <include/UdpContext.h>
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_MDNS)
 #include <LEAmDNS.h>
 #endif
 
-//#ifdef DEBUG_ESP_OTA
-//#ifdef DEBUG_ESP_PORT
-//#define OTA_DEBUG DEBUG_ESP_PORT
-//#endif
-//#endif
-#define OTA_DEBUG Serial
+#ifdef DEBUG_RP2040_CORE
+#ifdef DEBUG_RP2040_PORT
+#define OTA_DEBUG DEBUG_RP2040_PORT
+#endif
+#endif
 
 ArduinoOTAClass::ArduinoOTAClass() {
 }

libraries/DNSServer/src/DNSServer.cpp

@@ -24,8 +24,8 @@
 #include <lwip/def.h>
 #include <Arduino.h>
 
-#ifdef DEBUG_ESP_PORT
-#define CONSOLE DEBUG_ESP_PORT
+#ifdef DEBUG_RP2040_PORT
+#define CONSOLE DEBUG_RP2040_PORT
 #else
 #define CONSOLE Serial
 #endif

libraries/FatFSUSB/src/FatFSUSB.h

@@ -19,6 +19,10 @@
 
 #pragma once
 
+#ifdef USE_TINYUSB
+#error FatFSUSB is not compatible with Adafruit TinyUSB
+#endif
+
 #include <Arduino.h>
 
 class FatFSUSBClass {

libraries/HID_Bluetooth/src/HID_Bluetooth.cpp

@@ -1,4 +1,5 @@
 #include "HID_Bluetooth.h"
+#include <sdkoverride/tusb_gamepad16.h>
 
 //setup the report map.
 //more generic function to be used with BLE & BT Classis
@@ -6,7 +7,7 @@ void __SetupHIDreportmap(void (*WeakMouse)(), void (*WeakKeyboard)(), void (*Wea
     //allocate memory for the HID report descriptors. We don't use them, but need the size here.
     uint8_t desc_hid_report_mouse[] = { TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(1)) };
     uint8_t desc_hid_report_absmouse[] = { TUD_HID_REPORT_DESC_ABSMOUSE(HID_REPORT_ID(1)) };
-    uint8_t desc_hid_report_joystick[] = { TUD_HID_REPORT_DESC_GAMEPAD(HID_REPORT_ID(1)) };
+    uint8_t desc_hid_report_joystick[] = { TUD_HID_REPORT_DESC_GAMEPAD16(HID_REPORT_ID(1)) };
     uint8_t desc_hid_report_keyboard[] = { TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(1)), TUD_HID_REPORT_DESC_CONSUMER(HID_REPORT_ID(2)) };
     int size = 0;
 
@@ -111,7 +112,7 @@ void __SetupHIDreportmap(void (*WeakMouse)(), void (*WeakKeyboard)(), void (*Wea
                 reportid++;
                 offset += sizeof(desc_hid_report_absmouse);
             }
-            uint8_t desc_local[] = { TUD_HID_REPORT_DESC_GAMEPAD(HID_REPORT_ID(reportid)) };
+            uint8_t desc_local[] = { TUD_HID_REPORT_DESC_GAMEPAD16(HID_REPORT_ID(reportid)) };
             memcpy(*reportmap + offset, desc_local, sizeof(desc_local));
         }
 

libraries/HTTPClient/src/HTTPClient.h

@@ -35,9 +35,9 @@
 #include <memory>
 #include <vector>
 
-#ifdef DEBUG_ESP_HTTP_CLIENT
-#ifdef DEBUG_ESP_PORT
-#define DEBUG_HTTPCLIENT(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ## __VA_ARGS__ )
+#ifdef DEBUG_RP2040_CORE
+#ifdef DEBUG_RP2040_PORT
+#define DEBUG_HTTPCLIENT(fmt, ...) DEBUG_RP2040_PORT.printf_P( (PGM_P)PSTR(fmt), ## __VA_ARGS__ )
 #endif
 #endif
 

libraries/HTTPUpdate/src/HTTPUpdate.h

@@ -31,9 +31,9 @@
 #include <WiFiUdp.h>
 #include <HTTPClient.h>
 
-#ifdef DEBUG_ESP_HTTP_UPDATE
-#ifdef DEBUG_ESP_PORT
-#define DEBUG_HTTP_UPDATE(fmt, ...) DEBUG_ESP_PORT.printf_P( (PGM_P)PSTR(fmt), ## __VA_ARGS__ )
+#ifdef DEBUG_RP2040_CORE
+#ifdef DEBUG_RP2040_PORT
+#define DEBUG_HTTP_UPDATE(fmt, ...) DEBUG_RP2040_PORT.printf_P( (PGM_P)PSTR(fmt), ## __VA_ARGS__ )
 #endif
 #endif
 

libraries/Joystick/src/Joystick.h

@@ -18,11 +18,14 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _JOYSTICK_h
-#define _JOYSTICK_h
+#pragma once
+
+#ifdef USE_TINYUSB
+#error Joystick is not compatible with Adafruit TinyUSB
+#endif
 
 #include <HID_Joystick.h>
-#include "class/hid/hid.h"
+#include <class/hid/hid.h>
 
 //======================================================================
 class Joystick_ : public HID_Joystick {
@@ -31,5 +34,3 @@ public:
     virtual void send_now(void) override;
 };
 extern Joystick_ Joystick;
-
-#endif /* _JOYSTICK_h */

libraries/Keyboard/src/Keyboard.h

@@ -20,8 +20,11 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef KEYBOARD_h
-#define KEYBOARD_h
+#pragma once
+
+#ifdef USE_TINYUSB
+#error Keyboard is not compatible with Adafruit TinyUSB
+#endif
 
 #include <HID_Keyboard.h>
 
@@ -34,5 +37,3 @@ public:
     Keyboard_(void);
 };
 extern Keyboard_ Keyboard;
-
-#endif

libraries/Mouse/src/Mouse.h

@@ -19,8 +19,11 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef MOUSE_h
-#define MOUSE_h
+#pragma once
+
+#ifdef USE_TINYUSB
+#error Mouse is not compatible with Adafruit TinyUSB
+#endif
 
 #include <HID_Mouse.h>
 
@@ -30,5 +33,3 @@ public:
     virtual void move(int x, int y, signed char wheel = 0) override;
 };
 extern Mouse_ Mouse;
-
-#endif

libraries/MouseAbsolute/src/MouseAbsolute.h

@@ -1,5 +1,5 @@
 /*
-    Mouse.h
+    MouseAbsolute.h
 
     Copyright (c) 2015, Arduino LLC
     Original code (pre-library): Copyright (c) 2011, Peter Barrett
@@ -19,8 +19,11 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef MOUSEABSOLUTE_h
-#define MOUSEABSOLUTE_h
+#pragma once
+
+#ifdef USE_TINYUSB
+#error MouseAbsolute is not compatible with Adafruit TinyUSB
+#endif
 
 #include <HID_Mouse.h>
 
@@ -30,5 +33,3 @@ public:
     virtual void move(int x, int y, signed char wheel = 0) override;
 };
 extern MouseAbsolute_ MouseAbsolute;
-
-#endif

libraries/SD/src/SD.h

@@ -1,5 +1,5 @@
 /*
-    SD.h - A thin shim for Arduino ESP8266 Filesystems
+    SD.h - A thin shim for Arduino RP2040 Filesystems
     Copyright (c) 2019 Earle F. Philhower, III.  All rights reserved.
 
     This library is free software; you can redistribute it and/or
@@ -139,9 +139,9 @@ public:
 
     size_t size() {
         uint64_t sz = size64();
-#ifdef DEBUG_ESP_PORT
+#ifdef DEBUG_RP2040_PORT
         if (sz > std::numeric_limits<uint32_t>::max()) {
-            DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld >= 4GB).  Please update source to use size64().\n"), (long long)sz);
+            DEBUG_RP2040_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld >= 4GB).  Please update source to use size64().\n"), (long long)sz);
         }
 #endif
         return (size_t)sz;

libraries/SDFS/src/SDFS.h

@@ -115,10 +115,10 @@ public:
         info.pageSize      = i.pageSize;
         info.maxOpenFiles  = i.maxOpenFiles;
         info.maxPathLength = i.maxPathLength;
-#ifdef DEBUG_ESP_PORT
+#ifdef DEBUG_RP2040_PORT
         if (i.totalBytes > std::numeric_limits<uint32_t>::max()) {
             // This catches both total and used cases, since used must always be < total.
-            DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld >= 4GB).  Please update source to use info64().\n"), (long long)i.totalBytes);
+            DEBUG_RP2040_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld >= 4GB).  Please update source to use info64().\n"), (long long)i.totalBytes);
         }
 #endif
         info.totalBytes    = (size_t)i.totalBytes;

libraries/SingleFileDrive/src/SingleFileDrive.h

@@ -19,6 +19,10 @@
 
 #pragma once
 
+#ifdef USE_TINYUSB
+#error SingleFileDrive is not compatible with Adafruit TinyUSB
+#endif
+
 #include <Arduino.h>
 
 class SingleFileDrive {

libraries/WiFi/src/CertStoreBearSSL.cpp

@@ -21,8 +21,8 @@
 #include <memory>
 
 
-#if defined(DEBUG_ESP_SSL) && defined(DEBUG_ESP_PORT)
-#define DEBUG_BSSL(fmt, ...)  DEBUG_ESP_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__)
+#if defined(DEBUG_RP2040_CORE) && defined(DEBUG_RP2040_PORT)
+#define DEBUG_BSSL(fmt, ...)  DEBUG_RP2040_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__)
 #else
 #define DEBUG_BSSL(...)
 #endif

libraries/WiFi/src/WiFiClientSecureBearSSL.cpp

@@ -29,18 +29,14 @@
 #include "WiFiClientSecureBearSSL.h"
 #include "WiFiNTP.h"
 #include "StackThunk.h"
-#include "lwip/opt.h"
-#include "lwip/ip.h"
-#include "lwip/tcp.h"
-#include "lwip/inet.h"
-#include "lwip/netif.h"
+#include <lwip/opt.h>
+#include <lwip/ip.h>
+#include <lwip/tcp.h>
+#include <lwip/inet.h>
+#include <lwip/netif.h>
 #include <include/ClientContext.h>
-//#include "c_types.h"
-//#include <mmu_iram.h>
-//#include <umm_malloc/umm_malloc.h>
-//#include <umm_malloc/umm_heap_select.h>
-#if 1
-#if !CORE_MOCK
+
+#if !defined(CORE_MOCK)
 
 // The BearSSL thunks in use for now
 #define br_ssl_engine_recvapp_ack thunk_br_ssl_engine_recvapp_ack
@@ -52,11 +48,10 @@
 #define br_ssl_engine_sendrec_ack thunk_br_ssl_engine_sendrec_ack
 #define br_ssl_engine_sendrec_buf thunk_br_ssl_engine_sendrec_buf
 
-#endif
 #endif
 
-#if defined(DEBUG_ESP_SSL) && defined(DEBUG_ESP_PORT)
-#define DEBUG_BSSL(fmt, ...)  DEBUG_ESP_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__)
+#if defined(DEBUG_RP2040_CORE) && defined(DEBUG_RP2040_PORT)
+#define DEBUG_BSSL(fmt, ...)  DEBUG_RP2040_PORT.printf_P((PGM_P)PSTR( "BSSL:" fmt), ## __VA_ARGS__)
 #else
 #define DEBUG_BSSL(...)
 #endif
@@ -721,12 +716,12 @@ extern "C" {
         if (!xc->done_cert) {
             br_sha1_update(&xc->sha1_cert, buf, len);
             br_x509_decoder_push(&xc->ctx, (const void*)buf, len);
-#if defined(DEBUG_ESP_SSL) && defined(DEBUG_ESP_PORT)
+#if defined(DEBUG_RP2040_CORE) && defined(DEBUG_RP2040_PORT)
             DEBUG_BSSL("CERT: ");
             for (size_t i = 0; i < len; i++) {
-                DEBUG_ESP_PORT.printf_P(PSTR("%02x "), buf[i] & 0xff);
+                DEBUG_RP2040_PORT.printf_P(PSTR("%02x "), buf[i] & 0xff);
             }
-            DEBUG_ESP_PORT.printf_P(PSTR("\n"));
+            DEBUG_RP2040_PORT.printf_P(PSTR("\n"));
 #endif
         }
     }
@@ -750,7 +745,7 @@ extern "C" {
         char res[20];
         br_sha1_out(&xc->sha1_cert, res);
         if (xc->match_fingerprint && memcmp(res, xc->match_fingerprint, sizeof(res))) {
-#ifdef DEBUG_ESP_SSL
+#if defined(DEBUG_RP2040_CORE) && defined(DEBUG_RP2040_PORT)
             DEBUG_BSSL("insecure_end_chain: Received cert FP doesn't match\n");
             char buff[3 * sizeof(res) + 1]; // 3 chars per byte XX_, and null
             buff[0] = 0;
@@ -1143,7 +1138,7 @@ bool WiFiClientSecureCtx::_connectSSL(const char* hostName) {
         }
     }
 
-#ifdef DEBUG_ESP_SSL
+#if defined(DEBUG_RP2040_CORE) && defined(DEBUG_RP2040_PORT)
     // BearSSL will reject all connections unless an authentication option is set, warn in DEBUG builds
     if (!_use_insecure && !_use_fingerprint && !_use_self_signed && !_knownkey && !_certStore && !_ta) {
         DEBUG_BSSL("Connection *will* fail, no authentication method is setup\n");
@@ -1213,7 +1208,7 @@ bool WiFiClientSecureCtx::_connectSSL(const char* hostName) {
     }
 
     auto ret = _wait_for_handshake();
-#ifdef DEBUG_ESP_SSL
+#if defined(DEBUG_RP2040_CORE) && defined(DEBUG_RP2040_PORT)
     if (!ret) {
         char err[256];
         getLastSSLError(err, sizeof(err));

libraries/WiFi/src/include/UdpContext.h

@@ -171,7 +171,7 @@ public:
         _on_rx = handler;
     }
 
-#ifdef DEBUG_ESP_CORE
+#ifdef DEBUG_RP2040_CORE
     // this helper is ready to be used when debugging UDP
     void printChain(const pbuf* pb, const char* msg, size_t n) const {
         // printf the pb pbuf chain, buffered and all at once

libraries/lwIP_Ethernet/src/LwipIntfCB.cpp

@@ -39,7 +39,7 @@ extern "C" void netif_status_changed(struct netif* netif) {
 
 bool LwipIntf::stateChangeSysCB(LwipIntf::CBType&& cb) {
     if (netifStatusChangeListLength >= NETIF_STATUS_CB_SIZE) {
-#if defined(DEBUG_ESP_CORE)
+#if defined(DEBUG_RP2040_CORE)
         DEBUGV("NETIF_STATUS_CB_SIZE is too low\n");
 #endif
         return false;

libraries/lwIP_Ethernet/src/LwipIntfDev.h

@@ -427,18 +427,20 @@ bool LwipIntfDev<RawDev>::begin(const uint8_t* macAddress, const uint16_t mtu) {
 
 template<class RawDev>
 void LwipIntfDev<RawDev>::end() {
-    if (_intrPin < 0) {
-        __removeEthernetPacketHandler(_phID);
-    } else {
-        detachInterrupt(_intrPin);
-        __removeEthernetGPIO(_intrPin);
+    if (_started) {
+        if (_intrPin < 0) {
+            __removeEthernetPacketHandler(_phID);
+        } else {
+            detachInterrupt(_intrPin);
+            __removeEthernetGPIO(_intrPin);
+        }
+
+        RawDev::end();
+
+        netif_remove(&_netif);
+
+        _started = false;
     }
-
-    RawDev::end();
-
-    netif_remove(&_netif);
-
-    _started = false;
 }
 
 template<class RawDev>

libraries/rp2040/examples/DMAMemcpy/DMAMemcpy.ino

@@ -0,0 +1,51 @@
+// Simple speed and functionality test for DMA memcpy
+// Released to the public domain by Earle F. Philhower, III, 2024
+
+
+uint32_t src[1024];
+uint32_t dest[1024];
+
+void setup() {
+  // Set up a simple test pattern in src, verify after each pass
+  srand(0xc0de);
+  for (int i = 0; i < 1024; i++) {
+    src[i] = ((~i) & 1024) | ((i) << 22);
+  }
+}
+
+void verify(const char *name, uint32_t *src) {
+  for (int i = 0; i < 1024; i++) {
+    uint32_t expected = ((~i) & 1024) | ((i) << 22);
+    if (expected != src[i]) {
+      Serial.printf("ERROR, mismatch @ %d on %s memcpy\n", i, name);
+      while (true) {
+        // Idle forever, this is fatal!
+      }
+    }
+  }
+}
+
+void loop() {
+  uint64_t start, stop;
+
+  start = rp2040.getCycleCount();
+  for (int i = 0; i < 1000; i++) {
+    memcpy(dest, src, 4 * 1024);
+    memcpy(src, dest, 4 * 1024);
+  }
+  stop = rp2040.getCycleCount();
+  verify("CPU", src);
+  verify("CPU", dest);
+  Serial.printf("CPU: %lld clock cycles for 4K\n", (stop - start) / 1000);
+
+  start = rp2040.getCycleCount();
+  for (int i = 0; i < 1000; i++) {
+    rp2040.memcpyDMA(dest, src, 4 * 1024);
+    rp2040.memcpyDMA(src, dest, 4 * 1024);
+  }
+  stop = rp2040.getCycleCount();
+  verify("DMA", src);
+  verify("DMA", dest);
+  Serial.printf("DMA: %lld clock cycles for 4K\n\n\n", (stop - start) / 1000);
+  delay(1000);
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinopico",
-  "version": "1.30904.0",
+  "version": "1.30905.0",
   "description": "Arduino Wiring-based Framework (RPi Pico RP2040)",
   "keywords": [
     "framework",

platform.txt

@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Raspberry Pi RP2040 Boards
-version=3.9.4
+version=3.9.5
 
 # Required discoveries and monitors
 # ---------------------------------

tests/build-tinyusb.sh

@@ -2,7 +2,7 @@
 
 cache_dir=$(mktemp -d)
 
-source "$TRAVIS_BUILD_DIR"/tests/common.sh
+source "$GITHUB_WORKSPACE"/tests/common.sh
 
 install_arduino nodebug
 

tests/build.sh

@@ -2,7 +2,7 @@
 
 cache_dir=$(mktemp -d)
 
-source "$TRAVIS_BUILD_DIR"/tests/common.sh
+source "$GITHUB_WORKSPACE"/tests/common.sh
 
 if [ -z "$BUILD_PARITY" ]; then
     mod=1

tests/ci/build_boards.sh

@@ -4,7 +4,7 @@
 
 set -ev
 
-cd $TRAVIS_BUILD_DIR
+cd $GITHUB_WORKSPACE
 
 tools/boards.txt.py --boardsgen --ldgen --packagegen --docgen
 

tests/ci/build_docs.sh

@@ -4,6 +4,6 @@
 
 set -ev
 
-cd $TRAVIS_BUILD_DIR/doc
+cd $GITHUB_WORKSPACE/doc
 
 SPHINXOPTS="-W" make html

tests/ci/build_package.sh

@@ -4,13 +4,13 @@
 
 set -ev
 
-export PKG_URL=https://github.com/esp8266/Arduino/releases/download/$TRAVIS_TAG/esp8266-$TRAVIS_TAG.zip
-export DOC_URL=https://arduino-esp8266.readthedocs.io/en/$TRAVIS_TAG/
+export PKG_URL=https://github.com/esp8266/Arduino/releases/download/$GITHUB_REF/esp8266-$GITHUB_REF.zip
+export DOC_URL=https://arduino-esp8266.readthedocs.io/en/$GITHUB_REF/
 
 if [ -z "$CI_GITHUB_API_KEY" ]; then
     echo "Github API key not set. Skip building the package."
     exit 0
 fi
 
-cd $TRAVIS_BUILD_DIR/package
+cd $GITHUB_WORKSPACE/package
 ./build_boards_manager_package.sh

tests/ci/host_test.sh

@@ -4,7 +4,7 @@
 
 set -ev
 
-cd $TRAVIS_BUILD_DIR/tests/host
+cd $GITHUB_WORKSPACE/tests/host
 
 
 make -j2 FORCE32=0 ssl

tests/ci/style_check.sh

@@ -12,4 +12,4 @@ ${org}/../restyle.sh
 git --version || true
 git submodule foreach --recursive 'git reset --hard'
 
-git diff --exit-code -- $TRAVIS_BUILD_DIR
+git diff --exit-code -- $GITHUB_WORKSPACE

tests/common.sh

@@ -230,9 +230,9 @@ function install_arduino()
 {
     local debug=$1
     # Install Arduino IDE and required libraries
-    cd $TRAVIS_BUILD_DIR
-    install_ide $HOME/arduino_ide $TRAVIS_BUILD_DIR $debug
-    cd $TRAVIS_BUILD_DIR
+    cd $GITHUB_WORKSPACE
+    install_ide $HOME/arduino_ide $GITHUB_WORKSPACE $debug
+    cd $GITHUB_WORKSPACE
     install_libraries
 }
 
@@ -244,7 +244,7 @@ function build_sketches_with_arduino()
 
     # Compile sketches
     build_sketches $HOME/arduino_ide $HOME/arduino_ide/examples "-l $HOME/Arduino/libraries ${build_extra}" $build_mod $build_rem
-    build_sketches $HOME/arduino_ide $TRAVIS_BUILD_DIR/libraries "-l $HOME/Arduino/libraries ${build_extra}" $build_mod $build_rem
+    build_sketches $HOME/arduino_ide $GITHUB_WORKSPACE/libraries "-l $HOME/Arduino/libraries ${build_extra}" $build_mod $build_rem
 
     # Generate size report
     cat size.log
@@ -253,11 +253,11 @@ function build_sketches_with_arduino()
 
 set -e
 
-if [ -z "$TRAVIS_BUILD_DIR" ]; then
-    echo "TRAVIS_BUILD_DIR is not set, trying to guess:"
+if [ -z "$GITHUB_WORKSPACE" ]; then
+    echo "GITHUB_WORKSPACE is not set, trying to guess:"
     pushd $(dirname $0)/../ > /dev/null
-    TRAVIS_BUILD_DIR=$PWD
+    GITHUB_WORKSPACE=$PWD
     popd > /dev/null
-    echo "TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR"
+    echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE"
 fi
 

tests/debug.sh

@@ -2,7 +2,7 @@
 
 cache_dir=$(mktemp -d)
 
-source "$TRAVIS_BUILD_DIR"/tests/common.sh
+source "$GITHUB_WORKSPACE"/tests/common.sh
 
 if [ "$BUILD_PARITY" = "even" ]; then
     mod=2

tests/run_CI_locally.sh

@@ -84,7 +84,7 @@ git submodule update --init
 (cd pico-extras && git submodule update --init)
 
 export HOME="${TMPCI}"
-export TRAVIS_BUILD_DIR="${TMPCI}"
+export GITHUB_WORKSPACE="${TMPCI}"
 export BUILD_TYPE="$BUILD_TYPE"
 
 if [ "$BUILD_TYPE" = "build" ]; then

tools/makeboards.py

@@ -134,7 +134,7 @@ def BuildIPBTStack(name):
 def BuildUploadMethodMenu(name):
     for a, b, c, d, e, f in [ ["default", "Default (UF2)", 256, "picoprobe_cmsis_dap.tcl", "uf2conv", "uf2conv-network"],
                               ["picotool", "Picotool", 256, "picoprobe.tcl", "picotool", None],
-                              ["picoprobe_cmsis_dap", "Picoprobe (CMSIS-DAP)", 256, "picoprobe_cmsis_dap.tcl", "picoprobe_cmsis_dap", None],
+                              ["picoprobe_cmsis_dap", "Picoprobe/Debugprobe (CMSIS-DAP)", 256, "picoprobe_cmsis_dap.tcl", "picoprobe_cmsis_dap", None],
                               ["picodebug", "Pico-Debug", 240, "picodebug.tcl", "picodebug", None] ]:
         print("%s.menu.uploadmethod.%s=%s" % (name, a, b))
         print("%s.menu.uploadmethod.%s.build.ram_length=%dk" % (name, a, c))