Update version

Fixes #2380

.github/workflows/pull-request.yml

@@ -187,11 +187,16 @@ jobs:
         mod: 500
         rem: 1
       run: |
+        brew update
+        brew install bash
+        /usr/bin/env bash --version
         uname -a
         cd pico-sdk
         git submodule update --init
         cd ..
-        bash ./tests/build.sh
+        /usr/bin/env bash ./tests/build.sh
+        ./system/picotool/picotool version
+        otool -L ./system/picotool/picotool
 
 # Build a few examples with PlatformIO to test if integration works
   build-platformio:

.readthedocs.yaml

@@ -0,0 +1,41 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+  jobs:
+    post_create_environment:
+      - python -m pip install sphinx_rtd_theme
+    # You can also specify other tool versions:
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
+
+
+# Build documentation in the "docs/" directory with Sphinx
+
+sphinx:
+  configuration: docs/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+# python:
+#   install:
+#     - requirements: docs/requirements.txt

README.md

@@ -4,7 +4,7 @@
 
 Raspberry Pi Pico Arduino core, for all RP2040 and RP2350 boards
 
-This is a port of Arduino to the RP2040 (Raspberry Pi Pico processor) anr RP2350 (Raspberry Pi Pico 2 processor). It uses the bare Raspberry Pi Pico SDK and a custom GCC 12.3/Newlib 4.0 toolchain.
+This is a port of Arduino to the RP2040 (Raspberry Pi Pico processor) and RP2350 (Raspberry Pi Pico 2 processor). It uses the bare Raspberry Pi Pico SDK and a custom GCC 12.3/Newlib 4.0 toolchain.
 
 # Documentation
 See https://arduino-pico.readthedocs.io/en/latest/ along with the examples for more detailed usage information.
@@ -35,9 +35,11 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Breadstick Raspberry
 * BridgeTek IDM2040-7A
 * BridgeTek IDM2040-43A
+* Cytron IRIV IO Controller
 * Cytron Maker Pi RP2040
 * Cytron Maker Nano RP2040
 * Cytron Maker Uno RP2040
+* Cytron Motion 2350 Pro
 * DatanoiseTV PicoADK+
 * Degz Suibo RP2040
 * DeRuiLab FlyBoard2040 Core
@@ -66,8 +68,10 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Newsan Archi
 * nullbits Bit-C PRO
 * Pimoroni PGA2040
+* Pimoroni Pico Plus 2
 * Pimoroni Plasma2040
 * Pimoroni Tiny2040
+* Pimoroni Tiny2350
 * Pintronix PinMax
 * RAKwireless RAK11300
 * Redscorp RP2040-Eins
@@ -100,7 +104,6 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Generic RP2350 (configurable flash, I/O pins)
 
 # Features
-* Transparent use of PSRAM globals and heap (RP2350 only)
 * Adafruit TinyUSB Arduino (USB mouse, keyboard, flash drive, generic HID, CDC Serial, MIDI, WebUSB, others)
 * Bluetooth on the PicoW (Classic and BLE) with Keyboard, Mouse, Joystick, and Virtual Serial
 * Bluetooth Classic and BLE HID master mode (connect to BT keyboard, mouse, or joystick)
@@ -121,6 +124,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * USB drive mode for data loggers (SingleFileDrive, FatFSUSB)
 * Peripherals:  SPI master/slave, Wire(I2C) master/slave, dual UART, emulated EEPROM, I2S audio input/output, Servo
 * printf (i.e. debug) output over USB serial
+* Transparent use of PSRAM globals and heap (RP2350 only)
 
 The RP2040 PIO state machines (SMs) are used to generate jitter-free:
 * Servos
