Update version

Fixes #1408

The wl_* types are required in multiple libraries which in turn seem
to have a circular dependency that Platform.IO has issues with in certain
modes.

Avoid the issue by moving the common headers into the core directories
so they will be accessible by all libs.

Move StackThunk to core directory, too

README.md

@@ -47,6 +47,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Neko Systems BL2040 Mini
 * nullbits Bit-C PRO
 * Pimoroni PGA2040
+* Seeed Indicator RP2040
 * Seeed XIAO RP2040
 * Solder Party RP2040 Stamp
 * SparkFun ProMicro RP2040

cores/rp2040/CoreMutex.cpp

@@ -33,7 +33,9 @@ CoreMutex::CoreMutex(mutex_t *mutex, uint8_t option) {
         if (_option & FromISR) {
             __freertos_mutex_take_from_isr(m);
         } else {
-            __freertos_mutex_take(m);
+            if (!__freertos_mutex_try_take(m)) {
+                return;
+            }
         }
     } else {
         uint32_t owner;

cores/rp2040/RP2040USB.cpp

@@ -130,13 +130,13 @@ int __USBGetKeyboardReportID() {
 }
 
 int __USBGetMouseReportID() {
-    return __USBInstallKeyboard ? 2 : 1;
+    return __USBInstallKeyboard ? 3 : 1;
 }
 
 int __USBGetJoystickReportID() {
     int i = 1;
     if (__USBInstallKeyboard) {
-        i++;
+        i += 2;
     }
     if (__USBInstallMouse || __USBInstallAbsoluteMouse) {
         i++;

cores/rp2040/RP2040Version.h

@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 3
-#define ARDUINO_PICO_MINOR 1
-#define ARDUINO_PICO_REVISION 1
-#define ARDUINO_PICO_VERSION_STR "3.1.1"
+#define ARDUINO_PICO_MINOR 2
+#define ARDUINO_PICO_REVISION 0
+#define ARDUINO_PICO_VERSION_STR "3.2.0"

cores/rp2040/_freertos.cpp

@@ -21,6 +21,7 @@
 #include "_freertos.h"
 #include "pico/mutex.h"
 #include <stdlib.h>
+#include "Arduino.h"
 
 typedef struct {
     mutex_t *src;
@@ -59,3 +60,45 @@ SemaphoreHandle_t __get_freertos_mutex_for_ptr(mutex_t *m, bool recursive) {
     }
     return nullptr; // Need to make space for more mutex maps!
 }
+
+
+// The HW Random code needs a precise sleep_until() in order to assure it
+// grabs the ROSC bit when it wants.  Unfortunately, under FreeRTOS the
+// sleep_until() becomes imprecise and the "did I get the bit when I wanted"
+// check in the pico_rand code always fails and you get an infinite loop.
+
+// This block wraps the 2 get_rand calls to set a flag to convert
+// sleep_until() (which can do a task swap and cause bad timing) into a
+// busy wait.
+
+extern "C" {
+    static bool __inRand = false;
+
+    extern uint64_t __real_get_rand_64();
+    uint64_t __wrap_get_rand_64() {
+        if (__isFreeRTOS) {
+            rp2040.idleOtherCore();
+            __inRand = true;
+            auto r = __real_get_rand_64();
+            __inRand = false;
+            rp2040.resumeOtherCore();
+            return r;
+        } else {
+            return __real_get_rand_64();
+        }
+    }
+
+    uint32_t __wrap_get_rand_32() {
+        return (uint32_t) __wrap_get_rand_64();
+    }
+
+    extern void __real_sleep_until(absolute_time_t t);
+    void __wrap_sleep_until(absolute_time_t t) {
+        if (__inRand) {
+            busy_wait_until(t);
+        } else {
+            __real_sleep_until(t);
+        }
+    }
+
+}

cores/rp2040/_needsbt.h

@@ -0,0 +1,7 @@
+// Simple helper header to ensure pico libs support ?BT
+
+#ifndef ENABLE_CLASSIC
+#define ENABLE_CLASSIC 0
+#endif
+
+static_assert(ENABLE_CLASSIC, "This library needs Bluetooth enabled.  Use the 'Tools->IP/Bluetooth Stack' menu in the IDE to enable it.");

docs/conf.py

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

docs/platformio.rst

@@ -341,10 +341,15 @@ To specify the debugging adapter, use ``debug_tool`` (`documentation <https://do
 * ``cmsis-dap``
 * ``jlink``
 * ``raspberrypi-swd``
+* ``blackmagic``
+* ``pico-debug``
 
 These values can also be used in ``upload_protocol`` if you want PlatformIO to upload the regular firmware through this method, which you likely want.
 
-Especially the PicoProbe method is convenient when you have two Raspberry Pi Pico boards. One of them can be flashed with the PicoProbe firmware (`documentation <https://www.raspberrypi.com/documentation/microcontrollers/raspberry-pi-pico.html#debugging-using-another-raspberry-pi-pico>`_) and is then connected to the target Raspberry Pi Pico board (see `documentation <https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf>`_ chapter "Picoprobe Wiring"). Remember that on Windows, you have to use `Zadig <https://zadig.akeo.ie/>`_ to also load "WinUSB" drivers for the "Picoprobe (Interface 2)" device so that OpenOCD can speak to it.
+Especially the PicoProbe method is convenient when you have two Raspberry Pi Pico boards. One of them can be flashed with the PicoProbe firmware (`documentation <https://www.raspberrypi.com/documentation/microcontrollers/raspberry-pi-pico.html#debugging-using-another-raspberry-pi-pico>`__) and is then connected to the target Raspberry Pi Pico board (see `documentation <https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf>`__ chapter "Picoprobe Wiring"). Remember that on Windows, you have to use `Zadig <https://zadig.akeo.ie/>`_ to also load "WinUSB" drivers for the "Picoprobe (Interface 2)" device so that OpenOCD can speak to it.
+
+.. note::
+    Newer PicoProbe firmware versions have dropped the proprietary "PicoProbe" USB communication protocol and emulate a **CMSIS-DAP** instead. Meaning, you have to use ``debug_tool = cmsis-dap`` for these newer firmwares, such as those obtained from `raspberrypi/picoprobe <https://github.com/raspberrypi/picoprobe/releases>`__
 
 With that set up, debugging can be started via the left debugging sidebar and works nicely: Setup breakpoints, inspect the value of variables in the code, step through the code line by line. When a breakpoint is hit or execution is halted, you can even see the execution state both Cortex-M0+ cores of the RP2040.
 
@@ -352,6 +357,30 @@ With that set up, debugging can be started via the left debugging sidebar and wo
 
 For further information on customizing debug options, like the initial breakpoint or debugging / SWD speed, consult `the documentation <https://docs.platformio.org/en/latest/projectconf/section_env_debug.html>`_.
 
+.. note:: 
+    For the BlackMagicProbe debugging probe (as can be e.g., created by simply flashing a STM32F103C8 "Bluepill" board), you currently have to use the branch ``fix/rp2040-flash-reliability`` (or at least commit ``1d001bc``) **and** use the `official ARM provided toolchain <https://github.com/blackmagic-debug/blackmagic/issues/1364#issuecomment-1503393266>`_.
+
+    You can obtain precompiled binaries from `here <https://github.com/blackmagic-debug/blackmagic/issues/1364#issuecomment-1503372723>`__. A flashing guide is available `here <https://primalcortex.wordpress.com/2017/06/13/building-a-black-magic-debug-probe/>`__. You then have to configure the target serial port ("GDB port") in your project per `documentation <https://docs.platformio.org/en/latest/plus/debug-tools/blackmagic.html#debugging-tool-blackmagic>`__.
+
+.. note:: 
+    For the pico-debug (`download <https://github.com/majbthrd/pico-debug/releases>`__) debugging way, *which needs to no additional debug probe*, add this snippet to your ``platformio.ini`` and follow the given procedure:
+
+    .. code:: ini
+
+        upload_protocol = pico-debug
+        debug_tool = pico-debug
+        build_flags = -DPIO_FRAMEWORK_ARDUINO_NO_USB
+
+    1. Build your firmware normally
+    2. Plug in the Pico in BOOTSEL mode
+    3. Drag and drop your ``.pio/build/<env>/firmware.uf2`` onto the boot drive
+    4. Unplug and replug your Pico back into BOOTSEL mode for the second time
+    5. Drag and drop the downloaded ``pico-debug-gimmecache.uf2`` file onto the boot drive
+    6. A CMSIS-DAP device should now appear on your computer
+    7. Start debugging via the debug sidebar as normal
+
+    Note the restrictions: The second core cannot be used, the USB port cannot be used (no USB serial, only UART serial), 16KB less RAM is available.
+
 Filesystem Uploading
 --------------------
 
@@ -366,3 +395,7 @@ The files you want to upload should be placed in a folder called ``data`` inside
 The task "Build Filesystem Image" will take all files in the data directory and create a ``littlefs.bin`` file from it using the ``mklittlefs`` tool.
 
 The task "Upload Filesystem Image" will upload the filesystem image to the Pico via the specified ``upload_protocol``. 
+
+.. note:: 
+    Set the space available for the filesystem in the ``platformio.ini`` using e.g., ``board_build.filesystem_size = 0.5m``, or filesystem
+    creation will fail!

lib/platform_wrap.txt

@@ -207,3 +207,7 @@
 -Wl,--wrap=cyw43_tcpip_link_status
 -Wl,--wrap=cyw43_cb_tcpip_init
 -Wl,--wrap=cyw43_cb_tcpip_deinit
+
+-Wl,--wrap=get_rand_64
+-Wl,--wrap=get_rand_32
+-Wl,--wrap=sleep_until

libraries/BTstackLib/examples/ANCS/ANCS.ino

@@ -1,4 +1,4 @@
-#include <BTstack.h>
+#include <BTstackLib.h>
 #include <stdio.h>
 #include "ble/att_server.h"
 #include "ble/gatt_client.h"

libraries/BTstackLib/examples/LECentral/LECentral.ino

@@ -1,4 +1,4 @@
-#include <BTstack.h>
+#include <BTstackLib.h>
 #include <SPI.h>
 
 /*

libraries/BTstackLib/examples/LEPeripheral/LEPeripheral.ino

@@ -1,5 +1,5 @@
 // LE Peripheral Example - not working yet
-#include <BTstack.h>
+#include <BTstackLib.h>
 #include <SPI.h>
 
 /*

libraries/BTstackLib/examples/iBeacon/iBeacon.ino

@@ -1,4 +1,4 @@
-#include <BTstack.h>
+#include <BTstackLib.h>
 #include <stdio.h>
 #include <SPI.h>
 

libraries/BTstackLib/examples/iBeaconScanner/iBeaconScanner.ino

@@ -1,5 +1,4 @@
-
-#include <BTstack.h>
+#include <BTstackLib.h>
 #include <SPI.h>
 
 /* EXAMPLE_START(iBeaconScanner): iBeacon Scanner

libraries/BTstackLib/src/BTstackLib.cpp

@@ -13,7 +13,7 @@
 //#include <Reset.h>  // also provides NVIC_SystemReset
 #endif
 
-#include "BTstack.h"
+#include "BTstackLib.h"
 
 #include "btstack_memory.h"
 #include "hal_tick.h"

libraries/BTstackLib/src/BTstackLib.h

@@ -1,6 +1,9 @@
 /**
     Arduino Wrapper for BTstack
 */
+
+#include <_needsbt.h>
+
 #ifndef __ARDUINO_BTSTACK_H
 #define __ARDUINO_BTSTACK_H
 
@@ -198,4 +201,4 @@ extern "C" {
 }
 #endif
 
-#endif // __ARDUINO_BTSTACK_H
+#endif // __ARDUINO_BTSTACK_H

libraries/FreeRTOS/keywords.txt

@@ -2,6 +2,8 @@
 # https://arduino.github.io/arduino-cli/library-specification/#keywords
 # Formatted by a single true tab (not spaces)
 
+FreeRTOS	KEYWORD1
+
 # Datatypes (KEYWORD1)
 StackType_t	KEYWORD1
 BaseType_t	KEYWORD1

libraries/FreeRTOS/src/variantHooks.cpp

@@ -216,16 +216,20 @@ void vApplicationTickHook(void) {
     Private function to enable board led to use it in application hooks
 */
 void prvSetMainLedOn(void) {
+#ifdef LED_BUILTIN
     gpio_init(LED_BUILTIN);
     gpio_set_dir(LED_BUILTIN, true);
     gpio_put(LED_BUILTIN, true);
+#endif
 }
 
 /**
     Private function to blink board led to use it in application hooks
 */
 void prvBlinkMainLed(void) {
+#ifdef LED_BUILTIN
     gpio_put(LED_BUILTIN, !gpio_get(LED_BUILTIN));
+#endif
 }
 
 #endif
@@ -376,9 +380,10 @@ static void __usb(void *param) {
     __usbInitted = true;
 
     while (true) {
-        if (mutex_try_enter(&__usb_mutex, NULL)) {
+        auto m = __get_freertos_mutex_for_ptr(&__usb_mutex);
+        if (xSemaphoreTake(m, 0)) {
             tud_task();
-            mutex_exit(&__usb_mutex);
+            xSemaphoreGive(m);
         }
         vTaskDelay(1 / portTICK_PERIOD_MS);
     }

libraries/HID_Bluetooth/src/PicoBluetoothBLEHID.h

@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <_needsbt.h>
 #include <Arduino.h>
 #include <functional>
 #include <pico/cyw43_arch.h>

libraries/HID_Bluetooth/src/PicoBluetoothHID.h

@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <_needsbt.h>
 #include <Arduino.h>
 #include <functional>
 #include <pico/cyw43_arch.h>

libraries/SerialBT/src/SerialBT.h

@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include <_needsbt.h>
 #include <Arduino.h>
 #include <api/HardwareSerial.h>
 #include <stdarg.h>

libraries/WiFi/examples/BearSSL_CertStore/certs-from-mozilla.py

@@ -47,7 +47,6 @@ for row in csvReader:
         if item.startswith("'-----BEGIN CERTIFICATE-----"):
             pems.append(item)
 del names[0] # Remove headers
-del pems[0] # Remove headers
 
 # Try and make ./data, skip if present
 try:

package.json

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

package/package_pico_index.template.json

@@ -44,6 +44,12 @@
                   {
                      "name": "Adafruit Feather RP2040 USB Host"
                   },
+                  {
+                     "name": "Adafruit Feather RP2040 CAN"
+                  },
+                  {
+                     "name": "Adafruit Feather RP2040 Prop-Maker"
+                  },
                   {
                      "name": "Adafruit ItsyBitsy RP2040"
                   },
@@ -146,6 +152,9 @@
                   {
                      "name": "uPesy RP2040 DevKit"
                   },
+                  {
+                     "name": "Seeed INDICATOR RP2040"
+                  },
                   {
                      "name": "Seeed XIAO RP2040"
                   },

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.1.1
+version=3.2.0
 
 runtime.tools.pqt-gcc.path={runtime.platform.path}/system/arm-none-eabi
 runtime.tools.pqt-python3.path={runtime.platform.path}/system/python3
@@ -43,7 +43,7 @@ compiler.warning_flags.more=-Wall -Werror=return-type -Wno-ignored-qualifiers
 compiler.warning_flags.all=-Wall -Wextra -Werror=return-type -Wno-ignored-qualifiers
 
 compiler.netdefines=-DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1 -DCYW43_LWIP=1 {build.libpicowdefs} -DLWIP_IGMP=1 -DLWIP_CHECKSUM_CTRL_PER_NETIF=1
-compiler.defines={build.led} {build.usbstack_flags} -DCFG_TUSB_MCU=OPT_MCU_RP2040 {build.usbpid} {build.usbvid} {build.usbpwr} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {compiler.netdefines} -DARDUINO_VARIANT="{build.variant}" -DTARGET_RP2040
+compiler.defines={build.led} {build.usbstack_flags} -DCFG_TUSB_MCU=OPT_MCU_RP2040 {build.usbpid} {build.usbvid} {build.usbpwr} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {compiler.netdefines} -DARDUINO_VARIANT="{build.variant}" -DTARGET_RP2040 -DPICO_FLASH_SIZE_BYTES={build.flash_total}
 compiler.includes="-iprefix{runtime.platform.path}/" "@{runtime.platform.path}/lib/platform_inc.txt" "-I{runtime.platform.path}/include"
 compiler.flags=-march=armv6-m -mcpu=cortex-m0plus -mthumb -ffunction-sections -fdata-sections {build.flags.exceptions} {build.flags.stackprotect} {build.flags.cmsis} {build.picodebugflags}
 compiler.wrap="@{runtime.platform.path}/lib/platform_wrap.txt"
@@ -82,6 +82,7 @@ compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
 
 # Board configuration, set in boards.txt.  Present here to ensure substitution works
+build.flash_total=
 build.flash_length=
 build.eeprom_start=
 build.flags.optimize=-Os

tests/restyle.sh

@@ -10,7 +10,7 @@ for dir in ./cores/rp2040 ./libraries/EEPROM ./libraries/I2S ./libraries/SingleF
            ./libraries/Updater ./libraries/HTTPClient ./libraries/HTTPUpdate \
            ./libraries/WebServer ./libraries/HTTPUpdateServer ./libraries/DNSServer \
            ./libraries/Joystick ./libraries/Keyboard ./libraries/Mouse \
-           ./libraries/JoystickBT ./libraries/KeyboardBT ./variants ./libraries/BTstack \
+           ./libraries/JoystickBT ./libraries/KeyboardBT ./variants ./libraries/BTstackLib \
            ./libraries/MouseBT ./libraries/SerialBT ./libraries/HID_Bluetooth \
            ./libraries/JoystickBLE ./libraries/KeyboardBLE ./libraries/MouseBLE ; do
     find $dir -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" \) -a  \! -path '*api*' -exec astyle --suffix=none --options=./tests/astyle_core.conf \{\} \;

tools/json/0xcb_helios.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_feather.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_feather_can.json

@@ -0,0 +1,56 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239A",
+        "usb_pid": "0x812F"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_CAN -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x812F"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "adafruit_feather_can"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Feather RP2040 CAN",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "blackmagic",
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe",
+      "pico-debug"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Adafruit"
+}

tools/json/adafruit_feather_dvi.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_feather_prop_maker.json

@@ -0,0 +1,56 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239A",
+        "usb_pid": "0x8131"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_PROP_MAKER -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x8131"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "adafruit_feather_prop_maker"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Feather RP2040 Prop-Maker",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "blackmagic",
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe",
+      "pico-debug"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Adafruit"
+}

tools/json/adafruit_feather_rfm.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_feather_scorpio.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_feather_thinkink.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_feather_usb_host.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_itsybitsy.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_kb2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_macropad2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_qtpy.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_stemmafriend.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/adafruit_trinkeyrp2040qt.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/arduino_nano_connect.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/bridgetek_idm2040-7a.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_lora.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_lte.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_nfc.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_sdrtc.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_subghz.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_uwb.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_wifi.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_2040_wifi_ble.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/challenger_nb_2040_wifi.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/cytron_maker_nano_rp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/cytron_maker_pi_rp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/datanoisetv_picoadk.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/dfrobot_beetle_rp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/electroniccats_huntercat_nfc.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/extelec_rc2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/flyboard2040_core.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/generic.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/ilabs_rpico32.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/melopero_cookie_rp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/melopero_shake_rp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/nekosystems_bl2040_mini.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/nullbits_bit_c_pro.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/pimoroni_pga2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/rpipico.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/rpipicow.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/seeed_indicator_rp2040.json

@@ -3,13 +3,13 @@
     "arduino": {
       "earlephilhower": {
         "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x1209",
-        "usb_pid": "0x1209"
+        "usb_vid": "0x2886",
+        "usb_pid": "0x0050"
       }
     },
     "core": "earlephilhower",
     "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ELECTRONICCATS_BOMBERCAT -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
+    "extra_flags": "-D ARDUINO_SEEED_INDICATOR_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
     "f_cpu": "133000000L",
     "hwids": [
       [
@@ -17,12 +17,12 @@
         "0x00C0"
       ],
       [
-        "0x1209",
-        "0x1209"
+        "0x2886",
+        "0x0050"
       ]
     ],
     "mcu": "rp2040",
-    "variant": "electroniccats_bombercat"
+    "variant": "seeed_indicator_rp2040"
   },
   "debug": {
     "jlink_device": "RP2040_M0_0",
@@ -32,7 +32,7 @@
   "frameworks": [
     "arduino"
   ],
-  "name": "HunterCat NFC RP2040",
+  "name": "INDICATOR RP2040",
   "upload": {
     "maximum_ram_size": 270336,
     "maximum_size": 2097152,
@@ -42,13 +42,15 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
-  "vendor": "ElectronicCats"
+  "vendor": "Seeed"
 }

tools/json/seeed_xiao_rp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/solderparty_rp2040_stamp.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/sparkfun_promicrorp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/sparkfun_thingplusrp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/upesy_rp2040_devkit.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/vccgnd_yd_rp2040.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/viyalab_mizu.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/waveshare_rp2040_lcd_0_96.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/waveshare_rp2040_lcd_1_28.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/waveshare_rp2040_one.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/waveshare_rp2040_plus_16mb.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/waveshare_rp2040_plus_4mb.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/waveshare_rp2040_zero.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/wiznet_5100s_evb_pico.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/wiznet_5500_evb_pico.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/json/wiznet_wizfi360_evb_pico.json

@@ -42,11 +42,13 @@
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",

tools/makeboards.py

@@ -14,6 +14,7 @@ def BuildFlashMenu(name, flashsize, fssizelist):
         mn="%d_%d" % (flashsize, fssize)
         print("%s.menu.flash.%s=%dMB (%s)" % (name, mn, flashsize / (1024 * 1024), fssizename))
         print("%s.menu.flash.%s.upload.maximum_size=%d" % (name, mn, flashsize - 4096 - fssize))
+        print("%s.menu.flash.%s.build.flash_total=%d" % (name, mn, flashsize))
         print("%s.menu.flash.%s.build.flash_length=%d" % (name, mn, flashsize - 4096 - fssize))
         print("%s.menu.flash.%s.build.eeprom_start=%d" % (name, mn, int("0x10000000",0) + flashsize - 4096))
         print("%s.menu.flash.%s.build.fs_start=%d" % (name, mn, int("0x10000000",0) + flashsize - 4096 - fssize))
@@ -292,11 +293,13 @@ def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, f
     "wait_for_upload_port": false,
     "protocol": "picotool",
     "protocols": [
+      "blackmagic",
       "cmsis-dap",
       "jlink",
       "raspberrypi-swd",
       "picotool",
-      "picoprobe"
+      "picoprobe",
+      "pico-debug"
     ]
   },
   "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
@@ -342,6 +345,8 @@ MakeBoard("adafruit_feather_dvi", "Adafruit", "Feather RP2040 DVI", "0x239a", "0
 MakeBoard("adafruit_feather_rfm", "Adafruit", "Feather RP2040 RFM", "0x239a", "0x812D", 250, "ADAFRUIT_FEATHER_RP2040_RFM", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_feather_thinkink", "Adafruit", "Feather RP2040 ThinkINK", "0x239a", "0x812B", 250, "ADAFRUIT_FEATHER_RP2040_THINKINK", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_feather_usb_host", "Adafruit", "Feather RP2040 USB Host", "0x239a", "0x8129", 250, "ADAFRUIT_FEATHER_RP2040_USB_HOST", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("adafruit_feather_can", "Adafruit", "Feather RP2040 CAN", "0x239a", "0x812f", 250, "ADAFRUIT_FEATHER_RP2040_CAN", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("adafruit_feather_prop_maker", "Adafruit", "Feather RP2040 Prop-Maker", "0x239a", "0x8131", 250, "ADAFRUIT_FEATHER_RP2040_PROP_MAKER", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_itsybitsy", "Adafruit", "ItsyBitsy RP2040", "0x239a", "0x80fd", 250, "ADAFRUIT_ITSYBITSY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_qtpy", "Adafruit", "QT Py RP2040", "0x239a", "0x80f7", 250, "ADAFRUIT_QTPY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_stemmafriend", "Adafruit", "STEMMA Friend RP2040", "0x239a", "0x80e3", 250, "ADAFRUIT_STEMMAFRIEND_RP2040", 8, "boot2_w25q080_2_padded_checksum")
@@ -410,6 +415,7 @@ MakeBoard("sparkfun_thingplusrp2040", "SparkFun", "Thing Plus RP2040", "0x1b4f",
 MakeBoard("upesy_rp2040_devkit", "uPesy", "RP2040 DevKit", "0x2e8a", "0x1007", 250, "UPESY_RP2040_DEVKIT", 2, "boot2_w25q080_2_padded_checksum")
 
 # Seeed
+MakeBoard("seeed_indicator_rp2040", "Seeed", "INDICATOR RP2040", "0x2886", "0x0050", 250, "SEEED_INDICATOR_RP2040", 2, "boot2_w25q080_2_padded_checksum")
 MakeBoard("seeed_xiao_rp2040", "Seeed", "XIAO RP2040", "0x2e8a", "0x000a", 250, "SEEED_XIAO_RP2040", 2, "boot2_w25q080_2_padded_checksum")
 
 # VCC-GND YD-2040 - Use generic SPI/4 because boards seem to come with varied flash modules but same name

tools/platformio-build.py

@@ -21,8 +21,17 @@ platform = env.PioPlatform()
 board = env.BoardConfig()
 upload_protocol = env.subst("$UPLOAD_PROTOCOL") or "picotool"
 #ram_size = board.get("upload.maximum_ram_size") # PlatformIO gives 264K here
-# override to correct 256K for RAM section in linkerscript
-ram_size = 256 * 1024 # not the 264K, which is 256K SRAM + 2*4K SCRATCH(X/Y). 
+# but the RAM size we need is without the SCRATCH memory.
+if upload_protocol == "pico-debug":
+    ram_size = 240 * 1024 # pico-debug needs 16K of the upper memory for itself with pico-debug-gimmecache.uf2
+    # this only works when the user disables the USB stack.
+    if "PIO_FRAMEWORK_ARDUINO_NO_USB" not in env.Flatten(env.get("CPPDEFINES", [])):
+        sys.stderr.write("Must define PIO_FRAMEWORK_ARDUINO_NO_USB when using pico-debug!\n")
+        env.Exit(-1)
+else:
+    ram_size = 256 * 1024 # not the 264K, which is 256K SRAM + 2*4K SCRATCH(X/Y).
+# Update available RAM size
+board.update("upload.maximum_ram_size", ram_size)
 
 FRAMEWORK_DIR = platform.get_package_dir("framework-arduinopico")
 assert os.path.isdir(FRAMEWORK_DIR)
@@ -126,6 +135,10 @@ env.Append(
         ("BOARD_NAME", '\\"%s\\"' % env.subst("$BOARD")),
         "ARM_MATH_CM0_FAMILY",
         "ARM_MATH_CM0_PLUS",
+        "TARGET_RP2040",
+        # at this point, the main.py builder script hasn't updated upload.maximum_size yet,
+        # so it's the original value for the full flash.
+        ("PICO_FLASH_SIZE_BYTES", board.get("upload.maximum_size"))
     ],
 
     CPPPATH=[
@@ -178,7 +191,6 @@ else:
 
 
 def configure_usb_flags(cpp_defines):
-    global ram_size
     if "USE_TINYUSB" in cpp_defines:
         env.Append(CPPPATH=[os.path.join(
             FRAMEWORK_DIR, "libraries", "Adafruit_TinyUSB_Arduino", "src", "arduino")])
@@ -217,10 +229,9 @@ def configure_usb_flags(cpp_defines):
     pidtouse = usb_pid
     if upload_protocol == "picoprobe": 
         pidtouse = '0x0004'
-    elif upload_protocol == "picodebug":
+    elif upload_protocol == "pico-debug":
         vidtouse = '0x1209'
         pidtouse = '0x2488'
-        ram_size = 240 * 1024
 
     env.Append(CPPDEFINES=[
         ("CFG_TUSB_MCU", "OPT_MCU_RP2040"),
@@ -241,7 +252,6 @@ def configure_usb_flags(cpp_defines):
     hw_ids[0][0] = vidtouse
     hw_ids[0][1] = pidtouse
     board.update("build.hwids", hw_ids)
-    board.update("upload.maximum_ram_size", ram_size)
 
 def configure_network_flags(cpp_defines):
     env.Append(CPPDEFINES=[

variants/adafruit_feather_can/pins_arduino.h

@@ -0,0 +1,59 @@
+#pragma once
+
+// Pin definitions taken from:
+//    https://learn.adafruit.com/assets/100337
+
+// LEDs
+#define PIN_LED           (13u)
+
+// NeoPixel
+#define PIN_NEOPIXEL      (21u)
+#define NEOPIXEL_POWER    (20u)
+
+// 'Boot0' button also on GPIO #7
+#define PIN_BUTTON        (7u)
+
+// CAN bus
+#define PIN_CAN_STANDBY   (16u)
+#define PIN_CAN_TX0_RTS   (17u)
+#define PIN_CAN_RESET     (18u)
+#define PIN_CAN_CS        (19u)
+#define PIN_CAN_INTERRUPT (22u)
+#define PIN_CAN_RX0_BF    (23u)
+
+// Serial
+#define PIN_SERIAL1_TX    (0u)
+#define PIN_SERIAL1_RX    (1u)
+
+// Not pinned out
+#define PIN_SERIAL2_TX    (31u)
+#define PIN_SERIAL2_RX    (31u)
+
+// SPI
+#define PIN_SPI0_MISO     (8u)
+#define PIN_SPI0_MOSI     (15u)
+#define PIN_SPI0_SCK      (14u)
+#define PIN_SPI0_SS       (13u)
+#define __SPI0_DEVICE     spi1
+
+// Not pinned out
+#define PIN_SPI1_MISO     (31u)
+#define PIN_SPI1_MOSI     (31u)
+#define PIN_SPI1_SCK      (31u)
+#define PIN_SPI1_SS       (31u)
+#define __SPI1_DEVICE     spi0
+
+// Wire
+#define PIN_WIRE0_SDA     (2u)
+#define PIN_WIRE0_SCL     (3u)
+#define __WIRE0_DEVICE    i2c1
+
+#define PIN_WIRE1_SDA     (31u)
+#define PIN_WIRE1_SCL     (31u)
+#define __WIRE1_DEVICE    i2c0
+
+#define SERIAL_HOWMANY    (2u)
+#define SPI_HOWMANY       (1u)
+#define WIRE_HOWMANY      (1u)
+
+#include "../generic/common.h"

variants/adafruit_feather_prop_maker/pins_arduino.h

@@ -0,0 +1,60 @@
+#pragma once
+
+// Pin definitions taken from:
+//    https://learn.adafruit.com/assets/100337
+
+// LEDs
+#define PIN_LED                     (13u)
+
+// NeoPixel
+#define PIN_NEOPIXEL                (4u)
+
+// 'Boot0' button also on GPIO #7
+#define PIN_BUTTON                  (7u)
+
+// Prop-Maker features
+#define PIN_I2S_DATA                (16u)
+#define PIN_I2S_BIT_CLOCK           (17u)
+#define PIN_I2S_WORD_SELECT         (18u)
+#define PIN_EXTERNAL_BUTTON         (19u)
+#define PIN_EXTERNAL_SERVO          (20u)
+#define PIN_EXTERNAL_NEOPIXELS      (21u)
+#define PIN_ACCELEROMETER_INTERRUPT (22u)
+#define PIN_EXTERNAL_POWER          (23u)
+
+// Serial
+#define PIN_SERIAL1_TX              (0u)
+#define PIN_SERIAL1_RX              (1u)
+
+// Not pinned out
+#define PIN_SERIAL2_TX              (31u)
+#define PIN_SERIAL2_RX              (31u)
+
+// SPI
+#define PIN_SPI0_MISO               (8u)
+#define PIN_SPI0_MOSI               (15u)
+#define PIN_SPI0_SCK                (14u)
+#define PIN_SPI0_SS                 (13u)
+#define __SPI0_DEVICE               spi1
+
+// Not pinned out
+#define PIN_SPI1_MISO               (31u)
+#define PIN_SPI1_MOSI               (31u)
+#define PIN_SPI1_SCK                (31u)
+#define PIN_SPI1_SS                 (31u)
+#define __SPI1_DEVICE               spi0
+
+// Wire
+#define PIN_WIRE0_SDA               (2u)
+#define PIN_WIRE0_SCL               (3u)
+#define __WIRE0_DEVICE              i2c1
+
+#define PIN_WIRE1_SDA               (31u)
+#define PIN_WIRE1_SCL               (31u)
+#define __WIRE1_DEVICE              i2c0
+
+#define SERIAL_HOWMANY              (2u)
+#define SPI_HOWMANY                 (1u)
+#define WIRE_HOWMANY                (1u)
+
+#include "../generic/common.h"

variants/adafruit_feather_usb_host/pins_arduino.h

@@ -4,53 +4,53 @@
 //    https://learn.adafruit.com/assets/100337
 
 // LEDs
-#define PIN_LED        (13u)
+#define PIN_LED         (13u)
 
 // NeoPixel
-#define PIN_NEOPIXEL   (21u)
-#define NEOPIXEL_POWER (20u)
+#define PIN_NEOPIXEL    (21u)
+#define NEOPIXEL_POWER  (20u)
 
 // 'Boot0' button also on GPIO #7
-#define PIN_BUTTON     (7u)
+#define PIN_BUTTON      (7u)
 
 // USB host connector
-#define PIN_USB_DP     (16u)
-#define PIN_USB_DN     (17u)
-#define PIN_5V_EN      (18u)
+#define PIN_USB_HOST_DP (16u)
+#define PIN_USB_HOST_DM (17u)
+#define PIN_5V_EN       (18u)
 
 // Serial
-#define PIN_SERIAL1_TX (0u)
-#define PIN_SERIAL1_RX (1u)
+#define PIN_SERIAL1_TX  (0u)
+#define PIN_SERIAL1_RX  (1u)
 
 // Not pinned out
-#define PIN_SERIAL2_TX (31u)
-#define PIN_SERIAL2_RX (31u)
+#define PIN_SERIAL2_TX  (31u)
+#define PIN_SERIAL2_RX  (31u)
 
 // SPI
-#define PIN_SPI0_MISO  (8u)
-#define PIN_SPI0_MOSI  (15u)
-#define PIN_SPI0_SCK   (14u)
-#define PIN_SPI0_SS    (13u)
-#define __SPI0_DEVICE  spi1
+#define PIN_SPI0_MISO   (8u)
+#define PIN_SPI0_MOSI   (15u)
+#define PIN_SPI0_SCK    (14u)
+#define PIN_SPI0_SS     (13u)
+#define __SPI0_DEVICE   spi1
 
 // Not pinned out
-#define PIN_SPI1_MISO  (31u)
-#define PIN_SPI1_MOSI  (31u)
-#define PIN_SPI1_SCK   (31u)
-#define PIN_SPI1_SS    (31u)
-#define __SPI1_DEVICE  spi0
+#define PIN_SPI1_MISO   (31u)
+#define PIN_SPI1_MOSI   (31u)
+#define PIN_SPI1_SCK    (31u)
+#define PIN_SPI1_SS     (31u)
+#define __SPI1_DEVICE   spi0
 
 // Wire
-#define PIN_WIRE0_SDA  (2u)
-#define PIN_WIRE0_SCL  (3u)
-#define __WIRE0_DEVICE i2c1
+#define PIN_WIRE0_SDA   (2u)
+#define PIN_WIRE0_SCL   (3u)
+#define __WIRE0_DEVICE  i2c1
 
-#define PIN_WIRE1_SDA  (31u)
-#define PIN_WIRE1_SCL  (31u)
-#define __WIRE1_DEVICE i2c0
+#define PIN_WIRE1_SDA   (31u)
+#define PIN_WIRE1_SCL   (31u)
+#define __WIRE1_DEVICE  i2c0
 
-#define SERIAL_HOWMANY (2u)
-#define SPI_HOWMANY    (1u)
-#define WIRE_HOWMANY   (1u)
+#define SERIAL_HOWMANY  (2u)
+#define SPI_HOWMANY     (1u)
+#define WIRE_HOWMANY    (1u)
 
 #include "../generic/common.h"

variants/generic/common.h

@@ -6,7 +6,9 @@
 #define NUM_ANALOG_OUTPUTS  (0u)
 #define ADC_RESOLUTION      (12u)
 
+#ifdef PIN_LED
 #define LED_BUILTIN PIN_LED
+#endif
 
 static const uint8_t D0 = (0u);
 static const uint8_t D1 = (1u);