@@ -193,11 +197,6 @@ cd ../tools
 python3 ./get.py
 `````
 
-# Installing both Arduino and CMake
-Tom's Hardware presented a very nice writeup on installing `arduino-pico` on both Windows and Linux, available at https://www.tomshardware.com/how-to/program-raspberry-pi-pico-with-arduino-ide
-
-If you follow Les' step-by-step you will also have a fully functional `CMake`-based environment to build Pico apps on if you outgrow the Arduino ecosystem.
-
 # Uploading Sketches
 To upload your first sketch, you will need to hold the BOOTSEL button down while plugging in the Pico to your computer.
 Then hit the upload button and the sketch should be transferred and start to run.
@@ -218,9 +217,9 @@ To install, follow the directions in
 * https://github.com/earlephilhower/arduino-pico-littlefs-plugin/blob/master/README.md
 
 For detailed usage information, please check the ESP8266 repo documentation (ignore SPIFFS related notes) available at
-* https://arduino-esp8266.readthedocs.io/en/latest/filesystem.html
+* https://arduino-pico.readthedocs.io/en/latest/fs.html
 
-# Uploading Sketches with Picoprobe
+# Uploading Sketches with Picoprobe/Debugprobe
 If you have built a Raspberry Pi Picoprobe, you can use OpenOCD to handle your sketch uploads and for debugging with GDB.
 
 Under Windows a local admin user should be able to access the Picoprobe port automatically, but under Linux `udev` must be told about the device and to allow normal users access.
@@ -240,28 +239,8 @@ If for some reason the device file does not appear, manually unplug and re-plug
 
 Once Picoprobe permissions are set up properly, then select the board "Raspberry Pi Pico (Picoprobe)" in the Tools menu and upload as normal.
 
-# Uploading Sketches with pico-debug
-[pico-debug](https://github.com/majbthrd/pico-debug/) differs from Picoprobe in that pico-debug is a virtual debug pod that runs side-by-side on the same RP2040 that you run your code on; so, you only need one RP2040 board instead of two.  pico-debug also differs from Picoprobe in that pico-debug is standards-based; it uses the CMSIS-DAP protocol, which means even software not specially written for the Raspberry Pi Pico can support it.  pico-debug uses OpenOCD to handle your sketch uploads, and debugging can be accomplished with CMSIS-DAP capable debuggers including GDB.
-
-Under Windows and macOS, any user should be able to access pico-debug automatically, but under Linux `udev` must be told about the device and to allow normal users access.
-
-To set up group-level access to all CMSIS-DAP adapters on Ubuntu (and other OSes which use `udev`):
-````
-echo 'ATTRS{product}=="*CMSIS-DAP*", MODE="664", GROUP="plugdev"' | sudo tee -a /etc/udev/rules.d/98-CMSIS-DAP.rules
-sudo udevadm control --reload
-sudo udevadm trigger -w -s usb
-````
-
-The first line creates a device file in `/dev` that matches all CMSIS-DAP adapters, and it enables read+write permissions for members of the `plugdev` group. The second line causes `udev` to load this new rule. The third line requests the kernel generate "device change" events that will cause our new `udev` rule to run. 
-
-If for some reason the device file does not appear, manually unplug and re-plug the USB connection and check again. The output from `dmesg` can reveal useful diagnostics if the device file remains absent.
-
-Once CMSIS-DAP permissions are set up properly, then select the board "Raspberry Pi Pico (pico-debug)" in the Tools menu.
-
-When first connecting the USB port to your PC, you must copy [pico-debug-gimmecache.uf2](https://github.com/majbthrd/pico-debug/releases/) to the Pi Pico to load pico-debug into RAM; after this, upload as normal.
-
-# Debugging with Picoprobe/pico-debug, OpenOCD, and GDB
-The installed tools include a version of OpenOCD (in the pqt-openocd directory) and GDB (in the pqt-gcc directory).  These may be used to run GDB in an interactive window as documented in the Pico Getting Started manuals from the Raspberry Pi Foundation.  For [pico-debug](https://github.com/majbthrd/pico-debug/), replace the raspberrypi-swd and picoprobe example OpenOCD arguments of "-f interface/raspberrypi-swd.cfg -f target/rp2040.cfg" or "-f interface/picoprobe.cfg -f target/rp2040.cfg" respectively in the Pico Getting Started manual with "-f board/pico-debug.cfg".
+# Debugging with Picoprobe, OpenOCD, and GDB
+The installed tools include a version of OpenOCD (in the pqt-openocd directory) and GDB (in the pqt-gcc directory).  These may be used to run GDB in an interactive window as documented in the Pico Getting Started manuals from the Raspberry Pi Foundation.  Use the command line `./system/openocd/bin/openocd -f ./lib/rp2040/picoprobe_cmsis_dap.tcl` or `./system/openocd/bin/openocd -f ./lib/rp2350/picoprobe_cmsis_dap.tcl` from the `git` installation directory.
 
 # Licensing and Credits
 * The [Arduino IDE and ArduinoCore-API](https://arduino.cc) are developed and maintained by the Arduino team. The IDE is licensed under GPL.

cores/rp2040/Arduino.h

@@ -58,12 +58,15 @@ extern "C" {
 void interrupts();
 void noInterrupts();
 
+// Only implemented on some RP2350 boards, not the OG Pico 2
 #ifdef RP2350_PSRAM_CS
 void *pmalloc(size_t size);
 void *pcalloc(size_t count, size_t size);
+#else
+[[deprecated("This chip does not have PSRAM, pmalloc will always fail")]] void *pmalloc(size_t size);
+[[deprecated("This chip does not have PSRAM, pcalloc will always fail")]] void *pcalloc(size_t count, size_t size);
 #endif
 
-
 // AVR compatibility macros...naughty and accesses the HW directly
 #define digitalPinToPort(pin)       (0)
 #define digitalPinToBitMask(pin)    (1UL << (pin))
@@ -130,8 +133,8 @@ extern const String emptyString;
 // Template which will evaluate at *compile time* to a single 32b number
 // with the specified bits set.
 template <size_t N>
-constexpr uint32_t __bitset(const int (&a)[N], size_t i = 0U) {
-    return i < N ? (1L << a[i]) | __bitset(a, i + 1) : 0;
+constexpr uint64_t __bitset(const int (&a)[N], size_t i = 0U) {
+    return i < N ? (1LL << a[i]) | __bitset(a, i + 1) : 0;
 }
 #endif
 
@@ -146,3 +149,12 @@ constexpr uint32_t __bitset(const int (&a)[N], size_t i = 0U) {
 
 // PSRAM decorator
 #define PSRAM __attribute__((section("\".psram\"")))
+
+// General GPIO/ADC layout info
+#ifdef PICO_RP2350B
+#define __GPIOCNT 48
+#define __FIRSTANALOGGPIO 40
+#else
+#define __GPIOCNT 30
+#define __FIRSTANALOGGPIO 26
+#endif

cores/rp2040/PIOProgram.cpp

@@ -21,6 +21,7 @@
 #include <Arduino.h>
 #include "PIOProgram.h"
 #include <map>
+#include <hardware/claim.h>
 
 #if defined(PICO_RP2350)
 #define PIOS pio0, pio1, pio2
@@ -31,6 +32,8 @@
 #endif
 
 static std::map<const pio_program_t *, int> __pioMap[PIOCNT];
+static bool __pioAllocated[PIOCNT];
+static bool __pioHighGPIO[PIOCNT];
 auto_init_mutex(_pioMutex);
 
 PIOProgram::PIOProgram(const pio_program_t *pgm) {
@@ -47,16 +50,30 @@ PIOProgram::~PIOProgram() {
 }
 
 // Possibly load into a PIO and allocate a SM
-bool PIOProgram::prepare(PIO *pio, int *sm, int *offset) {
+bool PIOProgram::prepare(PIO *pio, int *sm, int *offset, int start, int cnt) {
     CoreMutex m(&_pioMutex);
     PIO pi[PIOCNT] = { PIOS };
 
+#if 0
+    uint usm;
+    uint uoff;
+    auto ret = pio_claim_free_sm_and_add_program_for_gpio_range(_pgm, pio, &usm, &uoff, start, cnt, true);
+    *sm = usm;
+    *offset = uoff;
+    DEBUGV("clain %d\n", ret);
+    return ret;
+#endif
+
+    bool needsHigh = (start + cnt) >= 32;
+    DEBUGV("PIOProgram %p: Searching for high=%d, pins %d-%d\n", _pgm, needsHigh ? 1 : 0, start, start + cnt - 1);
+
     // If it's already loaded into PIO IRAM, try and allocate in that specific PIO
     for (int o = 0; o < PIOCNT; o++) {
         auto p = __pioMap[o].find(_pgm);
-        if (p != __pioMap[o].end()) {
+        if ((p != __pioMap[o].end()) && (__pioHighGPIO[o] == needsHigh)) {
             int idx = pio_claim_unused_sm(pi[o], false);
             if (idx >= 0) {
+                DEBUGV("PIOProgram %p: Reusing IMEM ON PIO %p(high=%d) for pins %d-%d\n", _pgm, pi[o], __pioHighGPIO[o] ? 1 : 0, start, start + cnt - 1);
                 _pio = pi[o];
                 _sm = idx;
                 *pio = pi[o];
@@ -69,21 +86,54 @@ bool PIOProgram::prepare(PIO *pio, int *sm, int *offset) {
 
     // Not in any PIO IRAM, so try and add
     for (int o = 0; o < PIOCNT; o++) {
-        if (pio_can_add_program(pi[o], _pgm)) {
-            int idx = pio_claim_unused_sm(pi[o], false);
-            if (idx >= 0) {
-                int off = pio_add_program(pi[o], _pgm);
-                __pioMap[o].insert({_pgm, off});
-                _pio = pi[o];
-                _sm = idx;
-                *pio = pi[o];
-                *sm = idx;
-                *offset = off;
-                return true;
+        if (__pioAllocated[o] && (__pioHighGPIO[o] == needsHigh)) {
+            DEBUGV("PIOProgram: Checking PIO %p\n", pi[o]);
+            if (pio_can_add_program(pi[o], _pgm)) {
+                int idx = pio_claim_unused_sm(pi[o], false);
+                if (idx >= 0) {
+                    DEBUGV("PIOProgram %p: Adding IMEM ON PIO %p(high=%d) for pins %d-%d\n", _pgm, pi[o], __pioHighGPIO[o] ? 1 : 0, start, start + cnt - 1);
+                    int off = pio_add_program(pi[o], _pgm);
+                    __pioMap[o].insert({_pgm, off});
+                    _pio = pi[o];
+                    _sm = idx;
+                    *pio = pi[o];
+                    *sm = idx;
+                    *offset = off;
+                    return true;
+                } else {
+                    DEBUGV("PIOProgram: can't claim unused SM\n");
+                }
+            } else {
+                DEBUGV("PIOProgram: can't add program\n");
             }
+        } else {
+            DEBUGV("PIOProgram: Skipping PIO %p, wrong allocated/needhi\n", pi[o]);
         }
     }
 
+    // No existing PIOs can meet, is there an unallocated one we can allocate?
+    PIO p;
+    uint idx;
+    uint off;
+    auto rc = pio_claim_free_sm_and_add_program_for_gpio_range(_pgm, &p, &idx, &off, start, cnt, true);
+    if (rc) {
+        int o = 0;
+        while (p != pi[o]) {
+            o++;
+        }
+        assert(!__pioAllocated[o]);
+        __pioAllocated[o]  = true;
+        __pioHighGPIO[o] = needsHigh;
+        DEBUGV("PIOProgram %p: Allocating new PIO %p(high=%d) for pins %d-%d\n", _pgm, pi[o], __pioHighGPIO[o] ? 1 : 0, start, start + cnt - 1);
+        __pioMap[o].insert({_pgm, off});
+        _pio = pi[o];
+        _sm = idx;
+        *pio = pi[o];
+        *sm = idx;
+        *offset = off;
+        return true;
+    }
+
     // Nope, no room either for SMs or INSNs
     return false;
 }

cores/rp2040/PIOProgram.h

@@ -28,7 +28,7 @@ public:
     PIOProgram(const pio_program_t *pgm);
     ~PIOProgram();
     // Possibly load into a PIO and allocate a SM
-    bool prepare(PIO *pio, int *sm, int *offset);
+    bool prepare(PIO *pio, int *sm, int *offset, int gpio_start = 0, int gpio_cnt = 1);
 
 private:
     const pio_program_t *_pgm;

cores/rp2040/RP2040Support.h

@@ -253,7 +253,7 @@ public:
     }
 
     inline int getUsedPSRAMHeap() {
-#if defined(PICO_RP2350)
+#if defined(RP2350_PSRAM_CS)
         extern size_t __psram_total_used();
         return __psram_total_used();
 #else
@@ -262,7 +262,7 @@ public:
     }
 
     inline int getTotalPSRAMHeap() {
-#if defined(PICO_RP2350)
+#if defined(RP2350_PSRAM_CS)
         extern size_t __psram_total_space();
         return __psram_total_space();
 #else
@@ -290,7 +290,7 @@ public:
     }
 
     inline size_t getPSRAMSize() {
-#if defined(PICO_RP2350)
+#if defined(RP2350_PSRAM_CS)
         extern size_t __psram_size;
         return __psram_size;
 #else

cores/rp2040/RP2040USB.cpp

@@ -566,8 +566,6 @@ usbd_class_driver_t const *usbd_app_driver_get_cb(uint8_t *driver_count) {
 
 #elif defined NO_USB
 
-// will ensure backward compatibility with existing code when using pico-debug
-
 #warning "NO_USB selected. No output to Serial will occur!"
 
 #include <Arduino.h>

cores/rp2040/RP2040Version.h

@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 4
 #define ARDUINO_PICO_MINOR 0
-#define ARDUINO_PICO_REVISION 0
-#define ARDUINO_PICO_VERSION_STR "4.0.0"
+#define ARDUINO_PICO_REVISION 2
+#define ARDUINO_PICO_VERSION_STR "4.0.2"

cores/rp2040/SerialPIO.cpp

@@ -33,6 +33,7 @@ static std::map<int, PIOProgram*> _rxMap;
 // Duplicate a program and replace the first insn with a "set x, repl"
 static pio_program_t *pio_make_uart_prog(int repl, const pio_program_t *pg) {
     pio_program_t *p = new pio_program_t;
+    memcpy(p, pg, sizeof(*p));
     p->length = pg->length;
     p->origin = pg->origin;
     uint16_t *insn = (uint16_t *)malloc(p->length * 2);
@@ -46,24 +47,22 @@ static pio_program_t *pio_make_uart_prog(int repl, const pio_program_t *pg) {
     return p;
 }
 
-static PIOProgram *_getTxProgram(int bits, bool inverted) {
-    int key = inverted ? -bits : bits;
-    auto f = _txMap.find(key);
+static PIOProgram *_getTxProgram(int bits) {
+    auto f = _txMap.find(bits);
     if (f == _txMap.end()) {
-        pio_program_t * p = pio_make_uart_prog(bits, inverted ? &pio_tx_inv_program : &pio_tx_program);
-        _txMap.insert({key, new PIOProgram(p)});
-        f = _txMap.find(key);
+        pio_program_t * p = pio_make_uart_prog(bits, &pio_tx_program);
+        _txMap.insert({bits, new PIOProgram(p)});
+        f = _txMap.find(bits);
     }
     return f->second;
 }
 
-static PIOProgram *_getRxProgram(int bits, bool inverted) {
-    int key = inverted ? -bits : bits;
-    auto f = _rxMap.find(key);
+static PIOProgram *_getRxProgram(int bits) {
+    auto f = _rxMap.find(bits);
     if (f == _rxMap.end()) {
-        pio_program_t * p = pio_make_uart_prog(bits, inverted ? &pio_rx_inv_program : &pio_rx_program);
-        _rxMap.insert({key, new PIOProgram(p)});
-        f = _rxMap.find(key);
+        pio_program_t * p = pio_make_uart_prog(bits, &pio_rx_program);
+        _rxMap.insert({bits, new PIOProgram(p)});
+        f = _rxMap.find(bits);
     }
     return f->second;
 }
@@ -98,7 +97,7 @@ void __not_in_flash_func(SerialPIO::_handleIRQ)() {
         return;
     }
     while (!pio_sm_is_rx_fifo_empty(_rxPIO, _rxSM)) {
-        uint32_t decode = _rxPIO->rxf[_rxSM] ^ (_rxInverted ? 0xffffffff : 0);
+        uint32_t decode = _rxPIO->rxf[_rxSM];
         decode >>= 33 - _rxBits;
         uint32_t val = 0;
         for (int b = 0; b < _bits + 1; b++) {
@@ -140,6 +139,8 @@ SerialPIO::SerialPIO(pin_size_t tx, pin_size_t rx, size_t fifoSize) {
     _fifoSize = fifoSize + 1; // Always one unused entry
     _queue = new uint8_t[_fifoSize];
     mutex_init(&_mutex);
+    _invertTX = false;
+    _invertRX = false;
 }
 
 SerialPIO::~SerialPIO() {
@@ -191,9 +192,9 @@ void SerialPIO::begin(unsigned long baud, uint16_t config) {
 
     if (_tx != NOPIN) {
         _txBits = _bits + _stop + (_parity != UART_PARITY_NONE ? 1 : 0) + 1/*start bit*/;
-        _txPgm = _getTxProgram(_txBits, _txInverted);
+        _txPgm = _getTxProgram(_txBits);
         int off;
-        if (!_txPgm->prepare(&_txPIO, &_txSM, &off)) {
+        if (!_txPgm->prepare(&_txPIO, &_txSM, &off, _tx, 1)) {
             DEBUGCORE("ERROR: Unable to allocate PIO TX UART, out of PIO resources\n");
             // ERROR, no free slots
             return;
@@ -211,6 +212,7 @@ void SerialPIO::begin(unsigned long baud, uint16_t config) {
         pio_sm_exec(_txPIO, _txSM, pio_encode_mov(pio_isr, pio_osr));
 
         // Start running!
+        gpio_set_outover(_tx, _invertTX);
         pio_sm_set_enabled(_txPIO, _txSM, true);
     }
     if (_rx != NOPIN) {
@@ -218,9 +220,9 @@ void SerialPIO::begin(unsigned long baud, uint16_t config) {
         _reader = 0;
 
         _rxBits = 2 * (_bits + _stop + (_parity != UART_PARITY_NONE ? 1 : 0) + 1) - 1;
-        _rxPgm = _getRxProgram(_rxBits, _rxInverted);
+        _rxPgm = _getRxProgram(_rxBits);
         int off;
-        if (!_rxPgm->prepare(&_rxPIO, &_rxSM, &off)) {
+        if (!_rxPgm->prepare(&_rxPIO, &_rxSM, &off, _rx, 1)) {
             DEBUGCORE("ERROR: Unable to allocate PIO RX UART, out of PIO resources\n");
             return;
         }
@@ -249,6 +251,7 @@ void SerialPIO::begin(unsigned long baud, uint16_t config) {
         irq_set_exclusive_handler(irqno, _fifoIRQ);
         irq_set_enabled(irqno, true);
 
+        gpio_set_inover(_rx, _invertRX);
         pio_sm_set_enabled(_rxPIO, _rxSM, true);
     }
 
@@ -262,6 +265,7 @@ void SerialPIO::end() {
     if (_tx != NOPIN) {
         pio_sm_set_enabled(_txPIO, _txSM, false);
         pio_sm_unclaim(_txPIO, _txSM);
+        gpio_set_outover(_tx, 0);
     }
     if (_rx != NOPIN) {
         pio_sm_set_enabled(_rxPIO, _rxSM, false);
@@ -277,6 +281,7 @@ void SerialPIO::end() {
             auto irqno = pioNum == 0 ? PIO0_IRQ_0 : PIO1_IRQ_0;
             irq_set_enabled(irqno, false);
         }
+        gpio_set_inover(_rx, 0);
     }
     _running = false;
 }
@@ -348,11 +353,6 @@ void SerialPIO::flush() {
     delay((1000 * (_txBits + 1)) / _baud);
 }
 
-void SerialPIO::setInverted(bool invTx, bool invRx) {
-    _txInverted = invTx;
-    _rxInverted = invRx;
-}
-
 size_t SerialPIO::write(uint8_t c) {
     CoreMutex m(&_mutex);
     if (!_running || !m || (_tx == NOPIN)) {
@@ -371,7 +371,7 @@ size_t SerialPIO::write(uint8_t c) {
     }
     val <<= 1;  // Start bit = low
 
-    pio_sm_put_blocking(_txPIO, _txSM, _txInverted ? ~val : val);
+    pio_sm_put_blocking(_txPIO, _txSM, val);
 
     return 1;
 }

cores/rp2040/SerialPIO.h

@@ -41,7 +41,22 @@ public:
     void begin(unsigned long baud, uint16_t config) override;
     void end() override;
 
-    void setInverted(bool invTx = true, bool invRx = true);
+    void setInverted(bool invTx = true, bool invRx = true) {
+        setInvertTX(invTx);
+        setInvertRX(invRx);
+    }
+    bool setInvertTX(bool invert = true) {
+        if (!_running) {
+            _invertTX = invert;
+        }
+        return !_running;
+    }
+    bool setInvertRX(bool invert = true) {
+        if (!_running) {
+            _invertRX = invert;
+        }
+        return !_running;
+    }
 
     virtual int peek() override;
     virtual int read() override;
@@ -65,8 +80,8 @@ protected:
     int _stop;
     bool _overflow;
     mutex_t _mutex;
-    bool _txInverted = false;
-    bool _rxInverted = false;
+    bool _invertTX;
+    bool _invertRX;
 
     PIOProgram *_txPgm;
     PIO _txPIO;

cores/rp2040/SerialUART.cpp

@@ -32,10 +32,16 @@ extern void serialEvent1() __attribute__((weak));
 extern void serialEvent2() __attribute__((weak));
 
 bool SerialUART::setRX(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({1, 13, 17, 29}) /* UART0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({1, 13, 17, 29, 33, 45}) /* UART0 */,
+                                    __bitset({5, 9, 21, 25, 37, 41})  /* UART1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({1, 13, 17, 29}) /* UART0 */,
                                     __bitset({5, 9, 21, 25})  /* UART1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[uart_get_index(_uart)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[uart_get_index(_uart)])) {
         _rx = pin;
         return true;
     }
@@ -53,10 +59,16 @@ bool SerialUART::setRX(pin_size_t pin) {
 }
 
 bool SerialUART::setTX(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({0, 12, 16, 28}) /* UART0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({0, 12, 16, 28, 32, 44}) /* UART0 */,
+                                    __bitset({4, 8, 20, 24, 36, 40})  /* UART1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({0, 12, 16, 28}) /* UART0 */,
                                     __bitset({4, 8, 20, 24})  /* UART1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[uart_get_index(_uart)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[uart_get_index(_uart)])) {
         _tx = pin;
         return true;
     }
@@ -74,10 +86,16 @@ bool SerialUART::setTX(pin_size_t pin) {
 }
 
 bool SerialUART::setRTS(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({3, 15, 19}) /* UART0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({3, 15, 19, 31, 35, 47}) /* UART0 */,
+                                    __bitset({7, 11, 23, 27, 39, 43})  /* UART1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({3, 15, 19}) /* UART0 */,
                                     __bitset({7, 11, 23, 27})  /* UART1 */
                                   };
-    if ((!_running) && ((pin == UART_PIN_NOT_DEFINED) || ((1 << pin) & valid[uart_get_index(_uart)]))) {
+#endif
+    if ((!_running) && ((pin == UART_PIN_NOT_DEFINED) || ((1LL << pin) & valid[uart_get_index(_uart)]))) {
         _rts = pin;
         return true;
     }
@@ -95,10 +113,16 @@ bool SerialUART::setRTS(pin_size_t pin) {
 }
 
 bool SerialUART::setCTS(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({2, 14, 18}) /* UART0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({2, 14, 18, 30, 34, 46}) /* UART0 */,
+                                    __bitset({6, 10, 22, 26, 38, 42})  /* UART1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({2, 14, 18}) /* UART0 */,
                                     __bitset({6, 10, 22, 26})  /* UART1 */
                                   };
-    if ((!_running) && ((pin == UART_PIN_NOT_DEFINED) || ((1 << pin) & valid[uart_get_index(_uart)]))) {
+#endif
+    if ((!_running) && ((pin == UART_PIN_NOT_DEFINED) || ((1LL << pin) & valid[uart_get_index(_uart)]))) {
         _cts = pin;
         return true;
     }
@@ -138,6 +162,9 @@ SerialUART::SerialUART(uart_inst_t *uart, pin_size_t tx, pin_size_t rx, pin_size
     _cts = cts;
     mutex_init(&_mutex);
     mutex_init(&_fifoMutex);
+    _invertTX = false;
+    _invertRX = false;
+    _invertControl = false;
 }
 
 static void _uart0IRQ();
@@ -154,14 +181,18 @@ void SerialUART::begin(unsigned long baud, uint16_t config) {
     _fcnTx = gpio_get_function(_tx);
     _fcnRx = gpio_get_function(_rx);
     gpio_set_function(_tx, GPIO_FUNC_UART);
+    gpio_set_outover(_tx, _invertTX ? 1 : 0);
     gpio_set_function(_rx, GPIO_FUNC_UART);
+    gpio_set_inover(_rx, _invertRX ? 1 : 0);
     if (_rts != UART_PIN_NOT_DEFINED) {
         _fcnRts = gpio_get_function(_rts);
         gpio_set_function(_rts, GPIO_FUNC_UART);
+        gpio_set_outover(_rts, _invertControl ? 1 : 0);
     }
     if (_cts != UART_PIN_NOT_DEFINED) {
         _fcnCts = gpio_get_function(_cts);
         gpio_set_function(_cts, GPIO_FUNC_UART);
+        gpio_set_inover(_cts, _invertControl ? 1 : 0);
     }
 
     uart_init(_uart, baud);
@@ -246,12 +277,16 @@ void SerialUART::end() {
 
     // Restore pin functions
     gpio_set_function(_tx, _fcnTx);
+    gpio_set_outover(_tx, 0);
     gpio_set_function(_rx, _fcnRx);
+    gpio_set_inover(_rx, 0);
     if (_rts != UART_PIN_NOT_DEFINED) {
         gpio_set_function(_rts, _fcnRts);
+        gpio_set_outover(_rts, 0);
     }
     if (_cts != UART_PIN_NOT_DEFINED) {
         gpio_set_function(_cts, _fcnCts);
+        gpio_set_inover(_cts, 0);
     }
 }
 

cores/rp2040/SerialUART.h

@@ -43,6 +43,26 @@ public:
         ret &= setTX(tx);
         return ret;
     }
+
+    bool setInvertTX(bool invert = true) {
+        if (!_running) {
+            _invertTX = invert;
+        }
+        return !_running;
+    }
+    bool setInvertRX(bool invert = true) {
+        if (!_running) {
+            _invertRX = invert;
+        }
+        return !_running;
+    }
+    bool setInvertControl(bool invert = true) {
+        if (!_running) {
+            _invertControl = invert;
+        }
+        return !_running;
+    }
+
     bool setFIFOSize(size_t size);
     bool setPollingMode(bool mode = true);
 
@@ -86,6 +106,7 @@ private:
     bool _polling = false;
     bool _overflow;
     bool _break;
+    bool _invertTX, _invertRX, _invertControl;
 
     // Lockless, IRQ-handled circular queue
     uint32_t _writer;

cores/rp2040/SoftwareSerial.h

@@ -30,10 +30,6 @@ public:
     }
 
     ~SoftwareSerial() {
-        if (_invert) {
-            gpio_set_outover(_tx, 0);
-            gpio_set_outover(_rx, 0);
-        }
     }
 
     virtual void begin(unsigned long baud = 115200) override {
@@ -41,11 +37,9 @@ public:
     };
 
     void begin(unsigned long baud, uint16_t config) override {
+        setInvertTX(_invert);
+        setInvertRX(_invert);
         SerialPIO::begin(baud, config);
-        if (_invert) {
-            gpio_set_outover(_tx, GPIO_OVERRIDE_INVERT);
-            gpio_set_inover(_rx, GPIO_OVERRIDE_INVERT);
-        }
     }
 
     void listen() { /* noop */ }

cores/rp2040/Tone.cpp

@@ -56,7 +56,7 @@ int64_t _stopTonePIO(alarm_id_t id, void *user_data) {
 }
 
 void tone(uint8_t pin, unsigned int frequency, unsigned long duration) {
-    if (pin > 29) {
+    if (pin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal pin in tone (%d)\n", pin);
         return;
     }
@@ -81,7 +81,7 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration) {
         newTone = new Tone();
         newTone->pin = pin;
         pinMode(pin, OUTPUT);
-        if (!_tone2Pgm.prepare(&newTone->pio, &newTone->sm, &newTone->off)) {
+        if (!_tone2Pgm.prepare(&newTone->pio, &newTone->sm, &newTone->off, pin, 1)) {
             DEBUGCORE("ERROR: tone unable to start, out of PIO resources\n");
             // ERROR, no free slots
             delete newTone;
@@ -118,7 +118,7 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration) {
 void noTone(uint8_t pin) {
     CoreMutex m(&_toneMutex);
 
-    if ((pin > 29) || !m) {
+    if ((pin > __GPIOCNT) || !m) {
         DEBUGCORE("ERROR: Illegal pin in tone (%d)\n", pin);
         return;
     }

cores/rp2040/main.cpp

@@ -79,7 +79,7 @@ extern void __loop() {
 static struct _reent *_impure_ptr1 = nullptr;
 
 extern "C" int main() {
-#if F_CPU != 125000000
+#if (defined(PICO_RP2040) && (F_CPU != 125000000)) || (defined(PICO_RP2350) && (F_CPU != 150000000))
     set_sys_clock_khz(F_CPU / 1000, true);
 #endif
 

cores/rp2040/malloc-lock.cpp

@@ -73,6 +73,15 @@ extern "C" void *pcalloc(size_t count, size_t size) {
     interrupts();
     return rc;
 }
+#else
+// No PSRAM, always fail
+extern "C" void *pmalloc(size_t size) {
+    return nullptr;
+}
+
+extern "C" void *pcalloc(size_t count, size_t size) {
+    return nullptr;
+}
 #endif
 
 extern "C" void *__wrap_realloc(void *mem, size_t size) {

cores/rp2040/pio_uart.pio

@@ -39,35 +39,13 @@ wait_bit:
     jmp y-- wait_bit
     jmp x-- bitloop
 
-    
-
-; inverted-logic version (inverts the stop bit)
-
-.program pio_tx_inv
-.side_set 1 opt
-
-
-; We shift out the start and stop bit as part of the FIFO
-    set x, 9
-
-    pull               side 0 ; Force stop bit low
-
-; Send the bits
-bitloop:
-    out pins, 1
-    mov y, isr                ; ISR is loaded by the setup routine with the period-1 count
-wait_bit:
-    jmp y-- wait_bit
-    jmp x-- bitloop
-
-
 % c-sdk {
 
 static inline void pio_tx_program_init(PIO pio, uint sm, uint offset, uint pin_tx) {
     // Tell PIO to initially drive output-high on the selected pin, then map PIO
     // onto that pin with the IO muxes.
-    pio_sm_set_pins_with_mask(pio, sm, 1u << pin_tx, 1u << pin_tx);
-    pio_sm_set_pindirs_with_mask(pio, sm, 1u << pin_tx, 1u << pin_tx);
+    pio_sm_set_set_pins(pio, sm, pin_tx, 1);
+    pio_sm_set_consecutive_pindirs(pio, sm, pin_tx, 1, true);
     pio_gpio_init(pio, pin_tx);
 
     pio_sm_config c = pio_tx_program_get_default_config(offset);
@@ -110,28 +88,6 @@ wait_half:
     
     push                ; Stuff it and wait for next start
 
-
-.program pio_rx_inv
-
-; IN pin 0 and JMP pin are both mapped to the GPIO used as UART RX.
-
-start:
-    set x, 18           ; Preload bit counter...we'll shift in the start bit and stop bit, and each bit will be double-recorded (to be fixed by RP2040 code)
-    wait 1 pin 0        ; Stall until start bit is asserted
-
-bitloop:
-   ; Delay until 1/2 way into the bit time
-    mov y, osr
-wait_half:
-    jmp y-- wait_half
-
-    ; Read in the bit
-    in pins, 1          ; Shift data bit into ISR
-    jmp x-- bitloop     ; Loop all bits
-    
-    push                ; Stuff it and wait for next start
-
-
 % c-sdk {
 static inline void pio_rx_program_init(PIO pio, uint sm, uint offset, uint pin) {
     pio_sm_set_consecutive_pindirs(pio, sm, pin, 1, false);

cores/rp2040/pio_uart.pio.h

@@ -44,50 +44,12 @@ static inline pio_sm_config pio_tx_program_get_default_config(uint offset) {
     sm_config_set_sideset(&c, 2, true, false);
     return c;
 }
-#endif
-
-// ---------- //
-// pio_tx_inv //
-// ---------- //
-
-#define pio_tx_inv_wrap_target 0
-#define pio_tx_inv_wrap 5
-#define pio_tx_inv_pio_version 0
-
-static const uint16_t pio_tx_inv_program_instructions[] = {
-    //     .wrap_target
-    0xe029, //  0: set    x, 9
-    0x90a0, //  1: pull   block           side 0
-    0x6001, //  2: out    pins, 1
-    0xa046, //  3: mov    y, isr
-    0x0084, //  4: jmp    y--, 4
-    0x0042, //  5: jmp    x--, 2
-    //     .wrap
-};
-
-#if !PICO_NO_HARDWARE
-static const struct pio_program pio_tx_inv_program = {
-    .instructions = pio_tx_inv_program_instructions,
-    .length = 6,
-    .origin = -1,
-    .pio_version = 0,
-#if PICO_PIO_VERSION > 0
-    .used_gpio_ranges = 0x0
-#endif
-};
-
-static inline pio_sm_config pio_tx_inv_program_get_default_config(uint offset) {
-    pio_sm_config c = pio_get_default_sm_config();
-    sm_config_set_wrap(&c, offset + pio_tx_inv_wrap_target, offset + pio_tx_inv_wrap);
-    sm_config_set_sideset(&c, 2, true, false);
-    return c;
-}
 
 static inline void pio_tx_program_init(PIO pio, uint sm, uint offset, uint pin_tx) {
     // Tell PIO to initially drive output-high on the selected pin, then map PIO
     // onto that pin with the IO muxes.
-    pio_sm_set_pins_with_mask(pio, sm, 1u << pin_tx, 1u << pin_tx);
-    pio_sm_set_pindirs_with_mask(pio, sm, 1u << pin_tx, 1u << pin_tx);
+    pio_sm_set_set_pins(pio, sm, pin_tx, 1);
+    pio_sm_set_consecutive_pindirs(pio, sm, pin_tx, 1, true);
     pio_gpio_init(pio, pin_tx);
     pio_sm_config c = pio_tx_program_get_default_config(offset);
     // OUT shifts to right, no autopull
@@ -140,44 +102,6 @@ static inline pio_sm_config pio_rx_program_get_default_config(uint offset) {
     sm_config_set_wrap(&c, offset + pio_rx_wrap_target, offset + pio_rx_wrap);
     return c;
 }
-#endif
-
-// ---------- //
-// pio_rx_inv //
-// ---------- //
-
-#define pio_rx_inv_wrap_target 0
-#define pio_rx_inv_wrap 6
-#define pio_rx_inv_pio_version 0
-
-static const uint16_t pio_rx_inv_program_instructions[] = {
-    //     .wrap_target
-    0xe032, //  0: set    x, 18
-    0x20a0, //  1: wait   1 pin, 0
-    0xa047, //  2: mov    y, osr
-    0x0083, //  3: jmp    y--, 3
-    0x4001, //  4: in     pins, 1
-    0x0042, //  5: jmp    x--, 2
-    0x8020, //  6: push   block
-    //     .wrap
-};
-
-#if !PICO_NO_HARDWARE
-static const struct pio_program pio_rx_inv_program = {
-    .instructions = pio_rx_inv_program_instructions,
-    .length = 7,
-    .origin = -1,
-    .pio_version = 0,
-#if PICO_PIO_VERSION > 0
-    .used_gpio_ranges = 0x0
-#endif
-};
-
-static inline pio_sm_config pio_rx_inv_program_get_default_config(uint offset) {
-    pio_sm_config c = pio_get_default_sm_config();
-    sm_config_set_wrap(&c, offset + pio_rx_inv_wrap_target, offset + pio_rx_inv_wrap);
-    return c;
-}
 
 static inline void pio_rx_program_init(PIO pio, uint sm, uint offset, uint pin) {
     pio_sm_set_consecutive_pindirs(pio, sm, pin, 1, false);

cores/rp2040/psram.cpp

@@ -332,6 +332,9 @@ static bool __psram_heap_init() {
         return true;
     }
 
+    if (!__psram_heap_size) {
+        return false;
+    }
     _mem_heap = NULL;
     _mem_psram_pool = NULL;
     _mem_heap = tlsf_create_with_pool((void *)&__psram_heap_start__, __psram_heap_size, 16 * 1024 * 1024);

cores/rp2040/wiring_analog.cpp

@@ -30,7 +30,7 @@ void __clearADCPin(pin_size_t p);
 
 static uint32_t analogScale = 255;
 static uint32_t analogFreq = 1000;
-static uint32_t pwmInitted = 0;
+static uint64_t pwmInitted = 0;
 static bool scaleInitted = false;
 static bool adcInitted = false;
 static uint16_t analogWritePseudoScale = 1;
@@ -79,7 +79,7 @@ extern "C" void analogWriteResolution(int res) {
 extern "C" void analogWrite(pin_size_t pin, int val) {
     CoreMutex m(&_dacMutex);
 
-    if ((pin > 29) || !m) {
+    if ((pin >= __GPIOCNT) || !m) {
         DEBUGCORE("ERROR: Illegal analogWrite pin (%d)\n", pin);
         return;
     }
@@ -101,12 +101,12 @@ extern "C" void analogWrite(pin_size_t pin, int val) {
         }
         scaleInitted = true;
     }
-    if (!(pwmInitted & (1 << pwm_gpio_to_slice_num(pin)))) {
+    if (!(pwmInitted & (1LL << pwm_gpio_to_slice_num(pin)))) {
         pwm_config c = pwm_get_default_config();
         pwm_config_set_clkdiv(&c, clock_get_hz(clk_sys) / ((float)analogScale * analogFreq));
         pwm_config_set_wrap(&c, analogScale - 1);
         pwm_init(pwm_gpio_to_slice_num(pin), &c, true);
-        pwmInitted |= 1 << pwm_gpio_to_slice_num(pin);
+        pwmInitted |= 1LL << pwm_gpio_to_slice_num(pin);
     }
 
     val <<= analogWritePseudoScale;
@@ -125,17 +125,17 @@ extern "C" void analogWrite(pin_size_t pin, int val) {
 auto_init_mutex(_adcMutex);
 static uint8_t _readBits = 10;
 static uint8_t _lastADCMux = 0;
-static uint32_t _adcGPIOInit = 0;
+static uint64_t _adcGPIOInit = 0;
 
 void __clearADCPin(pin_size_t p) {
-    _adcGPIOInit &= ~(1 << p);
+    _adcGPIOInit &= ~(1LL << p);
 }
 
 extern "C" int analogRead(pin_size_t pin) {
     CoreMutex m(&_adcMutex);
 
-    pin_size_t maxPin = max(A0, A3);
-    pin_size_t minPin = min(A0, A3);
+    pin_size_t maxPin = __GPIOCNT;
+    pin_size_t minPin = __FIRSTANALOGGPIO;
 
     if ((pin < minPin) || (pin > maxPin) || !m) {
         DEBUGCORE("ERROR: Illegal analogRead pin (%d)\n", pin);
@@ -145,9 +145,9 @@ extern "C" int analogRead(pin_size_t pin) {
         adc_init();
         adcInitted = true;
     }
-    if (!(_adcGPIOInit & (1 << pin))) {
+    if (!(_adcGPIOInit & (1LL << pin))) {
         adc_gpio_init(pin);
-        _adcGPIOInit |= 1 << pin;
+        _adcGPIOInit |= 1LL << pin;
     }
     if (_lastADCMux != pin) {
         adc_select_input(pin - minPin);
@@ -169,7 +169,7 @@ extern "C" float analogReadTemp(float vref) {
     _lastADCMux = 0;
     adc_set_temp_sensor_enabled(true);
     delay(1); // Allow things to settle.  Without this, readings can be erratic
-    adc_select_input(4); // Temperature sensor
+    adc_select_input(__GPIOCNT - __FIRSTANALOGGPIO); // Temperature sensor
     int v = adc_read();
     adc_set_temp_sensor_enabled(false);
     float t = 27.0f - ((v * vref / 4096.0f) - 0.706f) / 0.001721f; // From the datasheet

cores/rp2040/wiring_digital.cpp

@@ -23,10 +23,15 @@
 
 extern void __clearADCPin(pin_size_t p);
 
-static PinMode _pm[30];
+static PinMode _pm[__GPIOCNT];
 
 extern "C" void pinMode(pin_size_t ulPin, PinMode ulMode) __attribute__((weak, alias("__pinMode")));
 extern "C" void __pinMode(pin_size_t ulPin, PinMode ulMode) {
+    if (ulPin >= __GPIOCNT) {
+        DEBUGCORE("ERROR: Illegal pin in pinMode (%d)\n", ulPin);
+        return;
+    }
+
     switch (ulMode) {
     case INPUT:
         gpio_init(ulPin);
@@ -72,20 +77,16 @@ extern "C" void __pinMode(pin_size_t ulPin, PinMode ulMode) {
         return;
     }
 
-    if (ulPin > 29) {
-        DEBUGCORE("ERROR: Illegal pin in pinMode (%d)\n", ulPin);
-        return;
-    }
     _pm[ulPin] = ulMode;
 
-    if ((ulPin >= std::min(A0, A3)) && (ulPin <= std::max(A0, A3))) {
+    if (ulPin >= __FIRSTANALOGGPIO) {
         __clearADCPin(ulPin);
     }
 }
 
 extern "C" void digitalWrite(pin_size_t ulPin, PinStatus ulVal) __attribute__((weak, alias("__digitalWrite")));
 extern "C" void __digitalWrite(pin_size_t ulPin, PinStatus ulVal) {
-    if (ulPin > 29) {
+    if (ulPin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal pin in pinMode (%d)\n", ulPin);
         return;
     }
@@ -109,7 +110,7 @@ extern "C" void __digitalWrite(pin_size_t ulPin, PinStatus ulVal) {
 
 extern "C" PinStatus digitalRead(pin_size_t ulPin) __attribute__((weak, alias("__digitalRead")));
 extern "C" PinStatus __digitalRead(pin_size_t ulPin) {
-    if (ulPin > 29) {
+    if (ulPin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal pin in digitalRead (%d)\n", ulPin);
         return LOW;
     }

cores/rp2040/wiring_private.cpp

@@ -25,7 +25,9 @@
 #include <map>
 
 // Support nested IRQ disable/re-enable
+#ifndef maxIRQs
 #define maxIRQs 15
+#endif
 static uint32_t _irqStackTop[2] = { 0, 0 };
 static uint32_t _irqStack[2][maxIRQs];
 

cores/rp2040/wiring_pulse.cpp

@@ -26,7 +26,7 @@ extern "C" unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeo
     uint64_t start = time_us_64();
     uint64_t abort = start + timeout;
 
-    if (pin > 29) {
+    if (pin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal pin in pulseIn (%d)\n", pin);
         return 0;
     }

cores/rp2040/wiring_shift.cpp

@@ -24,11 +24,11 @@
 extern "C" uint8_t shiftIn(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder) {
     uint8_t value = 0;
     uint8_t i;
-    if (dataPin > 29) {
+    if (dataPin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal dataPin in shiftIn (%d)\n", dataPin);
         return 0;
     }
-    if (clockPin > 29) {
+    if (clockPin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal clockPin in shiftIn (%d)\n", clockPin);
         return 0;
     }
@@ -46,11 +46,11 @@ extern "C" uint8_t shiftIn(pin_size_t dataPin, pin_size_t clockPin, BitOrder bit
 
 extern "C" void shiftOut(pin_size_t dataPin, pin_size_t clockPin, BitOrder bitOrder, uint8_t val) {
     uint8_t i;
-    if (dataPin > 29) {
+    if (dataPin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal dataPin in shiftOut (%d)\n", dataPin);
         return;
     }
-    if (clockPin > 29) {
+    if (clockPin >= __GPIOCNT) {
         DEBUGCORE("ERROR: Illegal clockPin in shiftOut (%d)\n", clockPin);
         return;
     }

docs/conf.py

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

docs/contrib.rst

@@ -89,6 +89,43 @@ code that only runs on this core, use the following define.
         ~~~ your changes ~~~
         #endif
 
+Identifying RP2040, RP2530A, or RP2350B
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To check if a board is an original RP2040
+
+.. code:: cpp
+
+    #if defined(PICO_RP2040)
+    ...OG Pico code...
+    #endif
+
+For RP2350(A or B):
+
+.. code:: cpp
+
+    #if defined(PICO_RP2350)
+    ...Pico 2 code...
+    #endif
+
+For only RP2350A variants (using the compile options, not the onboard ID register):
+
+.. code:: cpp
+
+    #if defined(PICO_RP2350) && !defined(PICO_RP2350B)
+    ...RP2350A only code...
+    #endif
+
+For only RP2350B variants (again, at compile time as identified by the selected board
+and not the chip ID register):
+
+.. code:: cpp
+
+    #if defined(PICO_RP2350B)
+    ...48-GPIO version code here
+    #endif
+
+
 Library Architectures
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -98,3 +135,4 @@ not know your new code is compatible here.
 
 Add ``rp2040`` to ``architectures`` (in ``library.properties``) and
 ``"rp2040"`` to ``platforms[]`` (in ``library.json``) to let the tools know.
+Note that even the RP2350 is identified as ``rp2040`` for this purpose.

docs/digital.rst

@@ -6,6 +6,10 @@ Board-Specific Pins
 The Raspberry Pi Pico RP2040 chip supports up to 30 digital I/O pins,
 however not all boards provide access to all pins.
 
+Pin Notation
+------------
+When using Analog or Digital I/Os, if you supply an integer it specifies the RP2040 GPIO pin to use. Using Dx or Ax notation (for example, D4 or A3) may be necessary on boards without a direct PCB pin to GPIO mapping.
+
 Input Modes
 -----------
 The Raspberry Pi Pico has 3 Input modes settings for use with `pinMode`: `INPUT`, `INPUT_PULLUP` and `INPUT_PULLDOWN`

docs/fs.rst

@@ -92,8 +92,9 @@ LittleFS File System Limitations
 --------------------------------
 
 The LittleFS implementation for the RP2040 supports filenames of up
-to 31 characters + terminating zero (i.e. ``char filename[32]``), and
-as many subdirectories as space permits.
+to 254 characters + terminating zero (i.e. ``char filename[255]`` or
+better ``char filename[LFS_NAME_MAX]`` ), and as many subdirectories
+as space permits.
 
 Filenames are assumed to be in the root directory if no initial "/" is
 present.
@@ -372,8 +373,8 @@ rename
 Renames file from ``pathFrom`` to ``pathTo``. Paths must be absolute.
 Returns *true* if file was renamed successfully.
 
-info  **DEPRECATED**
-~~~~~~~~~~~~~~~~~~~~
+info
+~~~~
 
 .. code:: cpp
 
@@ -382,9 +383,8 @@ info  **DEPRECATED**
 
 Fills `FSInfo structure <#filesystem-information-structure>`__ with
 information about the file system. Returns ``true`` if successful,
-``false`` otherwise.  Because this cannot report information about
-filesystemd greater than 4MB, don't use it in new code.  Use ``info64``
-instead which uses 64-bit fields for filesystem sizes.
+``false`` otherwise. ``ìnfo()`` has been updated to support filesystems 
+greater than 4GB and ``FSInfo64`` and ``info64()`` have been discarded.
 
 Filesystem information structure
 --------------------------------
@@ -392,8 +392,8 @@ Filesystem information structure
 .. code:: cpp
 
     struct FSInfo {
-        size_t totalBytes;
-        size_t usedBytes;
+        uint64_t totalBytes;
+        uint64_t usedBytes;
         size_t blockSize;
         size_t pageSize;
         size_t maxOpenFiles;
@@ -408,19 +408,6 @@ block size - ``pageSize`` — filesystem logical page size - ``maxOpenFiles``
 ``maxPathLength`` — max file name length (including one byte for zero
 termination)
 
-info64
-~~~~~~
-
-.. code:: cpp
-
-    FSInfo64 fsinfo;
-    SDFS.info64(fsinfo);
-    or LittleFS.info64(fsinfo);
-
-Performs the same operation as ``info`` but allows for reporting greater than
-4GB for filesystem size/used/etc.  Should be used with the SD and SDFS
-filesystems since most SD cards today are greater than 4GB in size.
-
 setTimeCallback(time_t (\*cb)(void))
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/index.rst

@@ -44,6 +44,7 @@ For the latest version, always check https://github.com/earlephilhower/arduino-p
    USB (Arduino and Adafruit_TinyUSB) <usb>
    Multicore Processing <multicore>
 
+   RP2350 Specific Notes <rp2350>
    RP2350 PSRAM <psram>
 
    Bluetooth <bluetooth>
@@ -72,4 +73,5 @@ For the latest version, always check https://github.com/earlephilhower/arduino-p
    Ported/Optimized Libraries <libraries>
    Using Pico-SDK <sdk>
 
+
    Licenses <license>

docs/install.rst

@@ -184,11 +184,9 @@ The first line creates a file with the USB vendor and ID of the Picoprobe and te
 
 Once Picoprobe permissions are set up properly, then select the board "Raspberry Pi Pico (Picoprobe)" in the Tools menu and upload as normal.
 
-Uploading Sketches with pico-debug
-----------------------------------
-pico-debug differs from Picoprobe in that pico-debug is a virtual debug pod that runs side-by-side on the same RP2040 that you run your code on; so, you only need one RP2040 board instead of two.  pico-debug also differs from Picoprobe in that pico-debug is standards-based; it uses the CMSIS-DAP protocol, which means even software not specially written for the Raspberry Pi Pico can support it.  pico-debug uses OpenOCD to handle your sketch uploads, and debugging can be accomplished with CMSIS-DAP capable debuggers including GDB.
-
-Under Windows and macOS, any user should be able to access pico-debug automatically, but under Linux `udev` must be told about the device and to allow normal users access.
+Uploading Sketches with OpenOCD
+-------------------------------
+Under Windows and macOS, any user should be able to access OpenOCD automatically, but under Linux `udev` must be told about the device and to allow normal users access.
 
 To set up user-level access to all CMSIS-DAP adapters on Ubuntu (and other OSes which use `udev`):
 
@@ -199,10 +197,8 @@ To set up user-level access to all CMSIS-DAP adapters on Ubuntu (and other OSes
 
 The first line creates a file that recognizes all CMSIS-DAP adapters and tells UDEV to give users full access to it.  The second causes `udev` to load this new rule.  Note that you will need to unplug and re-plug in your device the first time you create this file, to allow udev to make the device node properly.
 
-Once CMSIS-DAP permissions are set up properly, then select the board "Raspberry Pi Pico (pico-debug)" in the Tools menu.
+Once CMSIS-DAP permissions are set up properly, then select the Upload Method "Picoprobe/Debugprobe (CMSIS-DAP)" in the Tools menu.
 
-When first connecting the USB port to your PC, you must copy pico-debug-gimmecache.uf2 to the Pi Pico to load pico-debug into RAM; after this, upload as normal.
-
-Debugging with Picoprobe/pico-debug, OpenOCD, and GDB
+Debugging with Picoprobe/Debugprobe, OpenOCD, and GDB
 -----------------------------------------------------
-The installed tools include a version of OpenOCD (in the pqt-openocd directory) and GDB (in the pqt-gcc directory).  These may be used to run GDB in an interactive window as documented in the Pico Getting Started manuals from the Raspberry Pi Foundation.  For pico-debug, replace the raspberrypi-swd and picoprobe example OpenOCD arguments of "-f interface/raspberrypi-swd.cfg -f target/rp2040.cfg" or "-f interface/picoprobe.cfg -f target/rp2040.cfg" respectively in the Pico Getting Started manual with "-f board/pico-debug.cfg".
+The installed tools include a version of OpenOCD (in the pqt-openocd directory) and GDB (in the pqt-gcc directory).  These may be used to run GDB in an interactive window as documented in the Pico Getting Started manuals from the Raspberry Pi Foundation.

docs/piouart.rst

@@ -23,6 +23,12 @@ For example, to make a transmit-only port on GP16
 For detailed information about the Serial ports, see the
 Arduino `Serial Reference <https://www.arduino.cc/reference/en/language/functions/communication/serial/>`_ .
 
+Inversion
+---------
+
+``SoftwareSerial`` and ``SerialPIO`` can both support inverted input and/or outputs via the methods
+``setInvertRX(bool invert)`` and ``setInvertTX(bool invert)``.
+
 
 SoftwareSerial Emulation
 ========================
@@ -31,7 +37,6 @@ with the Arduino `Software Serial <https://docs.arduino.cc/learn/built-in-librar
 library.  Use the normal ``#include <SoftwareSerial.h>`` to include it.   The following
 differences from the Arduino standard are present:
 
-* Inverted mode is not supported
 * All ports are always listening
 * ``listen`` call is a no-op
 * ``isListening()`` always returns ``true``

docs/platformio.rst

@@ -342,7 +342,6 @@ To specify the debugging adapter, use ``debug_tool`` (`documentation <https://do
 * ``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.
 
@@ -362,25 +361,6 @@ For further information on customizing debug options, like the initial breakpoin
 
     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 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
 --------------------
 

docs/rp2350.rst

@@ -0,0 +1,28 @@
+RP2350 Specific Notes
+=====================
+
+The RP2350 chip (present on the Raspberry Pi Pico 2 board and many others)
+is supported by the core with some minor caveats:
+
+* PSRAM is supported via a new ``pmalloc`` call and ``PSRAM`` variable decorator.
+* Both RP2350A and RP2350B (48 GPIOs) are supported.
+* Only ARM mode is available.  For RISC-V (Hazard3), please use the raw SDK.
+* FreeRTOS and OTA are not yet supported.
+
+P2350-E9 Errata ("Increased leakage current on Bank 0 GPIO when pad input is enabled")
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Like all chips, the RP2350-A2 stepping has post-silicon chip errata covering certain
+bugs found after the chip was manufactured.  Probably the most (in)famous and concerning
+is RP2350-E9 which is noted as resulting in "Increased leakage current on Bank 0 GPIO
+when pad input is enabled."  At a high level, this means that in some cases when an
+input pin is being driven by a weak (high impedance) input, it may not read properly.
+
+After discussion with the community and exploration of the issue by many users, this
+core has decided not to implement any forced workarounds for this issue.  Given the
+physical nature of the problem and how no one specific solution is appropriate for
+all conditions.
+
+For more information please read the errata yourself and check the Raspberry Pi Forums
+for the latest updates.
+

docs/serial.rst

@@ -47,6 +47,14 @@ For detailed information about the Serial ports, see the
 Arduino `Serial Reference <https://www.arduino.cc/reference/en/language/functions/communication/serial/>`_ .
 
 
+Inversion
+---------
+
+``Serial1`` and ``Serial2`` can both support inverted input and/or outputs via the methods
+``Serial1/2::setInvertRX(bool invert)`` and ``Serial1/2::setInvertTX(bool invert)`` and
+``Serial1/2::serInvertControl(bool invert)``.
+
+
 RP2040 Specific SerialUSB methods
 ---------------------------------
 

docs/servo.rst

@@ -11,3 +11,10 @@ require the use of a PIO machine.
 See the Arduino standard
 `Servo documentation <https://www.arduino.cc/reference/en/libraries/servo/>`_
 for detailed usage instructions.  There is also an included ``sweep`` example.
+
+Pulse Width Defaults
+--------------------
+The defaults in the Servo library are conservatively set to avoid damage in the case of over-driving. The pulse widths individual servos, especially the no-name or clones, occasionally need tweaking.
+
+You can set the min and max servo pulse width in the attach command, with default values used in most Arduino cores of 540/2400:
+```myServo.attach(D3, 540, 2400)```

docs/wire.rst

@@ -33,32 +33,41 @@ being performed.  For example, a game could send a full screen update out over I
 processing the next frame without waiting for the first one to be sent over I2C.  DMA is used to handle
 the transfer to/from the I2C hardware freeing the CPU from bit-banging or busy waiting.
 
-Note that asynchronous operations can not be intersped with normal, synchronous ones.  Fully complete an
-asynchronous operation before attempting to do a normal ``Wire.beginTransaction()`` or ``Wire.requestFrom``.
-Also, all buffers need to be valid throughout the entire operation.  Read data cannot be accessed until
-the transaction is completed and can't be "peeked" at while the operation is ongoing.
+Note that asynchronous operations can not be intersped with normal, synchronous ones.  Fully complete or 
+abort an asynchronous operation before attempting to do a normal ``Wire.beginTransaction()`` or
+``Wire.requestFrom``.
 
 
-bool writeAsync(uint8_t address, const void \*buffer, size_t bytes, bool sendStop)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Begins an I2C asynchronous write transaction.  Writes to ``address`` of ``bytes`` from ``buffer`` and
-at the end will send an I2C stop if ``sendStop`` is ``true``.
-Check ``finishedAsync()`` to determine when the operation completes and conclude the transaction.
-This operation needs to allocate a buffer from heap equal to 2x ``bytes`` in size.
+bool writeReadAsync(uint8_t address, const void \*wbuffer, size_t wbytes, const void \*rbuffer, size_t rbytes, bool sendStop)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Executes a master I2C asynchronous write/read transaction to I2C slave ``address``.  First ``wbytes`` from
+``wbuffer`` are written to the I2C slave, followed by an I2C restart, then ``rbytes`` are read from the
+I2C slave into ``rbuffer``. The buffers need to be valid throughout the entire asynchronous operation.
 
-bool readAsync(uint8_t address, void \*buffer, size_t bytes, bool sendStop)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Begins an I2C asynchronous read transaction.  Reads from ``address`` for ``bytes`` into ``buffer`` and
-at the end will send an I2C stop if ``sendStop`` is ``true``.
-Check ``finishedAsync()`` to determine when the operation completes and conclude the transaction.
-This operation needs to allocate a buffer from heap equal to 4x ``bytes`` in size.
+At the end of the transaction an I2C stop is sent if ``sendStop`` is ``true``, and at the beginning of the
+transaction an I2C start is sent if the previous write/read had ``sendStop`` set to ``true``.
+
+Check ``finishedAsync()`` to determine when the operation completes, or use ``onFinishedAsync()`` to set a
+callback.
+
+Set ``rbytes`` to 0 to do a write-only operation, set ``wbytes`` to 0 to do a read-only operation. Or use:
+
+``bool writeAsync(uint8_t address, const void \*buffer, size_t bytes, bool sendStop)``
+
+``bool readAsync(uint8_t address, void \*buffer, size_t bytes, bool sendStop)``
+
+The first call to an asynchronous write/read operation allocates the required DMA channels and internal
+buffer.  If desired, call ``end()`` to free these resources.
 
 bool finishedAsync()
 ~~~~~~~~~~~~~~~~~~~~
-Call to check if the asynchronous operations is completed and the buffer passed in can be either read or
-reused.  Frees the allocated memory and completes the asynchronous transaction.
+Call to check if the asynchronous operations is completed.
+
+void onFinishedAsync(void(*function)(void))
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Set a (optional) callback for async operation.  The ``function`` will be called when the asynchronous
+operation finishes.
 
 void abortAsync()
 ~~~~~~~~~~~~~~~~~
-Cancels the outstanding asynchronous transaction and frees any allocated memory.
-
+Cancels any outstanding asynchronous transaction.

include/rp2350/pico_base/pico/config_autogen.h

@@ -4,7 +4,7 @@
 
 // based on PICO_CONFIG_HEADER_FILES:
 
-#include "../../pico-sdk/src/boards/include/boards/pico2.h"
+#include "../../pico-sdk/src/boards/include/boards/solderparty_rp2350_stamp_xl.h"
 #include "../../pico-sdk/src/rp2_common/cmsis/include/cmsis/rename_exceptions.h"
 
 // based on PICO_RP2350_ARM_S_CONFIG_HEADER_FILES:

keywords.txt

@@ -13,6 +13,7 @@ Dir	KEYWORD1
 File	KEYWORD1
 timeval	KEYWORD1
 time_t	KEYWORD1
+SoftwareSerial	KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
@@ -73,6 +74,9 @@ prepare	KEYWORD2
 SerialPIO	KEYWORD2
 setFIFOSize	KEYWORD2
 setPollingMode	KEYWORD2
+setInvertTX	KEYWORD2
+setInvertRX	KEYWORD2
+setInvertControl	KEYWORD2
 
 digitalWriteFast	KEYWORD2
 digitalReadFast	KEYWORD2
@@ -101,4 +105,4 @@ OUTPUT_12MA	LITERAL1
 
 ARDUINO_ARCH_RP2040	LITERAL1
 
-PRAM	LITERAL1
+PSRAM	LITERAL1

lib/core_inc.txt

@@ -2,6 +2,7 @@
 
 -iwithprefixbefore/pico-sdk/lib/tinyusb/src
 -iwithprefixbefore/pico-sdk/src/boards/include
+-iwithprefixbefore/pico-sdk/src/common/hardware_claim/include
 -iwithprefixbefore/pico-sdk/src/common/pico_base/include
 -iwithprefixbefore/pico-sdk/src/common/pico_base_headers/include
 -iwithprefixbefore/pico-sdk/src/common/pico_binary_info/include
@@ -19,7 +20,6 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_adc/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_base/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_boot_lock/include
--iwithprefixbefore/pico-sdk/src/rp2_common/hardware_claim/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_clocks/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_divider/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_dma/include

lib/rp2040/picodebug.tcl

@@ -1 +0,0 @@
-source [find board/pico-debug.cfg]

lib/rp2350/platform_inc.txt

@@ -4,3 +4,5 @@
 -iwithprefixbefore/pico-sdk/src/rp2350/hardware_structs/include
 -iwithprefixbefore/pico-sdk/src/rp2350/pico_platform/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/cmsis/stub/CMSIS/Device/RP2350/Include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_sha256/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_sha256/include

libraries/FreeRTOS/src/FreeRTOSConfig.h

@@ -1,79 +1,196 @@
+#ifndef configNUMBER_OF_CORES
 #define configNUMBER_OF_CORES             2
+#endif
+#ifndef configUSE_CORE_AFFINITY
 #define configUSE_CORE_AFFINITY           1
+#endif
+#ifndef configRUN_MULTIPLE_PRIORITIES
 #define configRUN_MULTIPLE_PRIORITIES     1
+#endif
 
+#ifndef configUSE_PREEMPTION
 #define configUSE_PREEMPTION              1
+#endif
+#ifndef configUSE_IDLE_HOOK
 #define configUSE_IDLE_HOOK               1
+#endif
+#ifndef configUSE_PASSIVE_IDLE_HOOK
 #define configUSE_PASSIVE_IDLE_HOOK       1
+#endif
+#ifndef configUSE_TICK_HOOK
 #define configUSE_TICK_HOOK               1
+#endif
+#ifndef configCPU_CLOCK_HZ
 #define configCPU_CLOCK_HZ                ( ( unsigned long ) F_CPU  )
+#endif
+#ifndef configTICK_RATE_HZ
 #define configTICK_RATE_HZ                ( ( TickType_t ) 1000 )
+#endif
+#ifndef configMAX_PRIORITIES
 #define configMAX_PRIORITIES              ( 8 )
+#endif
+#ifndef configMINIMAL_STACK_SIZE
 #define configMINIMAL_STACK_SIZE          ( ( unsigned short ) 256 )
+#endif
+#ifndef configTOTAL_HEAP_SIZE
 #define configTOTAL_HEAP_SIZE             ( ( size_t ) ( 164 * 1024 ) )
+#endif
+#ifndef configMAX_TASK_NAME_LEN
 #define configMAX_TASK_NAME_LEN           ( 10 )
+#endif
+#ifndef configUSE_TRACE_FACILITY
 #define configUSE_TRACE_FACILITY          1
+#endif
+#ifndef configUSE_16_BIT_TICKS
 #define configUSE_16_BIT_TICKS            0
+#endif
+#ifndef configIDLE_SHOULD_YIELD
 #define configIDLE_SHOULD_YIELD           1
+#endif
+#ifndef configUSE_MUTEXES
 #define configUSE_MUTEXES                 1
+#endif
+#ifndef configQUEUE_REGISTRY_SIZE
 #define configQUEUE_REGISTRY_SIZE         8
+#endif
+#ifndef configUSE_RECURSIVE_MUTEXES
 #define configUSE_RECURSIVE_MUTEXES       1
+#endif
+#ifndef configUSE_MALLOC_FAILED_HOOK
 #define configUSE_MALLOC_FAILED_HOOK      1
+#endif
+#ifndef configUSE_APPLICATION_TASK_TAG
 #define configUSE_APPLICATION_TASK_TAG    0
+#endif
+#ifndef configUSE_COUNTING_SEMAPHORES
 #define configUSE_COUNTING_SEMAPHORES     1
+#endif
+#ifndef configUSE_QUEUE_SETS
 #define configUSE_QUEUE_SETS              1
+#endif
+#ifndef configSUPPORT_DYNAMIC_ALLOCATION
 #define configSUPPORT_DYNAMIC_ALLOCATION  1
+#endif
+#ifndef configSUPPORT_STATIC_ALLOCATION
 #define configSUPPORT_STATIC_ALLOCATION   1
+#endif
+#ifndef configSTACK_DEPTH_TYPE
 #define configSTACK_DEPTH_TYPE            uint32_t
+#endif
+#ifndef configUSE_TASK_PREEMPTION_DISABLE
 #define configUSE_TASK_PREEMPTION_DISABLE 1
+#endif
 
+#ifndef configUSE_NEWLIB_REENTRANT
 #define configUSE_NEWLIB_REENTRANT        1
+#endif
+#ifndef configNEWLIB_REENTRANT_IS_DYNAMIC
 #define configNEWLIB_REENTRANT_IS_DYNAMIC 1
+#endif
 
 /* Run time stats related definitions. */
+#ifndef configGENERATE_RUN_TIME_STATS
+#define configGENERATE_RUN_TIME_STATS	1
+#endif
+#ifdef configGENERATE_RUN_TIME_STATS
 extern void vMainConfigureTimerForRunTimeStats(void);
 extern unsigned long ulMainGetRunTimeCounterValue(void);
-#define configGENERATE_RUN_TIME_STATS	1
 #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() //vMainConfigureTimerForRunTimeStats()
 #define portGET_RUN_TIME_COUNTER_VALUE() ulMainGetRunTimeCounterValue()
+#endif
 
 /* Co-routine definitions. */
+#ifndef configUSE_CO_ROUTINES
 #define configUSE_CO_ROUTINES           0
+#endif
+#ifndef configMAX_CO_ROUTINE_PRIORITIES
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
+#endif
 
 /* Software timer definitions. */
+#ifndef configUSE_TIMERS
 #define configUSE_TIMERS             1
+#endif
+#ifndef configTIMER_TASK_PRIORITY
 #define configTIMER_TASK_PRIORITY    ( 2 )
+#endif
+#ifndef configTIMER_QUEUE_LENGTH
 #define configTIMER_QUEUE_LENGTH     5
+#endif
+#ifndef configTIMER_TASK_STACK_DEPTH
 #define configTIMER_TASK_STACK_DEPTH ( 1024 )
+#endif
 
 /*  Set the following definitions to 1 to include the API function, or zero
     to exclude the API function. */
+#ifndef INCLUDE_eTaskGetState
 #define INCLUDE_eTaskGetState                   1
+#endif
+#ifndef INCLUDE_uxTaskGetStackHighWaterMark
 #define INCLUDE_uxTaskGetStackHighWaterMark 	1
+#endif
+#ifndef INCLUDE_uxTaskPriorityGet
 #define INCLUDE_uxTaskPriorityGet               1
+#endif
+#ifndef INCLUDE_vTaskCleanUpResources
 #define INCLUDE_vTaskCleanUpResources           1
+#endif
+#ifndef INCLUDE_vTaskDelay
 #define INCLUDE_vTaskDelay                      1
+#endif
+#ifndef INCLUDE_vTaskDelayUntil
 #define INCLUDE_vTaskDelayUntil                 1
+#endif
+#ifndef INCLUDE_vTaskDelete
 #define INCLUDE_vTaskDelete                     1
+#endif
+#ifndef INCLUDE_vTaskPrioritySet
 #define INCLUDE_vTaskPrioritySet                1
+#endif
+#ifndef INCLUDE_vTaskSuspend
 #define INCLUDE_vTaskSuspend                    1
+#endif
+#ifndef INCLUDE_xQueueGetMutexHolder
 #define INCLUDE_xQueueGetMutexHolder            1
+#endif
+#ifndef INCLUDE_xTaskAbortDelay
 #define INCLUDE_xTaskAbortDelay                 1
+#endif
+#ifndef INCLUDE_xTaskGetCurrentTaskHandle
 #define INCLUDE_xTaskGetCurrentTaskHandle       1
+#endif
+#ifndef INCLUDE_xTaskGetHandle
 #define INCLUDE_xTaskGetHandle                  1
+#endif
+#ifndef INCLUDE_xTaskGetIdleTaskHandle
 #define INCLUDE_xTaskGetIdleTaskHandle          1
+#endif
+#ifndef INCLUDE_xTaskGetSchedulerState
 #define INCLUDE_xTaskGetSchedulerState          1
+#endif
+#ifndef INCLUDE_xTaskResumeFromISR
 #define INCLUDE_xTaskResumeFromISR              1
+#endif
+#ifndef INCLUDE_xTimerPendFunctionCall
 #define INCLUDE_xTimerPendFunctionCall          1
+#endif
 
+#ifndef configUSE_STATS_FORMATTING_FUNCTIONS
 #define configUSE_STATS_FORMATTING_FUNCTIONS	1
+#endif
 
+#ifndef configUSE_MUTEXES
 #define configUSE_MUTEXES              1
+#endif
+#ifndef configUSE_MALLOC_FAILED_HOOK
 #define configUSE_MALLOC_FAILED_HOOK   1
+#endif
+#ifndef configCHECK_FOR_STACK_OVERFLOW
 #define configCHECK_FOR_STACK_OVERFLOW 2
+#endif
 
 /* Cortex-M specific definitions. */
+#ifndef configPRIO_BITS
 #undef __NVIC_PRIO_BITS
 #ifdef __NVIC_PRIO_BITS
 /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
@@ -81,24 +198,34 @@ extern unsigned long ulMainGetRunTimeCounterValue(void);
 #else
 #define configPRIO_BITS 3 /* 8 priority levels */
 #endif
+#endif
 
 /*  The lowest interrupt priority that can be used in a call to a "set priority"
     function. */
+#ifndef configLIBRARY_LOWEST_INTERRUPT_PRIORITY
 #define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0x7
+#endif
 
 /*  The highest interrupt priority that can be used by any interrupt service
     routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT CALL
     INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
     PRIORITY THAN THIS! (higher priorities are lower numeric values. */
+#ifndef configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY
 #define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 5
+#endif
 
 /*  Interrupt priorities used by the kernel port layer itself.  These are generic
     to all Cortex-M ports, and do not rely on any particular library functions. */
+#ifndef configKERNEL_INTERRUPT_PRIORITY
 #define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+#endif
 /* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
     See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
+#ifndef configMAX_SYSCALL_INTERRUPT_PRIORITY
 #define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+#endif
 
+#ifndef configASSERT
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -109,11 +236,20 @@ void rtosFatalError(void);
 
 #define configASSERT( x ) \
 	if( ( x ) == 0 ) { portDISABLE_INTERRUPTS(); rtosFatalError(); }
+#endif
 
+#ifndef configUSE_DYNAMIC_EXCEPTION_HANDLERS
 #define configUSE_DYNAMIC_EXCEPTION_HANDLERS 0
+#endif
+#ifndef configSUPPORT_PICO_SYNC_INTEROP
 #define configSUPPORT_PICO_SYNC_INTEROP      1
+#endif
+#ifndef configSUPPORT_PICO_TIME_INTEROP
 #define configSUPPORT_PICO_TIME_INTEROP      1
+#endif
 
+#ifndef LIB_PICO_MULTICORE
 #define LIB_PICO_MULTICORE 1
+#endif
 
 #include "rp2040_config.h"

libraries/I2S/src/I2S.cpp

@@ -66,23 +66,22 @@ I2S::~I2S() {
 }
 
 bool I2S::setBCLK(pin_size_t pin) {
-    if (_running || (pin > 28)) {
+    if (_running || (pin > __GPIOCNT - 1)) {
         return false;
     }
     _pinBCLK = pin;
     return true;
 }
 
-
 bool I2S::setMCLK(pin_size_t pin) {
-    if (_running || (pin > 28)) {
+    if (_running || (pin >= __GPIOCNT)) {
         return false;
     }
     _pinMCLK = pin;
     return true;
 }
 bool I2S::setDATA(pin_size_t pin) {
-    if (_running || (pin > 29)) {
+    if (_running || (pin >= __GPIOCNT)) {
         return false;
     }
     _pinDOUT = pin;
@@ -198,7 +197,7 @@ void I2S::onReceive(void(*fn)(void)) {
 void I2S::MCLKbegin() {
     int off = 0;
     _i2sMCLK = new PIOProgram(&pio_i2s_mclk_program);
-    _i2sMCLK->prepare(&_pioMCLK, &_smMCLK, &off); // not sure how to use the same PIO
+    _i2sMCLK->prepare(&_pioMCLK, &_smMCLK, &off, _pinMCLK, 1); // not sure how to use the same PIO
     pio_i2s_MCLK_program_init(_pioMCLK, _smMCLK, off, _pinMCLK);
     int mClk = _multMCLK * _freq * 2.0 /* edges per clock */;
     pio_sm_set_clkdiv_int_frac(_pioMCLK, _smMCLK, clock_get_hz(clk_sys) / mClk, 0);
@@ -215,7 +214,9 @@ bool I2S::begin() {
     } else {
         _i2s = new PIOProgram(_isOutput ? (_isTDM ? &pio_tdm_out_swap_program : (_isLSBJ ? &pio_lsbj_out_swap_program : &pio_i2s_out_swap_program)) : &pio_i2s_in_swap_program);
     }
-    if (!_i2s->prepare(&_pio, &_sm, &off)) {
+    int minpin = std::min((int)_pinDOUT, (int)_pinBCLK);
+    int maxpin = std::max((int)_pinDOUT, (int)_pinBCLK + 1);
+    if (!_i2s->prepare(&_pio, &_sm, &off, minpin, maxpin - minpin + 1)) {
         _running = false;
         delete _i2s;
         _i2s = nullptr;

libraries/I2S/src/pio_i2s.pio

@@ -220,9 +220,13 @@ static inline void pio_i2s_out_program_init(PIO pio, uint sm, uint offset, uint
 
     pio_sm_init(pio, sm, offset, &sm_config);
 
-    uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, data_pin, 1);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
 
     pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits - 2));
 }
@@ -241,9 +245,13 @@ static inline void pio_tdm_out_program_init(PIO pio, uint sm, uint offset, uint
 
     pio_sm_init(pio, sm, offset, &sm_config);
 
-    uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, data_pin, 1);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
 
     // Can't set constant > 31, so push and pop/mov
     pio_sm_put_blocking(pio, sm, bits * channels - 2);
@@ -268,9 +276,13 @@ static inline void pio_lsbj_out_program_init(PIO pio, uint sm, uint offset, uint
 
     pio_sm_init(pio, sm, offset, &sm_config);
 
-    uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, data_pin, 1);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
 
     pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits - 2));
 }
@@ -289,9 +301,12 @@ static inline void pio_i2s_in_program_init(PIO pio, uint sm, uint offset, uint d
 
     pio_sm_init(pio, sm, offset, &sm_config);
 
-    uint pin_mask = 3u << clock_pin_base;
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = 3u << clock_pin_base;
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, false);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
 
     pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits - 2));
 

libraries/I2S/src/pio_i2s.pio.h

@@ -369,9 +369,13 @@ static inline void pio_i2s_out_program_init(PIO pio, uint sm, uint offset, uint
     sm_config_set_out_shift(&sm_config, false, true, (bits <= 16) ? 2 * bits : bits);
     sm_config_set_fifo_join(&sm_config, PIO_FIFO_JOIN_TX);
     pio_sm_init(pio, sm, offset, &sm_config);
-    uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, data_pin, 1);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
     pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits - 2));
 }
 static inline void pio_tdm_out_program_init(PIO pio, uint sm, uint offset, uint data_pin, uint clock_pin_base, uint bits, bool swap, uint channels) {
@@ -384,9 +388,13 @@ static inline void pio_tdm_out_program_init(PIO pio, uint sm, uint offset, uint
     sm_config_set_out_shift(&sm_config, false, true, 32);
     sm_config_set_fifo_join(&sm_config, PIO_FIFO_JOIN_TX);
     pio_sm_init(pio, sm, offset, &sm_config);
-    uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, data_pin, 1);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
     // Can't set constant > 31, so push and pop/mov
     pio_sm_put_blocking(pio, sm, bits * channels - 2);
     pio_sm_exec(pio, sm, pio_encode_pull(false, false));
@@ -404,9 +412,13 @@ static inline void pio_lsbj_out_program_init(PIO pio, uint sm, uint offset, uint
     sm_config_set_out_shift(&sm_config, false, true, (bits <= 16) ? 2 * bits : bits);
     sm_config_set_fifo_join(&sm_config, PIO_FIFO_JOIN_TX);
     pio_sm_init(pio, sm, offset, &sm_config);
-    uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = (1u << data_pin) | (3u << clock_pin_base);
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, true);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, data_pin, 1);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
     pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits - 2));
 }
 static inline void pio_i2s_in_program_init(PIO pio, uint sm, uint offset, uint data_pin, uint clock_pin_base, uint bits, bool swap) {
@@ -419,9 +431,12 @@ static inline void pio_i2s_in_program_init(PIO pio, uint sm, uint offset, uint d
     sm_config_set_in_shift(&sm_config, false, true, (bits <= 16) ? 2 * bits : bits);
     sm_config_set_fifo_join(&sm_config, PIO_FIFO_JOIN_RX);
     pio_sm_init(pio, sm, offset, &sm_config);
-    uint pin_mask = 3u << clock_pin_base;
-    pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
-    pio_sm_set_pins(pio, sm, 0); // clear pins
+    //uint pin_mask = 3u << clock_pin_base;
+    //pio_sm_set_pindirs_with_mask(pio, sm, pin_mask, pin_mask);
+    //pio_sm_set_pins(pio, sm, 0); // clear pins
+    pio_sm_set_consecutive_pindirs(pio, sm, data_pin, 1, false);
+    pio_sm_set_consecutive_pindirs(pio, sm, clock_pin_base, 2, true);
+    pio_sm_set_set_pins(pio, sm, clock_pin_base, 2);
     pio_sm_exec(pio, sm, pio_encode_set(pio_y, bits - 2));
     pio_sm_exec(pio, sm, pio_encode_in(pio_pins, bits)); // Shift in 1st L data
     pio_sm_exec(pio, sm, pio_encode_in(pio_pins, bits - 1)); // Shift in 1st R data modulo one bit, avoiding bit shift from #2037

libraries/PDM/src/rp2040/pdm.pio.h

@@ -54,7 +54,7 @@ static inline void pdm_pio_program_init(PIO pio, uint sm, uint offset, uint clkP
     pio_sm_set_consecutive_pindirs(pio, sm, dataPin, 1, false);
     pio_sm_set_consecutive_pindirs(pio, sm, clkPin, 1, true);
     pio_sm_set_pins_with_mask(pio, sm, 0, (1u << clkPin));
-    //pio_gpio_init(pio, dataPin);
+    pio_gpio_init(pio, dataPin);
     pio_gpio_init(pio, clkPin);
     pio_sm_init(pio, sm, offset, &c);
     pio_sm_set_enabled(pio, sm, true);

libraries/PWMAudio/examples/PlayRaw/wav.h

@@ -1,4 +1,4 @@
-unsigned char out_raw[] = {
+const unsigned char out_raw[] __attribute__((aligned((2)))) = {
     0xbd, 0x1b, 0xd1, 0x1a, 0x41, 0x1b, 0x63, 0x1a, 0xdf, 0x19, 0xea, 0x19,
     0x18, 0x19, 0x50, 0x19, 0x2e, 0x1a, 0xdc, 0x19, 0x90, 0x1a, 0x8d, 0x1a,
     0x60, 0x19, 0x31, 0x19, 0x81, 0x17, 0x79, 0x16, 0xda, 0x16, 0x0b, 0x16,

libraries/SPI/src/SPI.cpp

@@ -329,10 +329,16 @@ void SPIClassRP2040::abortAsync() {
 
 
 bool SPIClassRP2040::setRX(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({0, 4, 16, 20}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 26}) /* SPI0 */,
+                                    __bitset({8, 12, 24, 28, 40, 44})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20}) /* SPI0 */,
                                     __bitset({8, 12, 24, 28})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _RX = pin;
         return true;
     }
@@ -350,10 +356,16 @@ bool SPIClassRP2040::setRX(pin_size_t pin) {
 }
 
 bool SPIClassRP2040::setCS(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({1, 5, 17, 21}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */,
+                                    __bitset({9, 13, 25, 29, 41, 45})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21}) /* SPI0 */,
                                     __bitset({9, 13, 25, 29})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _CS = pin;
         return true;
     }
@@ -371,10 +383,16 @@ bool SPIClassRP2040::setCS(pin_size_t pin) {
 }
 
 bool SPIClassRP2040::setSCK(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({2, 6, 18, 22}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */,
+                                    __bitset({10, 14, 26, 30, 42, 46})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22}) /* SPI0 */,
                                     __bitset({10, 14, 26})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _SCK = pin;
         return true;
     }
@@ -392,10 +410,16 @@ bool SPIClassRP2040::setSCK(pin_size_t pin) {
 }
 
 bool SPIClassRP2040::setTX(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({3, 7, 19, 23}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */,
+                                    __bitset({11, 15, 27, 31, 43, 47})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23}) /* SPI0 */,
                                     __bitset({11, 15, 27})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _TX = pin;
         return true;
     }

libraries/SPISlave/src/SPISlave.cpp

@@ -79,10 +79,16 @@ inline spi_cpha_t SPISlaveClass::cpha(SPISettings _spis) {
 }
 
 bool SPISlaveClass::setRX(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({0, 4, 16, 20}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 26}) /* SPI0 */,
+                                    __bitset({8, 12, 24, 28, 40, 44})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20}) /* SPI0 */,
                                     __bitset({8, 12, 24, 28})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _RX = pin;
         return true;
     }
@@ -100,10 +106,16 @@ bool SPISlaveClass::setRX(pin_size_t pin) {
 }
 
 bool SPISlaveClass::setCS(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({1, 5, 17, 21}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */,
+                                    __bitset({9, 13, 25, 29, 41, 45})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21}) /* SPI0 */,
                                     __bitset({9, 13, 25, 29})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _CS = pin;
         return true;
     }
@@ -121,10 +133,16 @@ bool SPISlaveClass::setCS(pin_size_t pin) {
 }
 
 bool SPISlaveClass::setSCK(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({2, 6, 18, 22}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */,
+                                    __bitset({10, 14, 26, 30, 42, 46})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22}) /* SPI0 */,
                                     __bitset({10, 14, 26})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _SCK = pin;
         return true;
     }
@@ -142,10 +160,16 @@ bool SPISlaveClass::setSCK(pin_size_t pin) {
 }
 
 bool SPISlaveClass::setTX(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({3, 7, 19, 23}) /* SPI0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */,
+                                    __bitset({11, 15, 27, 31, 43, 47})  /* SPI1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23}) /* SPI0 */,
                                     __bitset({11, 15, 27})  /* SPI1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[spi_get_index(_spi)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[spi_get_index(_spi)])) {
         _TX = pin;
         return true;
     }

libraries/Servo/src/Servo.cpp

@@ -85,7 +85,7 @@ int Servo::attach(pin_size_t pin, int minUs, int maxUs, int value) {
         digitalWrite(pin, LOW);
         pinMode(pin, OUTPUT);
         _pin = pin;
-        if (!_servoPgm.prepare(&_pio, &_smIdx, &_pgmOffset)) {
+        if (!_servoPgm.prepare(&_pio, &_smIdx, &_pgmOffset, pin, 1)) {
             // ERROR, no free slots
             return -1;
         }

libraries/Wire/keywords.txt

@@ -25,6 +25,8 @@ writeAsync	KEYWORD2
 readAsync	KEYWORD2
 finishedAsync	KEYWORD2
 abortAsync	KEYWORD2
+writeReadAsync	KEYWORD2
+onFinishedAsync	KEYWORD2
 
 #######################################
 # Instances (KEYWORD2)

libraries/Wire/src/Wire.cpp

@@ -49,10 +49,16 @@ TwoWire::TwoWire(i2c_inst_t *i2c, pin_size_t sda, pin_size_t scl) {
 }
 
 bool TwoWire::setSDA(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({0, 4, 8, 12, 16, 20, 24, 28}) /* I2C0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44}) /* I2C0 */,
+                                    __bitset({2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46})  /* I2C1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({0, 4, 8, 12, 16, 20, 24, 28}) /* I2C0 */,
                                     __bitset({2, 6, 10, 14, 18, 22, 26})  /* I2C1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[i2c_hw_index(_i2c)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[i2c_hw_index(_i2c)])) {
         _sda = pin;
         return true;
     }
@@ -70,10 +76,16 @@ bool TwoWire::setSDA(pin_size_t pin) {
 }
 
 bool TwoWire::setSCL(pin_size_t pin) {
-    constexpr uint32_t valid[2] = { __bitset({1, 5, 9, 13, 17, 21, 25, 29}) /* I2C0 */,
+#ifdef RP2350B
+    constexpr uint64_t valid[2] = { __bitset({1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45}) /* I2C0 */,
+                                    __bitset({3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47})  /* I2C1 */
+                                  };
+#else
+    constexpr uint64_t valid[2] = { __bitset({1, 5, 9, 13, 17, 21, 25, 29}) /* I2C0 */,
                                     __bitset({3, 7, 11, 15, 19, 23, 27})  /* I2C1 */
                                   };
-    if ((!_running) && ((1 << pin) & valid[i2c_hw_index(_i2c)])) {
+#endif
+    if ((!_running) && ((1LL << pin) & valid[i2c_hw_index(_i2c)])) {
         _scl = pin;
         return true;
     }
@@ -226,6 +238,8 @@ void TwoWire::onIRQ() {
 #pragma GCC pop_options
 
 void TwoWire::end() {
+    endAsync();
+
     if (!_running) {
         // ERROR
         return;
@@ -441,176 +455,226 @@ void TwoWire::flush(void) {
     // data transfer.
 }
 
-
 // DMA/asynchronous transfers.  Do not combime with synchronous runs or bad stuff will happen
-// All buffers must be valid for entire DMA and not touched until `finished()` returns true.
-bool TwoWire::writeAsync(uint8_t address, const void *buffer, size_t bytes, bool sendStop) {
-    if (!_running || _txBegun || _rxBegun) {
+// All buffers must be valid for entire DMA and not touched until `finishedAsync()` returns true.
+bool TwoWire::writeReadAsync(uint8_t address, const void *wbuffer, size_t wbytes, const void *rbuffer, size_t rbytes, bool sendStop) {
+    if (!_running || _txBegun || (wbytes == 0 && rbytes == 0)) {
         return false;
     }
 
-    // We need to expand the data to include side-channel start/stop bits for the I2C FIFO
-    _dmaBuffer = (uint16_t*)malloc(bytes * 2);
-    if (!_dmaBuffer) {
-        return false;
-    }
-    const uint8_t *srcBuff = (const uint8_t *)buffer;
-    for (size_t i = 0; i < bytes; i++) {
-        bool first = i == 0;
-        bool last = i == bytes - 1;
-        _dmaBuffer[i] = bool_to_bit(first && _i2c->restart_on_next) << I2C_IC_DATA_CMD_RESTART_LSB | bool_to_bit(last && sendStop) << I2C_IC_DATA_CMD_STOP_LSB | srcBuff[i];
+    if (!_dmaRunning) {
+        beginAsync();
+        if (!_dmaRunning) {
+            return false;
+        }
     }
 
-    _channelDMA = dma_claim_unused_channel(false);
-    if (_channelDMA == -1) {
-        free(_dmaBuffer);
-        _dmaBuffer = nullptr;
-        return false;
+    // Abort any ongoing transaction
+    abortAsync();
+
+    // Create or enlarge dma command buffer, we need one entry for every i2c byte we want to write/read
+    const size_t bufLen = (wbytes + rbytes) * 2;
+    if (_dmaSendBufferLen < bufLen) {
+        if (_dmaSendBuffer) {
+            free(_dmaSendBuffer);
+            _dmaSendBuffer = nullptr;
+            _dmaSendBufferLen = 0;
+        }
+        _dmaSendBuffer = (uint16_t *)malloc(bufLen);
+        if (!_dmaSendBuffer) {
+            return false;
+        }
     }
-    dma_channel_config c = dma_channel_get_default_config(_channelDMA);
+
+    // Fill the dma command buffer
+    for (size_t i = 0; i < wbytes; i++) {
+        _dmaSendBuffer[i] = ((uint8_t*) wbuffer)[i];
+    }
+    for (size_t i = 0; i < rbytes; i++) {
+        _dmaSendBuffer[wbytes + i] = I2C_IC_DATA_CMD_CMD_BITS; // -> 1 for read
+    }
+    if (_i2c->restart_on_next) {
+        _dmaSendBuffer[0] |= I2C_IC_DATA_CMD_RESTART_BITS;
+    }
+    if (wbytes > 0 && rbytes > 0) {
+        _dmaSendBuffer[wbytes + 0] |= I2C_IC_DATA_CMD_RESTART_BITS;
+    }
+    if (sendStop) {
+        _dmaSendBuffer[wbytes + rbytes - 1] |= I2C_IC_DATA_CMD_STOP_BITS;
+    }
+
+    // Cleanup and Setup dma send channel
+    dma_channel_cleanup(_dmaChannelSend);
+    dma_channel_config c = dma_channel_get_default_config(_dmaChannelSend);
     channel_config_set_transfer_data_size(&c, DMA_SIZE_16); // 16b transfers into I2C FIFO
     channel_config_set_read_increment(&c, true); // Reading incrementing addresses
     channel_config_set_write_increment(&c, false); // Writing to the same FIFO address
     channel_config_set_dreq(&c, i2c_get_dreq(_i2c, true)); // Wait for the TX FIFO specified
-    channel_config_set_chain_to(&c, _channelDMA); // No chaining
-    channel_config_set_irq_quiet(&c, true); // No need for IRQ
-    dma_channel_configure(_channelDMA, &c, &_i2c->hw->data_cmd, _dmaBuffer, bytes, false);
+    channel_config_set_chain_to(&c, _dmaChannelSend); // No chaining
+    channel_config_set_irq_quiet(&c, false); // Enable interrupt (can be disabled later with dma_channel_set_irq0_enabled() as needed)
+    dma_channel_configure(_dmaChannelSend, &c, &_i2c->hw->data_cmd, _dmaSendBuffer, wbytes + rbytes, false);
 
-    _i2c->hw->enable = 0;
-    _i2c->hw->tar = address;
-    _i2c->hw->dma_cr = 1 << 1; // TDMAE
-    _i2c->hw->enable = 1;
-    _i2c->restart_on_next = !sendStop;
-    dma_channel_start(_channelDMA);
-    _txBegun = true;
-    return true;
-}
-
-bool TwoWire::readAsync(uint8_t address, void *buffer, size_t bytes, bool sendStop) {
-    if (!_running || _txBegun || _rxBegun) {
-        return false;
-    }
-    _channelDMA = dma_claim_unused_channel(false);
-    if (_channelDMA == -1) {
-        return false;
-    }
-    _channelSendDMA = dma_claim_unused_channel(false);
-    if (_channelSendDMA == -1) {
-        dma_channel_unclaim(_channelDMA);
-        return false;
-    }
-
-    // We need to expand the data to include side-channel start/stop bits for the I2C FIFO
-    _dmaBuffer = (uint16_t*)malloc(bytes * 2);
-    if (!_dmaBuffer) {
-        return false;
-    }
-    // We need to write one entry for every byte we want to read for the sideband info
-    _dmaSendBuffer = (uint16_t *)malloc(bytes * 2);
-    if (!_dmaSendBuffer) {
-        free(_dmaBuffer);
-        _dmaBuffer = nullptr;
-        return false;
-    }
-    for (size_t i = 0; i < bytes; i++) {
-        bool first = i == 0;
-        bool last = i == bytes - 1;
-        _dmaSendBuffer[i] =
-            bool_to_bit(first && _i2c->restart_on_next) << I2C_IC_DATA_CMD_RESTART_LSB |
-            bool_to_bit(last && sendStop) << I2C_IC_DATA_CMD_STOP_LSB |
-            I2C_IC_DATA_CMD_CMD_BITS; // -> 1 for read
-    }
-
-    _dmaBytes = bytes;
-    _rxFinalBuffer = (uint8_t *)buffer;
-
-    dma_channel_config c = dma_channel_get_default_config(_channelSendDMA);
-    channel_config_set_transfer_data_size(&c, DMA_SIZE_16); // 16b transfers into I2C FIFO
-    channel_config_set_read_increment(&c, true); // Reading incrementing addresses
-    channel_config_set_write_increment(&c, false); // Writing to the same FIFO address
-    channel_config_set_dreq(&c, i2c_get_dreq(_i2c, true)); // Wait for the TX FIFO specified
-    channel_config_set_chain_to(&c, _channelSendDMA); // No chaining
-    channel_config_set_irq_quiet(&c, true); // No need for IRQ
-    dma_channel_configure(_channelSendDMA, &c, &_i2c->hw->data_cmd, _dmaSendBuffer, bytes, false);
-
-    c = dma_channel_get_default_config(_channelDMA);
-    channel_config_set_transfer_data_size(&c, DMA_SIZE_16); // 16b transfers into I2C FIFO
+    // Cleanup and setup dma receive channel
+    dma_channel_cleanup(_dmaChannelReceive);
+    c = dma_channel_get_default_config(_dmaChannelReceive);
+    channel_config_set_transfer_data_size(&c, DMA_SIZE_8); // 8b transfers from I2C FIFO
     channel_config_set_read_increment(&c, false); // Reading same FIFO address
     channel_config_set_write_increment(&c, true); // Writing to the buffer
     channel_config_set_dreq(&c, i2c_get_dreq(_i2c, false)); // Wait for the RX FIFO specified
-    channel_config_set_chain_to(&c, _channelDMA); // No chaining
-    channel_config_set_irq_quiet(&c, true); // No need for IRQ
-    dma_channel_configure(_channelDMA, &c, _dmaBuffer, &_i2c->hw->data_cmd, bytes, false);
+    channel_config_set_chain_to(&c, _dmaChannelReceive); // No chaining
+    channel_config_set_irq_quiet(&c, false); // Enable interrupt (can be disabled later with dma_channel_set_irq0_enabled() as needed)
+    dma_channel_configure(_dmaChannelReceive, &c, (void*) rbuffer, &_i2c->hw->data_cmd, rbytes, false);
 
+    // Enable dma completed interrupt
+    dma_channel_set_irq0_enabled(_dmaChannelSend, (rbytes == 0)); //write only, enable irq on Send channel
+    dma_channel_set_irq0_enabled(_dmaChannelReceive, (rbytes > 0)); //when reading, enable irq on Receive channel
+
+    // Setup i2c hardware
     _i2c->hw->enable = 0;
     _i2c->hw->tar = address;
-    _i2c->hw->dma_cr = 1 | (1 << 1); // TDMAE | RDMAE
+    _i2c->hw->dma_cr = 1 << 1 | (rbytes > 0 ? 1 : 0) ; // TDMAE + RDMAE when rbytes>0
     _i2c->hw->enable = 1;
     _i2c->restart_on_next = !sendStop;
-    dma_channel_start(_channelDMA);
-    dma_channel_start(_channelSendDMA);
-    _rxBegun = true;
+
+    // Start dma channel(s)
+    _txBegun = true;
+    _dmaFinished = false;
+    if (rbytes > 0) {
+        dma_channel_start(_dmaChannelReceive);
+    }
+    dma_channel_start(_dmaChannelSend);
+
     return true;
 }
+bool TwoWire::writeAsync(uint8_t address, const void *buffer, size_t bytes, bool sendStop) {
+    return writeReadAsync(address, buffer, bytes, nullptr, 0, sendStop);
+}
+
+bool TwoWire::readAsync(uint8_t address, void *buffer, size_t bytes, bool sendStop) {
+    return writeReadAsync(address, nullptr, 0, buffer, bytes, sendStop);
+}
 
 bool TwoWire::finishedAsync() {
-    if (!_running || !_dmaBuffer) {
-        return true;
-    }
-    if (dma_channel_is_busy(_channelDMA)) {
-        return false;
-    }
-    if (_txBegun) {
-        if (_i2c->hw->txflr) {
-            return false;
-        }
-        dma_channel_cleanup(_channelDMA);
-        dma_channel_unclaim(_channelDMA);
-        _i2c->hw->dma_cr = 0;
-        free(_dmaBuffer);
-        _dmaBuffer = nullptr;
-        _txBegun = false;
-        return true;
-    } else if (_rxBegun) {
-        // For RX, don't care if more data in FIFO.  The DMA read is done for the size requested
-        dma_channel_cleanup(_channelDMA);
-        dma_channel_unclaim(_channelDMA);
-        dma_channel_cleanup(_channelSendDMA);
-        dma_channel_unclaim(_channelSendDMA);
-        _i2c->hw->dma_cr = 0;
-        // Need to convert from x16 to x8, strip off the status bits
-        for (auto i = 0; i < _dmaBytes; i++) {
-            _rxFinalBuffer[i] = _dmaBuffer[i] & 0xff;
-        }
-        free(_dmaBuffer);
-        _dmaBuffer = nullptr;
-        free(_dmaSendBuffer);
-        _dmaSendBuffer = nullptr;
-        _rxBegun = false;
-        return true;
-    }
-    return true;
+    return _dmaFinished;
 }
 
 void TwoWire::abortAsync() {
-    if (!_running || !_dmaBuffer) {
+    if (!_dmaRunning) {
         return;
     }
-    dma_channel_cleanup(_channelDMA);
-    dma_channel_unclaim(_channelDMA);
-    if (_rxBegun) {
-        dma_channel_cleanup(_channelSendDMA);
-        dma_channel_unclaim(_channelSendDMA);
+    if (!_dmaFinished) {
+        dma_channel_abort(_dmaChannelSend);
+        dma_channel_abort(_dmaChannelReceive);
+        _i2c->hw->dma_cr = 0;
     }
-    _i2c->hw->dma_cr = 0;
-    free(_dmaBuffer);
-    _dmaBuffer = nullptr;
-    free(_dmaSendBuffer);
-    _dmaSendBuffer = nullptr;
-    _rxBegun = false;
     _txBegun = false;
+    _dmaFinished = true;
 }
 
+void TwoWire::onFinishedAsync(void(*function)(void)) {
+    _dmaOnFinished = function;
+}
+
+// Dma irq mask and wire instance for low level dma completed handlers
+static uint32_t _dma_i2c0_irq_mask = 0;
+static uint32_t _dma_i2c1_irq_mask = 0;
+static TwoWire * _dma_i2c0_wire_instance = nullptr;
+static TwoWire * _dma_i2c1_wire_instance = nullptr;
+
+// Low level dma completed handlers, calls TwoWire::_dma_irq_handler() to do the work
+void _dma_i2c0_irq_handler() {
+    uint32_t status = dma_hw->ints0;
+    if (status & _dma_i2c0_irq_mask && _dma_i2c0_wire_instance) {
+        _dma_i2c0_wire_instance->_dma_irq_handler();
+    }
+    dma_hw->ints0 = (status & _dma_i2c0_irq_mask); //clear interrupt status
+}
+
+void _dma_i2c1_irq_handler() {
+    uint32_t status = dma_hw->ints0;
+    if (status & _dma_i2c1_irq_mask && _dma_i2c1_wire_instance) {
+        _dma_i2c1_wire_instance->_dma_irq_handler();
+    }
+    dma_hw->ints0 = (status & _dma_i2c1_irq_mask); //clear interrupt status
+}
+
+void TwoWire::_dma_irq_handler() {
+    _i2c->hw->dma_cr = 0;
+    _txBegun = false;
+    _dmaFinished = true;
+    // Disable the DMA IRQs
+    dma_channel_set_irq0_enabled(_dmaChannelSend, false);
+    dma_channel_set_irq0_enabled(_dmaChannelReceive, false);
+    // Call the user handler
+    if (_dmaOnFinished) {
+        _dmaOnFinished();
+    }
+}
+
+void TwoWire::beginAsync() {
+    if (_dmaRunning) {
+        return;
+    }
+
+    // Claim dma channels
+    _dmaChannelReceive = dma_claim_unused_channel(false);
+    if (_dmaChannelReceive == -1) {
+        return;
+    }
+    _dmaChannelSend = dma_claim_unused_channel(false);
+    if (_dmaChannelSend == -1) {
+        dma_channel_unclaim(_dmaChannelReceive);
+        return;
+    }
+
+    // Setup dma irq
+    if (i2c_hw_index(_i2c) == 0) {
+        _dma_i2c0_irq_mask = (1u << _dmaChannelReceive) | (1u << _dmaChannelSend);
+        _dma_i2c0_wire_instance = this;
+        irq_add_shared_handler(DMA_IRQ_0, _dma_i2c0_irq_handler, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
+    } else {
+        _dma_i2c1_irq_mask = (1u << _dmaChannelReceive) | (1u << _dmaChannelSend);
+        _dma_i2c1_wire_instance = this;
+        irq_add_shared_handler(DMA_IRQ_0, _dma_i2c1_irq_handler, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
+    }
+    irq_set_enabled(DMA_IRQ_0, true);
+
+    _dmaRunning = true;
+}
+
+void TwoWire::endAsync() {
+    if (!_dmaRunning) {
+        return;
+    }
+
+    if (i2c_hw_index(_i2c) == 0) {
+        _dma_i2c0_irq_mask = 0;
+        _dma_i2c0_wire_instance = nullptr;
+        irq_remove_handler(DMA_IRQ_0, _dma_i2c0_irq_handler);
+    } else {
+        _dma_i2c1_irq_mask = 0;
+        _dma_i2c1_wire_instance = nullptr;
+        irq_remove_handler(DMA_IRQ_0, _dma_i2c1_irq_handler);
+    }
+    if (_dmaChannelReceive >= 0) {
+        dma_channel_cleanup(_dmaChannelReceive);
+        dma_channel_unclaim(_dmaChannelReceive);
+        _dmaChannelReceive = -1;
+    }
+    if (_dmaChannelSend >= 0) {
+        dma_channel_cleanup(_dmaChannelSend);
+        dma_channel_unclaim(_dmaChannelSend);
+        _dmaChannelSend = -1;
+    }
+    _i2c->hw->dma_cr = 0;
+    free(_dmaSendBuffer);
+    _dmaSendBuffer = nullptr;
+    _dmaSendBufferLen = 0;
+    _txBegun = false;
+    _dmaFinished = true;
+    _dmaOnFinished = nullptr;
+    _dmaRunning = false;
+}
 
 void TwoWire::onReceive(void(*function)(int)) {
     _onReceiveCallback = function;

libraries/Wire/src/Wire.h

@@ -83,11 +83,14 @@ public:
     using Print::write;
 
     // DMA/asynchronous transfers.  Do not combime with synchronous runs or bad stuff will happen
-    // All buffers must be valid for entire DMA and not touched until `finished()` returns true.
-    bool writeAsync(uint8_t address, const void *buffer, size_t bytes, bool sendStop);
-    bool readAsync(uint8_t address, void *buffer, size_t bytes, bool sendStop);
+    // All buffers must be valid for entire DMA and not touched until `finishedAsync()` returns true.
+    bool writeReadAsync(uint8_t address, const void *wbuffer, size_t wbytes, const void *rbuffer, size_t rbytes, bool sendStop = true);
+    bool writeAsync(uint8_t address, const void *buffer, size_t bytes, bool sendStop = true);
+    bool readAsync(uint8_t address, void *buffer, size_t bytes, bool sendStop = true);
     bool finishedAsync(); // Call to check if the async operations is completed and the buffer can be reused/read
     void abortAsync(); // Cancel an outstanding async I2C operation
+    void onFinishedAsync(void(*function)(void)); // Set callback for async operation
+    void _dma_irq_handler(); // "private" method, made public to call this method from low level dma irq handler
 
     void setTimeout(uint32_t timeout = 25, bool reset_with_timeout = false);     // sets the maximum number of milliseconds to wait
     bool getTimeoutFlag(void);
@@ -125,13 +128,15 @@ private:
     static const uint32_t TWI_CLOCK = 100000;
 
     // DMA
-    bool _rxBegun = false;
-    int _channelDMA;
-    int _channelSendDMA;
-    uint16_t *_dmaBuffer = nullptr;
-    uint16_t *_dmaSendBuffer = nullptr;
-    int _dmaBytes;
-    uint8_t *_rxFinalBuffer;
+    bool _dmaRunning = false; // set to true after successful beginAsync() call
+    int _dmaChannelReceive = -1; // dma channel to receive i2c data
+    int _dmaChannelSend = -1; // dma channel to send i2c commands
+    uint16_t *_dmaSendBuffer = nullptr; // dma command send buffer (dynamically allocated)
+    size_t _dmaSendBufferLen = 0; // size of dma command buffer
+    volatile bool _dmaFinished = true; // signals dma completion
+    void (*_dmaOnFinished)(void) = nullptr; // user handler to call on dma completion
+    void beginAsync(); // setup dma channels and irq, called on first use of an async read/write function
+    void endAsync(); // close dma channels, irq, buffers, called from end()
 };
 
 extern TwoWire Wire;

package.json

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

package/build_boards_manager_package.sh

@@ -115,8 +115,6 @@ sed 's/^tools.picoprobe_cmsis_dap.cmd=.*//g' | \
 sed 's/^#tools.picoprobe_cmsis_dap.cmd=/tools.picoprobe_cmsis_dap.cmd=/g' | \
 sed 's/^tools.picotool.cmd=.*//g' | \
 sed 's/^#tools.picotool.cmd=/tools.picotool.cmd=/g' | \
-sed 's/^tools.picodebug.cmd=.*//g' | \
-sed 's/^#tools.picodebug.cmd=/tools.picodebug.cmd=/g' | \
 sed 's/^discovery.rp2040.pattern=.*//g' | \
 sed 's/^#discovery.rp2040.pattern=/discovery.rp2040.pattern=/g' | \
 sed 's/^pluggable_discovery.rp2040.pattern=.*//g' | \

package/package_pico_index.template.json

@@ -104,6 +104,9 @@
                   {
                      "name": "BridgeTek IDM2040-43A"
                   },
+                  {
+                     "name": "Cytron IRIV IO Controller"
+                  },
                   {
                      "name": "Cytron Maker Nano RP2040"
                   },
@@ -113,6 +116,9 @@
                   {
                      "name": "Cytron Maker Uno RP2040"
                   },
+                  {
+                     "name": "Cytron Motion 2350 Pro"
+                  },
                   {
                      "name": "DatanoiseTV PicoADK"
                   },
@@ -209,12 +215,21 @@
                   {
                      "name": "Pimoroni PGA2040"
                   },
+                  {
+                     "name": "Pimoroni PGA2350"
+                  },
+                  {
+                     "name": "Pimoroni PicoPlus2"
+                  },
                   {
                      "name": "Pimoroni Plasma2040"
                   },
                   {
                      "name": "Pimoroni Tiny2040"
                   },
+                  {
+                     "name": "Pimoroni Tiny2350"
+                  },
                   {
                      "name": "Pintronix PinMax"
                   },
@@ -322,7 +337,7 @@
                   },
                   {
                      "packager": "rp2040",
-                     "version": "2.2.0-d04e724",
+                     "version": "2.2.0-efe2103",
                      "name": "pqt-pioasm"
                   },
                   {
@@ -332,12 +347,12 @@
                   },
                   {
                      "packager": "rp2040",
-                     "version": "2.2.0-d04e724",
+                     "version": "2.2.0-8a9af99-2",
                      "name": "pqt-openocd"
                   },
                   {
                      "packager": "rp2040",
-                     "version": "2.2.0-d04e724",
+                     "version": "2.2.0-8a9af99-2",
                      "name": "pqt-picotool"
                   }
                ],
@@ -348,15 +363,15 @@
          ],
          "tools": [
             {
-               "version": "2.2.0-d04e724",
+               "version": "2.2.0-8a9af99-2",
                "name": "pqt-picotool",
                "systems": [
                   {
                      "host": "arm64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.picotool-8a9af99.240818.tar.gz",
-                     "archiveFileName": "aarch64-apple-darwin20.4.picotool-8a9af99.240818.tar.gz",
-                     "checksum": "SHA-256:5896d2e71c3a287a5c4d24e6fe8a3144e87bff1ff071d5a2095623f16da64dd7",
-                     "size": "851010"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.picotool-8a9af99.240827.tar.gz",
+                     "archiveFileName": "aarch64-apple-darwin20.4.picotool-8a9af99.240827.tar.gz",
+                     "checksum": "SHA-256:56495b3b5cd9b2b124c2ac9d9592d07a802c70a46b4453bbf890021475467ce7",
+                     "size": "856307"
                   },
                   {
                      "host": "aarch64-linux-gnu",
@@ -381,17 +396,17 @@
                   },
                   {
                      "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-w64-mingw32.picotool-8a9af99.240818.zip",
-                     "archiveFileName": "i686-w64-mingw32.picotool-8a9af99.240818.zip",
-                     "checksum": "SHA-256:a9e4d744a431ed4cca41752a5085f583afa3763be6877614061e7810433acb56",
-                     "size": "1884014"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-w64-mingw32.picotool-8a9af99.240827.zip",
+                     "archiveFileName": "i686-w64-mingw32.picotool-8a9af99.240827.zip",
+                     "checksum": "SHA-256:72519eed61cc01f211fc55d98751c09701a7323ba17b9c1b5d02d29de76c1777",
+                     "size": "1995431"
                   },
                   {
                      "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-apple-darwin20.4.picotool-8a9af99.240818.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin20.4.picotool-8a9af99.240818.tar.gz",
-                     "checksum": "SHA-256:2c780bf95fcd5b6a5fc27db70f87a058f4209770febe7435943d153cc811d853",
-                     "size": "826555"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-apple-darwin20.4.picotool-8a9af99.240827.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin20.4.picotool-8a9af99.240827.tar.gz",
+                     "checksum": "SHA-256:54d920cd1731d1f33a63d004b3f26170ff357bc620b5f3172329096d4b461e03",
+                     "size": "831575"
                   },
                   {
                      "host": "x86_64-pc-linux-gnu",
@@ -402,23 +417,23 @@
                   },
                   {
                      "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-w64-mingw32.picotool-8a9af99.240818.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.picotool-8a9af99.240818.zip",
-                     "checksum": "SHA-256:58e050af07a682805bec35a0f7a0df66d98c8e026126f469221326c11b7071aa",
-                     "size": "1774494"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-w64-mingw32.picotool-8a9af99.240827.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.picotool-8a9af99.240827.zip",
+                     "checksum": "SHA-256:5e77c4d624526b8c1afb930acf3e9efd9761176f75eb6f258a0d4b49beaa965c",
+                     "size": "1881720"
                   }
                ]
             },
             {
-               "version": "2.2.0-d04e724",
+               "version": "2.2.0-8a9af99-2",
                "name": "pqt-openocd",
                "systems": [
                   {
                      "host": "arm64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.openocd-ebec9504d.240818.tar.gz",
-                     "archiveFileName": "aarch64-apple-darwin20.4.openocd-ebec9504d.240818.tar.gz",
-                     "checksum": "SHA-256:7327a049b4abb6d944db31eebb72a71ca71beb999fa6cdc44e83fd1dabf253c8",
-                     "size": "1967271"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.openocd-ebec9504d.240827.tar.gz",
+                     "archiveFileName": "aarch64-apple-darwin20.4.openocd-ebec9504d.240827.tar.gz",
+                     "checksum": "SHA-256:7abbab14197005e9ae5f0a497fcefea420b8cf22f8be6d118f8549787f10c3ce",
+                     "size": "1974865"
                   },
                   {
                      "host": "aarch64-linux-gnu",
@@ -443,17 +458,17 @@
                   },
                   {
                      "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-w64-mingw32.openocd-ebec9504d.240818.zip",
-                     "archiveFileName": "i686-w64-mingw32.openocd-ebec9504d.240818.zip",
-                     "checksum": "SHA-256:a103dbecfdaca5a6e582f832bd3a017769f14774f78a30e83097fe78987e8be8",
-                     "size": "3577537"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-w64-mingw32.openocd-ebec9504d.240827.zip",
+                     "archiveFileName": "i686-w64-mingw32.openocd-ebec9504d.240827.zip",
+                     "checksum": "SHA-256:c5755e4e7fc008ac8486e9aa085a1e0b486732b70dcd37f9b2953104a0881541",
+                     "size": "3577865"
                   },
                   {
                      "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-apple-darwin20.4.openocd-ebec9504d.240818.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin20.4.openocd-ebec9504d.240818.tar.gz",
-                     "checksum": "SHA-256:2be716a12ca7ea0c036e2a10f89c191426f7e1c71a9cca78fbb3f8911b1df35d",
-                     "size": "3165595"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-apple-darwin20.4.openocd-ebec9504d.240827.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin20.4.openocd-ebec9504d.240827.tar.gz",
+                     "checksum": "SHA-256:2382f02b6171268c87409d998f8e9a844a70b9a5d6a40690bdaa8301fda8fbd4",
+                     "size": "3192645"
                   },
                   {
                      "host": "x86_64-pc-linux-gnu",
@@ -464,10 +479,10 @@
                   },
                   {
                      "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-w64-mingw32.openocd-ebec9504d.240818.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.openocd-ebec9504d.240818.zip",
-                     "checksum": "SHA-256:782d0e955990a03380fa681deaf4a5faf406f4a3fddecb27f71bd2be060d904d",
-                     "size": "3456434"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-w64-mingw32.openocd-ebec9504d.240827.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.openocd-ebec9504d.240827.zip",
+                     "checksum": "SHA-256:ceaa6aa57be394e853470337d0fa76af3b8f744b3ea7dd45b8325fff4bd824a9",
+                     "size": "3456764"
                   }
                ]
             },
@@ -603,64 +618,64 @@
                ]
             },
             {
-               "version": "2.2.0-d04e724",
+               "version": "2.2.0-efe2103",
                "name": "pqt-pioasm",
                "systems": [
                   {
                      "host": "arm64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.pioasm-6a7db34.240127.tar.gz",
-                     "archiveFileName": "aarch64-apple-darwin20.4.pioasm-6a7db34.240127.tar.gz",
-                     "checksum": "SHA-256:b325fdf8c2e7712e821049c68fc29dfac80bc492fb03c0fb3597de272ff42deb",
-                     "size": "246217"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-apple-darwin20.4.pioasm-efe2103.240818.tar.gz",
+                     "archiveFileName": "aarch64-apple-darwin20.4.pioasm-efe2103.240818.tar.gz",
+                     "checksum": "SHA-256:18524d6e5960c3e82dfbfd23686caf1ef36a665a2e29ee11fef0d3848a78707b",
+                     "size": "267870"
                   },
                   {
                      "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-linux-gnu.pioasm-6a7db34.240125.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.pioasm-6a7db34.240125.tar.gz",
-                     "checksum": "SHA-256:fb9faf961945bd2f0773feeb760750f38028740c34b279ea85904377f16d5a55",
-                     "size": "456608"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/aarch64-linux-gnu.pioasm-efe2103.240818.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.pioasm-efe2103.240818.tar.gz",
+                     "checksum": "SHA-256:0687769c3b5e528b6ba74d522410d0dd65a3ebef1f9f90cf0cd067c1bc8234dc",
+                     "size": "644211"
                   },
                   {
                      "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/arm-linux-gnueabihf.pioasm-6a7db34.240125.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.pioasm-6a7db34.240125.tar.gz",
-                     "checksum": "SHA-256:14bcd7305a2542b807eb9d3e31c043a7465dea170a928c8dc5a651476d8b9a14",
-                     "size": "379178"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/arm-linux-gnueabihf.pioasm-efe2103.240818.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.pioasm-efe2103.240818.tar.gz",
+                     "checksum": "SHA-256:414f43667ec91f93e03cb498172de9b0e5bd188c7f4f2dd4963a0052e4e47675",
+                     "size": "576898"
                   },
                   {
                      "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-linux-gnu.pioasm-6a7db34.240125.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.pioasm-6a7db34.240125.tar.gz",
-                     "checksum": "SHA-256:2822abdfb3226c9cfa6bd7e58cbd9f0699cc9fe8ec319bb7adceb31c209095d2",
-                     "size": "530142"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-linux-gnu.pioasm-efe2103.240818.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.pioasm-efe2103.240818.tar.gz",
+                     "checksum": "SHA-256:e8c778c799f525474e981b185e4e13176f7b306bb93dd6799c3e540665d8f6ac",
+                     "size": "703366"
                   },
                   {
                      "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-w64-mingw32.pioasm-6a7db34.240125.zip",
-                     "archiveFileName": "i686-w64-mingw32.pioasm-6a7db34.240125.zip",
-                     "checksum": "SHA-256:a1f8f36ef039c3081d80d874949d243282889f81868ca626389b7d0c2ffef40a",
-                     "size": "404747"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/i686-w64-mingw32.pioasm-efe2103.240818.zip",
+                     "archiveFileName": "i686-w64-mingw32.pioasm-efe2103.240818.zip",
+                     "checksum": "SHA-256:5e88b20ec966fa0e5d8af71d1ef1e8e6db55bf8bca922589de9203d638815d1d",
+                     "size": "797523"
                   },
                   {
                      "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-apple-darwin20.4.pioasm-6a7db34.240125.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin20.4.pioasm-6a7db34.240125.tar.gz",
-                     "checksum": "SHA-256:4c54204a7d5312825d6609cc326d4b4072728f8446ead346bae1c319256d7abe",
-                     "size": "650257"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-apple-darwin20.4.pioasm-efe2103.240818.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin20.4.pioasm-efe2103.240818.tar.gz",
+                     "checksum": "SHA-256:7bdc0d97f796000ed6d4b62d3fcbb73c4839ef3653d83f6cc33a087daf8a115a",
+                     "size": "780426"
                   },
                   {
                      "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-linux-gnu.pioasm-6a7db34.240125.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.pioasm-6a7db34.240125.tar.gz",
-                     "checksum": "SHA-256:13db79fd0992a0aa8c6a78684fcf6538d77eb645758ccc5dc16b148d452ad796",
-                     "size": "477990"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-linux-gnu.pioasm-efe2103.240818.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.pioasm-efe2103.240818.tar.gz",
+                     "checksum": "SHA-256:96736ee95e8a97acbfe0ff3476838cd25a2ca217d982a39cb4bc34acb9ec83b1",
+                     "size": "649753"
                   },
                   {
                      "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-w64-mingw32.pioasm-6a7db34.240125.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.pioasm-6a7db34.240125.zip",
-                     "checksum": "SHA-256:71eee9c820774328cbd5d082a032fb960587af6a7568b2502ee75ebc6fe6c9a2",
-                     "size": "429999"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/2.2.0/x86_64-w64-mingw32.pioasm-efe2103.240818.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.pioasm-efe2103.240818.zip",
+                     "checksum": "SHA-256:1bb59e542650e3873cd2e1a7911e671944f4f7e523e4f5f2e2988dd1ccbfeb87",
+                     "size": "929507"
                   }
                ]
             },

platform.txt

@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Raspberry Pi RP2040/RP2350 Boards
-version=4.0.0
+version=4.0.2
 
 # Required discoveries and monitors
 # ---------------------------------
@@ -49,7 +49,8 @@ compiler.warning_flags.more=-Wall -Werror=return-type -Wno-ignored-qualifiers -W
 compiler.warning_flags.all=-Wall -Wextra -Werror=return-type -Wno-ignored-qualifiers -Wno-psabi -Wno-unused-parameter -Wno-missing-field-initializers
 
 compiler.netdefines={build.libpicowdefs} -DLWIP_IGMP=1 -DLWIP_CHECKSUM_CTRL_PER_NETIF=1
-compiler.defines={build.led} {build.usbstack_flags} {build.usbpid} {build.usbvid} {build.usbpwr} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {compiler.netdefines} -DARDUINO_VARIANT="{build.variant}" -DPICO_FLASH_SIZE_BYTES={build.flash_total} "@{runtime.platform.path}/lib/{build.chip}/platform_def.txt"
+compiler.psramdefines={build.psram_cs} {build.psram_freq}
+compiler.defines={build.led} {build.usbstack_flags} {build.usbpid} {build.usbvid} {build.usbpwr} {compiler.psramdefines} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {compiler.netdefines} {build.variantdefines} -DARDUINO_VARIANT="{build.variant}" -DPICO_FLASH_SIZE_BYTES={build.flash_total} "@{runtime.platform.path}/lib/{build.chip}/platform_def.txt"
 compiler.includes="-iprefix{runtime.platform.path}/" "@{runtime.platform.path}/lib/{build.chip}/platform_inc.txt" "@{runtime.platform.path}/lib/core_inc.txt" "-I{runtime.platform.path}/include"
 compiler.flags={build.toolchainopts} -ffunction-sections -fdata-sections {build.flags.exceptions} {build.flags.stackprotect} {build.picodebugflags}
 compiler.wrap="@{runtime.platform.path}/lib/{build.chip}/platform_wrap.txt" "@{runtime.platform.path}/lib/core_wrap.txt"
@@ -91,6 +92,8 @@ compiler.elf2hex.extra_flags=
 build.flash_total=
 build.flash_length=
 build.psram_length=0
+build.psram_cs=
+build.psram_freq=
 build.eeprom_start=
 build.flags.optimize=-Os
 build.flags.rtti=-fno-rtti
@@ -101,12 +104,13 @@ build.flags.libstdcpp=-lstdc++
 build.flags.exceptions=-fno-exceptions
 build.flags.stackprotect=
 build.libpico=libpico.a
-build.libpicow=libpipv4.a
+build.libpicow=libipv4.a
 build.boot2=boot2_generic_03h_4_padded_checksum
 build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_IPV4=1
 build.wificc=-DWIFICC=CYW43_COUNTRY_WORLDWIDE
 build.debugscript=picoprobe_cmsis_dap.tcl
 build.picodebugflags=
+build.variantdefines=
 
 # Allow Pico boards do be auto-discovered by the IDE
 #discovery.rp2040.pattern={runtime.tools.pqt-python3.path}/python3 -I "{runtime.platform.path}/tools/pluggable_discovery.py"
@@ -210,10 +214,3 @@ tools.picoprobe_cmsis_dap.upload.protocol=picoprobe_cmsis_dap
 tools.picoprobe_cmsis_dap.upload.params.verbose=
 tools.picoprobe_cmsis_dap.upload.params.quiet=
 tools.picoprobe_cmsis_dap.upload.pattern="{cmd}/bin/openocd" -f "interface/cmsis-dap.cfg" -f "target/{build.chip}.cfg" -s "{cmd}/share/openocd/scripts" -c "init; adapter speed 5000; program {{build.path}/{build.project_name}.elf} verify; reset; exit"
-
-#tools.picodebug.cmd={runtime.tools.pqt-openocd.path}
-tools.picodebug.cmd={runtime.platform.path}/system/openocd
-tools.picodebug.upload.protocol=pico-debug
-tools.picodebug.upload.params.verbose=
-tools.picodebug.upload.params.quiet=
-tools.picodebug.upload.pattern="{cmd}/bin/openocd" -f "board/pico-debug.cfg" -s "{cmd}/share/openocd/scripts" -c "program {{build.path}/{build.project_name}.elf} verify reset exit"

tests/common.sh

@@ -112,7 +112,10 @@ function build_sketches()
             mv $build_dir/build.options.json.tmp $build_dir/build.options.json
             # Set the time of the cached core.a file to the future so the GIT header
             # we regen won't cause the builder to throw it out and rebuild from scratch.
-            touch -d 'now + 1 day' $cache_dir/core/*.a
+            uname -a | grep -qi darwin
+            if [ $? == 1 ]; then
+                touch -d 'now + 1 day' $cache_dir/core/*.a
+            fi
         fi
 
         # Clear out the last built sketch, map, elf, bin files, but leave the compiled

tools/json/0xcb_helios.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q128jvxq_4_padded_checksum.S",
-        "usb_vid": "0x1209",
-        "usb_pid": "0xCB74"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q128jvxq_4_padded_checksum.S",
+                "usb_vid": "0x1209",
+                "usb_pid": "0xCB74"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_0XCB_HELIOS -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x1209",
+                "0xCB74"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "0xcb_helios"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_0XCB_HELIOS -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x1209",
-        "0xCB74"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "0xcb_helios"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Helios",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 16777216,
-    "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": "0xCB"
-}
+    "name": "Helios",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 16777216,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "0xCB"
+}

tools/json/DudesCab.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2E8A",
-        "usb_pid": "0x106F"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x106F"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_RASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x106F"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "DudesCab"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_RASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2E8A",
-        "0x106F"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "DudesCab"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "DudesCab",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 4194304,
-    "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": "L'atelier d'Arnoz"
-}
+    "name": "DudesCab",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 4194304,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "L'atelier d'Arnoz"
+}

tools/json/adafruit_feather.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x80F1"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x80F1"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_FEATHER_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x80F1"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_feather"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x80F1"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_feather"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Feather RP2040",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Feather RP2040",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_adalogger.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x815D"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x815D"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_FEATHER_RP2040_ADALOGGER -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x815D"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_feather_adalogger"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_ADALOGGER -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x815D"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_feather_adalogger"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Feather RP2040 Adalogger",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Feather RP2040 Adalogger",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_can.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x812F"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x812F"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_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"
     },
-    "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"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "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": 262144,
-    "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"
-}
+    "name": "Feather RP2040 CAN",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_dvi.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x8127"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x8127"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_FEATHER_RP2040_DVI -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x8127"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_feather_dvi"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_DVI -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x8127"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_feather_dvi"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Feather RP2040 DVI",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Feather RP2040 DVI",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_prop_maker.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x8131"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x8131"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_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"
     },
-    "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"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "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": 262144,
-    "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"
-}
+    "name": "Feather RP2040 Prop-Maker",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_rfm.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x812D"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x812D"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_FEATHER_RP2040_RFM -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x812D"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_feather_rfm"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_RFM -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x812D"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_feather_rfm"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Feather RP2040 RFM",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Feather RP2040 RFM",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_scorpio.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x8121"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x8121"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_FEATHER_RP2040_SCORPIO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x8121"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_feather_scorpio"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_SCORPIO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x8121"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_feather_scorpio"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Feather RP2040 SCORPIO",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Feather RP2040 SCORPIO",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_thinkink.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x812B"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x812B"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_FEATHER_RP2040_THINKINK -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x812B"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_feather_thinkink"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_THINKINK -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x812B"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_feather_thinkink"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Feather RP2040 ThinkINK",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Feather RP2040 ThinkINK",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_feather_usb_host.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x8129"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x8129"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_FEATHER_RP2040_USB_HOST -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x8129"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_feather_usb_host"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_USB_HOST -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x8129"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_feather_usb_host"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Feather RP2040 USB Host",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Feather RP2040 USB Host",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_itsybitsy.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x80FD"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x80FD"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_ITSYBITSY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x80FD"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_itsybitsy"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_ITSYBITSY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x80FD"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_itsybitsy"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "ItsyBitsy RP2040",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "ItsyBitsy RP2040",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_kb2040.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x8105"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x8105"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_KB2040_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x8105"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_kb2040"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_KB2040_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x8105"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_kb2040"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "KB2040",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "KB2040",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_macropad2040.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x8107"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x8107"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_MACROPAD_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x8107"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_macropad2040"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_MACROPAD_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x8107"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_macropad2040"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "MacroPad RP2040",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "MacroPad RP2040",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_metro.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x813D"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x813D"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_METRO_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x813D"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_metro"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_METRO_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x813D"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_metro"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Metro RP2040",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 16777216,
-    "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"
-}
+    "name": "Metro RP2040",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 16777216,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_qtpy.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x80F7"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x80F7"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_QTPY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x80F7"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_qtpy"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_QTPY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x80F7"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_qtpy"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "QT Py RP2040",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "QT Py RP2040",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_stemmafriend.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x80E3"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x80E3"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_STEMMAFRIEND_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x80E3"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_stemmafriend"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_STEMMAFRIEND_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x80E3"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_stemmafriend"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "STEMMA Friend RP2040",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "STEMMA Friend RP2040",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/adafruit_trinkeyrp2040qt.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239A",
-        "usb_pid": "0x8109"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x239A",
+                "usb_pid": "0x8109"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ADAFRUIT_TRINKEYQT_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x239A",
+                "0x8109"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "adafruit_trinkeyrp2040qt"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ADAFRUIT_TRINKEYQT_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x239A",
-        "0x8109"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "adafruit_trinkeyrp2040qt"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Trinkey RP2040 QT",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "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"
-}
+    "name": "Trinkey RP2040 QT",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Adafruit"
+}

tools/json/akana_r1.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x2E8A",
-        "usb_pid": "0x3001"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x3001"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_METEHOCA_AKANA_R1 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x3001"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "akana_r1"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_METEHOCA_AKANA_R1 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2E8A",
-        "0x3001"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "akana_r1"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Akana R1",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 16777216,
-    "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.metehoca.com/",
-  "vendor": "METE HOCA"
-}
+    "name": "Akana R1",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 16777216,
+        "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"
+        ]
+    },
+    "url": "https://www.metehoca.com/",
+    "vendor": "METE HOCA"
+}

tools/json/amken_bunny.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q128jvxq_4_padded_checksum.S",
-        "usb_vid": "0x2770",
-        "usb_pid": "0x7303"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q128jvxq_4_padded_checksum.S",
+                "usb_vid": "0x2770",
+                "usb_pid": "0x7303"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_AMKEN_BB -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2770",
+                "0x7303"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "amken_bunny"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_AMKEN_BB -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2770",
-        "0x7303"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "amken_bunny"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "BunnyBoard",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 134217728,
-    "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.amken3d.com",
-  "vendor": "Amken"
-}
+    "name": "BunnyBoard",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 134217728,
+        "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"
+        ]
+    },
+    "url": "https://www.amken3d.com",
+    "vendor": "Amken"
+}

tools/json/amken_revelop.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_W25Q32JVxQ_4_padded_checksum.S",
-        "usb_vid": "0x2770",
-        "usb_pid": "0x7304"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_W25Q32JVxQ_4_padded_checksum.S",
+                "usb_vid": "0x2770",
+                "usb_pid": "0x7304"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_AMKEN_REVELOP -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2770",
+                "0x7304"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "amken_revelop"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_AMKEN_REVELOP -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2770",
-        "0x7304"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "amken_revelop"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Revelop",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 33554432,
-    "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.amken3d.com",
-  "vendor": "Amken"
-}
+    "name": "Revelop",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 33554432,
+        "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"
+        ]
+    },
+    "url": "https://www.amken3d.com",
+    "vendor": "Amken"
+}

tools/json/amken_revelop_es.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q16jvxq_4_padded_checksum.S",
-        "usb_vid": "0x2770",
-        "usb_pid": "0x7306"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q16jvxq_4_padded_checksum.S",
+                "usb_vid": "0x2770",
+                "usb_pid": "0x7306"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_AMKEN_ES -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2770",
+                "0x7306"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "amken_revelop_es"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_AMKEN_ES -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2770",
-        "0x7306"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "amken_revelop_es"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Revelop eS",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 16777216,
-    "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.amken3d.com",
-  "vendor": "Amken"
-}
+    "name": "Revelop eS",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 16777216,
+        "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"
+        ]
+    },
+    "url": "https://www.amken3d.com",
+    "vendor": "Amken"
+}

tools/json/amken_revelop_plus.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_W25Q32JVxQ_4_padded_checksum.S",
-        "usb_vid": "0x2770",
-        "usb_pid": "0x7305"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_W25Q32JVxQ_4_padded_checksum.S",
+                "usb_vid": "0x2770",
+                "usb_pid": "0x7305"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_AMKEN_REVELOP_PLUS -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2770",
+                "0x7305"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "amken_revelop_plus"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_AMKEN_REVELOP_PLUS -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2770",
-        "0x7305"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "amken_revelop_plus"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Revelop Plus",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 33554432,
-    "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.amken3d.com",
-  "vendor": "Amken"
-}
+    "name": "Revelop Plus",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 33554432,
+        "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"
+        ]
+    },
+    "url": "https://www.amken3d.com",
+    "vendor": "Amken"
+}

tools/json/arduino_nano_connect.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2341",
-        "usb_pid": "0x005E"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x2341",
+                "usb_pid": "0x005E"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_NANO_RP2040_CONNECT -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2341",
+                "0x005E"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "arduino_nano_connect"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_NANO_RP2040_CONNECT -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2341",
-        "0x005E"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "arduino_nano_connect"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Nano RP2040 Connect",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 16777216,
-    "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": "Arduino"
-}
+    "name": "Nano RP2040 Connect",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 16777216,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Arduino"
+}

tools/json/artronshop_rp2_nano.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2E8A",
-        "usb_pid": "0x000A"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x000A"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_ARTRONSHOP_RP2_NANO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x000A"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "artronshop_rp2_nano"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_ARTRONSHOP_RP2_NANO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2E8A",
-        "0x000A"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "artronshop_rp2_nano"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "RP2 Nano",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 2097152,
-    "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": "ArtronShop"
-}
+    "name": "RP2 Nano",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 2097152,
+        "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"
+        ]
+    },
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "ArtronShop"
+}

tools/json/breadstick_raspberry.json

@@ -1,56 +1,55 @@
 {
-  "build": {
-    "arduino": {
-      "earlephilhower": {
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2E8A",
-        "usb_pid": "0x105E"
-      }
+    "build": {
+        "arduino": {
+            "earlephilhower": {
+                "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+                "usb_vid": "0x2E8A",
+                "usb_pid": "0x105E"
+            }
+        },
+        "core": "earlephilhower",
+        "cpu": "cortex-m0plus",
+        "extra_flags": "-DARDUINO_Breadstick_Raspberry -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500 ",
+        "f_cpu": "133000000L",
+        "hwids": [
+            [
+                "0x2E8A",
+                "0x00C0"
+            ],
+            [
+                "0x2E8A",
+                "0x105E"
+            ]
+        ],
+        "mcu": "rp2040",
+        "variant": "breadstick_raspberry"
     },
-    "core": "earlephilhower",
-    "cpu": "cortex-m0plus",
-    "extra_flags": "-D ARDUINO_Breadstick_Raspberry -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
-    "f_cpu": "133000000L",
-    "hwids": [
-      [
-        "0x2E8A",
-        "0x00C0"
-      ],
-      [
-        "0x2E8A",
-        "0x105E"
-      ]
+    "debug": {
+        "jlink_device": "RP2040_M0_0",
+        "openocd_target": "rp2040.cfg",
+        "svd_path": "rp2040.svd"
+    },
+    "frameworks": [
+        "arduino"
     ],
-    "mcu": "rp2040",
-    "variant": "breadstick_raspberry"
-  },
-  "debug": {
-    "jlink_device": "RP2040_M0_0",
-    "openocd_target": "rp2040.cfg",
-    "svd_path": "rp2040.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Raspberry",
-  "upload": {
-    "maximum_ram_size": 262144,
-    "maximum_size": 16777216,
-    "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://shop.breadstick.ca/products/raspberry-breadstick-rp2040",
-  "vendor": "Breadstick"
-}
+    "name": "Raspberry",
+    "upload": {
+        "maximum_ram_size": 262144,
+        "maximum_size": 16777216,
+        "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"
+        ]
+    },
+    "url": "https://shop.breadstick.ca/products/raspberry-breadstick-rp2040",
+    "vendor": "Breadstick"
+}