Update version

Return # of bytes written by SerialUSB::write (#662 )
Before always returned 0 on a ::write. Now properly return the count of bytes that were sent to the USB port. Thanks to Terry Haas for the report.
2022-06-28 15:07:55 -07:00 · 2022-06-28 13:01:06 -07:00 · 2022-06-26 15:26:23 -07:00 · 2022-06-26 13:24:55 -07:00 · 2022-06-25 10:00:29 -07:00 · 2022-06-24 11:25:21 -07:00
64 changed files with 1278 additions and 591 deletions
@@ -14,7 +14,7 @@ jobs:
    name: Check spelling
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        submodules: true
    - name: Run codespell
@@ -28,7 +28,7 @@ jobs:
    name: Style, Boards, Package
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        submodules: false
    - name: Check package references
@@ -59,7 +59,7 @@ jobs:
      matrix:
        chunk: [0, 1, 2, 3]
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        submodules: true
    - uses: actions/setup-python@v2
@@ -89,7 +89,7 @@ jobs:
    name: Build TinyUSB Examples
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        submodules: true
    - uses: actions/setup-python@v2
@@ -117,7 +117,7 @@ jobs:
    name: Windows
    runs-on: windows-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        submodules: true
    - uses: actions/setup-python@v2
@@ -152,7 +152,7 @@ jobs:
    name: Mac
    runs-on: macOS-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        submodules: true
    - uses: actions/setup-python@v2
@@ -178,3 +178,37 @@ jobs:
        cd ..
        bash ./tests/build.sh

+# Build a few examples with PlatformIO to test if integration works
+  build-platformio:
+    name: Build PlatformIO Examples
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: 'recursive'
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+    - name: Cache PlatformIO
+      uses: actions/cache@v2
+      with:
+        path: ~/.platformio
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+    - name: Set up Python
+      uses: actions/setup-python@v2
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio
+        pio pkg install --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
+        pio pkg install --global --tool symlink://.
+    - name: Build Multicore Example
+      run: pio ci --board=rpipico --board=adafruit_feather -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" libraries/rp2040/examples/Multicore/Multicore.ino
+    - name: Build Fade Example
+      run: pio ci --board=rpipico --board=adafruit_feather -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" libraries/rp2040/examples/Fade/Fade.ino
+    - name: Build TinyUSB Example
+      run: pio ci --board=rpipico --board=adafruit_feather -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" -O "build_flags=-DUSE_TINYUSB" libraries/Adafruit_TinyUSB_Arduino/examples/CDC/cdc_multi/cdc_multi.ino
@@ -12,16 +12,36 @@ jobs:
    - uses: actions/checkout@v2
      with:
        submodules: true
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+    - name: Cache PlatformIO
+      uses: actions/cache@v2
+      with:
+        path: ~/.platformio
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
    - uses: actions/setup-python@v2
      with:
        python-version: '3.x'
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio
    - name: Deploy updated JSON
      env:
        TRAVIS_BUILD_DIR: ${{ github.workspace }}
        BUILD_TYPE: package
        CI_GITHUB_API_KEY: ${{ secrets.GITHUB_TOKEN }}
+        PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }}
      run: |
           pip3 install PyGithub
           TAG=$(git describe --exact-match --tags)
           curl -L -o package_rp2040_index.json "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/$TAG/package_rp2040_index.json"
           ./package/update_release.py --token ${CI_GITHUB_API_KEY} --repo "$GITHUB_REPOSITORY" --tag global package_rp2040_index.json
+           # Upload to Platform.IO
+           curl -LO $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/$TAG/rp2040-$TAG.zip
+           pio package publish rp2040-$TAG.zip --non-interactive
@@ -144,6 +144,7 @@ The installed tools include a version of OpenOCD (in the pqt-openocd directory)
 * Generic Arduino USB Serial, Keyboard, and Mouse emulation
 * Filesystems (LittleFS and SD/SDFS)
 * Multicore support (setup1() and loop1())
+* FreeRTOS SMP support
 * Overclocking and underclocking from the menus
 * digitalWrite/Read, shiftIn/Out, tone, analogWrite(PWM)/Read, temperature
 * Peripherals:  SPI master, Wire(I2C) master/slave, dual UART, emulated EEPROM, I2S audio input, I2S audio output, Servo
@@ -130,7 +130,7 @@ static uint8_t *GetDescHIDReport(int *len) {
    return __hid_report;
 }

-static void __SetupDescHIDReport() {
+void __SetupDescHIDReport() {
    if (__USBInstallKeyboard && __USBInstallMouse) {
        uint8_t desc_hid_report[] = {
            TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(1)),
@@ -179,7 +179,7 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
    return usbd_desc_cfg;
 }

-static void __SetupUSBDescriptor() {
+void __SetupUSBDescriptor() {
    if (!usbd_desc_cfg) {
        bool hasHID = __USBInstallKeyboard || __USBInstallMouse;

@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 2
-#define ARDUINO_PICO_MINOR 1
-#define ARDUINO_PICO_REVISION 0
-#define ARDUINO_PICO_VERSION_STR "2.1.0"
+#define ARDUINO_PICO_MINOR 2
+#define ARDUINO_PICO_REVISION 2
+#define ARDUINO_PICO_VERSION_STR "2.2.2"
@@ -123,7 +123,7 @@ size_t SerialUSB::write(const uint8_t *buf, size_t length) {
    }

    static uint64_t last_avail_time;
-    int i = 0;
+    int written = 0;
    if (tud_cdc_connected()) {
        for (size_t i = 0; i < length;) {
            int n = length - i;
@@ -136,6 +136,7 @@ size_t SerialUSB::write(const uint8_t *buf, size_t length) {
                tud_task();
                tud_cdc_write_flush();
                i += n2;
+                written += n2;
                last_avail_time = time_us_64();
            } else {
                tud_task();
@@ -150,7 +151,7 @@ size_t SerialUSB::write(const uint8_t *buf, size_t length) {
        // reset our timeout
        last_avail_time = 0;
    }
-    return i;
+    return written;
 }

 SerialUSB::operator bool() {
@@ -0,0 +1,83 @@
+/*
+    Newlib retargetable lock class using RP2040 SDK
+
+    Overrides weak functions in Newlib for locking to safely support
+    multi-core operation.  Does not need any --wrap for memory allocators.
+
+    Copyright (c) 2022 Earle F. Philhower, III <earlephilhower@yahoo.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+
+#include <pico/mutex.h>
+#include <sys/lock.h>
+
+// HACK ALERT
+// Pico-SDK defines mutex which can be at global scope, but when the auto_init_
+// macros are used they are defined as static.  Newlib needs global access to
+// these mutextes, so instead of hacking pico-sdk just make "static" a no-op.
+
+#define static
+auto_init_recursive_mutex(__lock___sinit_recursive_mutex);
+auto_init_recursive_mutex(__lock___sfp_recursive_mutex);
+auto_init_recursive_mutex(__lock___atexit_recursive_mutex);
+auto_init_mutex(__lock___at_quick_exit_mutex);
+auto_init_recursive_mutex(__lock___malloc_recursive_mutex);
+auto_init_recursive_mutex(__lock___env_recursive_mutex);
+auto_init_mutex(__lock___tz_mutex);
+auto_init_mutex(__lock___dd_hash_mutex);
+auto_init_mutex(__lock___arc4random_mutex);
+#undef static
+
+void __retarget_lock_init(_LOCK_T *lock) {
+    mutex_init((mutex_t*) lock);
+}
+
+void __retarget_lock_init_recursive(_LOCK_T *lock) {
+    recursive_mutex_init((recursive_mutex_t*) lock);
+}
+
+void __retarget_lock_close(_LOCK_T lock) {
+    (void) lock;
+}
+
+void __retarget_lock_close_recursive(_LOCK_T lock) {
+    (void) lock;
+}
+
+void __retarget_lock_acquire(_LOCK_T lock) {
+    mutex_enter_blocking((mutex_t*)lock);
+}
+
+void __retarget_lock_acquire_recursive(_LOCK_T lock) {
+    recursive_mutex_enter_blocking((recursive_mutex_t*)lock);
+}
+
+int __retarget_lock_try_acquire(_LOCK_T lock) {
+    return mutex_try_enter((mutex_t *)lock, NULL);
+}
+
+int __retarget_lock_try_acquire_recursive(_LOCK_T lock) {
+    return recursive_mutex_try_enter((recursive_mutex_t*)lock, NULL);
+}
+
+void __retarget_lock_release(_LOCK_T lock) {
+    mutex_exit((mutex_t*)lock);
+}
+
+void __retarget_lock_release_recursive(_LOCK_T lock) {
+    recursive_mutex_exit((recursive_mutex_t*)lock);
+}
@@ -22,6 +22,7 @@
 #include "RP2040USB.h"
 #include <pico/stdlib.h>
 #include <pico/multicore.h>
+#include <reent.h>

 RP2040 rp2040;
 extern "C" {
@@ -72,6 +73,7 @@ extern void __loop() {
        arduino::serialEvent2Run();
    }
 }
+static struct _reent *_impure_ptr1 = nullptr;

 extern "C" int main() {
 #if F_CPU != 125000000
@@ -81,6 +83,12 @@ extern "C" int main() {
    // Let rest of core know if we're using FreeRTOS
    __isFreeRTOS = initFreeRTOS ? true : false;

+    // Allocate impure_ptr (newlib temps) if there is a 2nd core running
+    if (!__isFreeRTOS && (setup1 || loop1)) {
+        _impure_ptr1 = (struct _reent*)calloc(sizeof(struct _reent), 1);
+        _REENT_INIT_PTR(_impure_ptr1);
+    }
+
    mutex_init(&_pioMutex);

    rp2040.begin();
@@ -142,3 +150,21 @@ extern "C" int main() {
 extern "C" unsigned long ulMainGetRunTimeCounterValue() {
    return rp2040.getCycleCount64();
 }
+
+extern "C" void __register_impure_ptr(struct _reent *p) {
+    if (get_core_num() == 0) {
+        _impure_ptr = p;
+    } else {
+        _impure_ptr1 = p;
+    }
+}
+
+
+// TODO:  FreeRTOS should implement this based on thread ID (and each thread should have its own struct _reent
+extern "C" struct _reent *__wrap___getreent() {
+    if (get_core_num() == 0) {
+        return _impure_ptr;
+    } else {
+        return _impure_ptr1;
+    }
+}
@@ -13,6 +13,11 @@ int analogRead(pin_size_t pin = A0..A3)
 Returns a value from 0...4095 correspionding to the ADC reading
 of the specific pin.

+void analogReadResolution(int bits)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Determines the resolution (in bits) of the value returned by the analogRead() function.
+Default resolution is 10bit.
+
 float analogReadTemp()
 ~~~~~~~~~~~~~~~~~~~~~~
 Returns the temperature, in Celsius, of the onboard thermal sensor.
@@ -6,6 +6,14 @@ 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.

+Input Modes
+-----------
+The Raspberry Pi Pico has 3 Input modes settings for use with `pinMode`: `INPUT`, `INPUT_PULLUP` and `INPUT_PULLDOWN`
+
+Output Modes (Pad Strength)
+---------------------------
+The Raspberry Pi Pico has the ability to set the current that a pin (actually the pad associated with it) is capable of supplying. The current can be set to values of 2mA, 4mA, 8mA and 12mA. By default, on a reset, the setting is 4mA. A `pinMode(x, OUTPUT)`, where `x` is the pin number, is also the default setting. 4 settings have been added for use with `pinMode`: `OUTPUT_2MA`, `OUTPUT_4MA`, which has the same behavior as `OUTPUT`, `OUTPUT_8MA` and `OUTPUT_12MA`.
+
 Tone/noTone
 -----------
 Simple square wave tone generation is possible for up to 8 channels using
@@ -60,8 +60,3 @@ it use a non-default pinout with a simple call
        SPI.setCS(5);
        SD.begin(5);
    }
-
-Pad Strength
-============
-
-The Raspberry Pi Pico has the ability to set the current that a pin (actually the pad associated with it) is capable of supplying. The current can be set to values of 2mA, 4mA, 8mA and 12mA. By default, on a reset, the setting is 4mA. A `pinMode(x, OUTPUT)`, where `x` is the pin number, is also the default setting. 4 settings have been added for use with `pinMode`: `OUTPUT_2MA`, `OUTPUT_4MA`, which has the same behavior as `OUTPUT`, `OUTPUT_8MA` and `OUTPUT_12MA`.
@@ -19,14 +19,14 @@ The PlatformIO experience:

 Refer to the general documentation at https://docs.platformio.org/.

-Especially useful is the `Getting started with VSCode + PlatformIO <https://docs.platformio.org/en/latest/integration/ide/vscode.html#installation), [CLI reference](https://docs.platformio.org/en/latest/core/index.html) and [platformio.ini options](https://docs.platformio.org/en/latest/projectconf/index.html)>`__ page.
+Especially useful is the `Getting started with VSCode + PlatformIO <https://docs.platformio.org/en/latest/integration/ide/vscode.html#installation>`_, `CLI reference <https://docs.platformio.org/en/latest/core/index.html>`_ and the `platformio.ini options <https://docs.platformio.org/en/latest/projectconf/index.html>`_ page.

 Hereafter it is assumed that you have a basic understanding of PlatformIO in regards to project creation, project file structure and building and uploading PlatformIO projects, through reading the above pages.

 Current state of development
 ----------------------------

-At the time of writing, PlatformIO integration for this core is a work-in-progress and not yet merged into mainline PlatformIO. This is subject to change soon.
+At the time of writing, PlatformIO integration for this core is a work-in-progress and not yet merged into mainline PlatformIO. This is subject to change once `this pull request <https://github.com/platformio/platform-raspberrypi/pull/36>`_ is merged.

 If you want to use the PlatformIO integration right now, make sure you first create a standard Raspberry Pi Pico + Arduino project within PlatformIO. 
 This will give you a project with the ``platformio.ini`` 
@@ -38,8 +38,7 @@ This will give you a project with the ``platformio.ini``
    board = pico
    framework = arduino

-Here, you need to change the `platform` to take advantage of the features described hereunder. 
-You *also* need to inject two PlatformIO packages, one for the compiler toolchain and one for the Arduino core package.
+Here, you need to change the `platform` to take advantage of the features described hereunder and switch to the new core.

 .. code:: ini

@@ -47,12 +46,32 @@ You *also* need to inject two PlatformIO packages, one for the compiler toolchai
    platform = https://github.com/maxgerhardt/platform-raspberrypi.git
    board = pico
    framework = arduino
+    board_build.core = earlephilhower
+    
+When the support for this core has been merged into mainline PlatformIO, this notice will be removed and a standard `platformio.ini` as shown above will work as a base.
+
+Deprecation warnings
+---------------------
+
+Previous versions of this documentation told users to inject the framework and toolchain package into the project by using
+
+.. code:: ini
+
    ; note that download link for toolchain is specific for OS. see https://github.com/earlephilhower/pico-quick-toolchain/releases.
    platform_packages = 
        maxgerhardt/framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git
        maxgerhardt/toolchain-pico@https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-w64-mingw32.arm-none-eabi-7855b0c.210706.zip
-    
-When the support for this core has been merged into mainline PlatformIO, this notice will be removed and a standard `platformio.ini` as shown above will work as a base.
+
+This is now **deprecated** and should not be done anymore. Users should delete these ``platform_packages`` lines and update the platform integration by issuing the command
+
+.. code:: bash
+
+    pio pkg update -g -p https://github.com/maxgerhardt/platform-raspberrypi.git
+
+in the `PlatformIO CLI <https://docs.platformio.org/en/latest/integration/ide/vscode.html#platformio-core-cli>`_. The same can be achieved by using the VSCode PIO Home -> Platforms -> Updates GUI.
+
+The toolchain, which was also renamed to ``toolchain-rp2040-earlephilhower`` is downloaded automatically from the registry. The same goes for the ``framework-arduinopico`` toolchain package, which points directly to the Arduino-Pico Github repository.
+However, users can still select a custom fork or branch of the core if desired so, as detailed in a chapter below.

 Selecting the new core
 ----------------------
@@ -61,8 +80,8 @@ Prerequisite for using this core is to tell PlatformIO to switch to it.
 There will be board definition files where the Earle-Philhower core will
 be the default since it's a board that only exists in this core (and not
 the other https://github.com/arduino/ArduinoCore-mbed). To switch boards
-for which this is not the default core (e.g. the standard
-``board = pico``), the directive
+for which this is not the default core (which are only
+``board = pico`` and ``board = nanorp2040connect``), the directive

 .. code:: ini

@@ -72,6 +91,8 @@ must be added to the ``platformio.ini``. This controls the `core
 switching
 logic <https://github.com/maxgerhardt/platform-raspberrypi/blob/77e0d3a29d1dbf00fd3ec3271104e3bf4820869c/builder/frameworks/arduino/arduino.py#L27-L32>`__.

+When using Arduino-Pico-only boards like ``board = rpipico`` or ``board = adafruit_feather``, this is not needed.
+
 Flash size
 ----------

@@ -154,6 +175,37 @@ either a sing line or a newline-separated expression.
       -DDEBUG_RP2040_CORE
       -DDEBUG_RP2040_PORT=Serial2

+C++ Exceptions
+--------------
+
+Exceptions are disabled by default. To enable them, use
+
+.. code:: ini
+
+    ; Enable Exceptions
+    build_flags = -DPIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
+
+Stack Protector
+---------------
+
+To enable GCC's stack protection feature, use
+
+.. code:: ini
+
+    ; Enable Stack Protector
+    build_flags = -fstack-protector
+
+
+RTTI
+----
+
+RTTI (run-time type information) is disabled by default. To enable it, use
+
+.. code:: ini
+
+    ; Enable RTTI
+    build_flags = -DPIO_FRAMEWORK_ARDUINO_ENABLE_RTTI
+
 USB Stack
 ---------

@@ -188,8 +240,8 @@ directive to do so. Simply specify that the framework package
 Whereas the ``#master`` can also be replaced by a ``#branchname`` or a
 ``#commithash``. If left out, it will pull the default branch, which is ``master``.

-The ``file://`` pseudo-protocol can also be used instead of ``https://`` to point to a
-local copy of the core (with e.g. some modifications) on disk.
+The ``file://`` and ``symlink://`` pseudo-protocols can also be used instead of ``https://`` to point to a
+local copy of the core (with e.g. some modifications) on disk (`see documentation <https://docs.platformio.org/en/latest/core/userguide/pkg/cmd_install.html?#local-folder>`_).

 Note that this can only be done for versions that have the PlatformIO
 builder script it in, so versions before 1.9.2 are not supported.
@@ -206,14 +258,48 @@ and 0.5MByte filesystem.
    platform = https://github.com/maxgerhardt/platform-raspberrypi.git
    board = pico
    framework = arduino
+    ; board can use both Arduino cores -- we select Arduino-Pico here
    board_build.core = earlephilhower
    board_build.filesystem_size = 0.5m
-    ; note that download link for toolchain is specific for OS. see https://github.com/earlephilhower/pico-quick-toolchain/releases.
-    platform_packages = 
-        maxgerhardt/framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git
-        maxgerhardt/toolchain-pico@https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-w64-mingw32.arm-none-eabi-7855b0c.210706.zip


 The initial project structure should be generated just creating a new
 project for the Pico and the Arduino framework, after which the
 auto-generated ``platformio.ini`` can be adapted per above.
+
+Debugging
+---------
+
+With recent updates to the toolchain and OpenOCD, debugging firmwares is also possible.
+
+To specify the debugging adapter, use ``debug_tool`` (`documentation <https://docs.platformio.org/en/latest/projectconf/section_env_debug.html#debug-tool>`_). Supported values are:
+
+* ``picoprobe``
+* ``cmsis-dap``
+* ``jlink``
+* ``raspberrypi-swd``
+
+These values can also be used in ``upload_protocol`` if you want PlatformIO to upload the regular firmware through this method, which you likely want.
+
+Especially the PicoProbe method is convenient when you have two Raspberry Pi Pico boards. One of them can be flashed with the PicoProbe firmware (`documentation <https://www.raspberrypi.com/documentation/microcontrollers/raspberry-pi-pico.html#debugging-using-another-raspberry-pi-pico>`_) and is then connected to the target Raspberry Pi Pico board (see `documentation <https://datasheets.raspberrypi.com/pico/getting-started-with-pico.pdf>`_ chapter "Picoprobe Wiring"). Remember that on Windows, you have to use `Zadig <https://zadig.akeo.ie/>`_ to also load "WinUSB" drivers for the "Picoprobe (Interface 2)" device so that OpenOCD can speak to it.
+
+With that set up, debugging can be started via the left debugging sidebar and works nicely: Setup breakpoints, inspect the value of variables in the code, step through the code line by line. When a breakpoint is hit or execution is halted, you can even see the execution state both Cortex-M0+ cores of the RP2040.
+
+.. image:: images/pio_debugging.png
+
+For further information on customizing debug options, like the initial breakpoint or debugging / SWD speed, consult `the documentation <https://docs.platformio.org/en/latest/projectconf/section_env_debug.html>`_.
+
+Filesystem Uploading
+--------------------
+
+For the Arduino IDE, `a plugin <https://github.com/earlephilhower/arduino-pico#uploading-filesystem-images>`_ is available that enables a data folder to be packed as a LittleFS filesystem binary and uploaded to the Pico.
+
+This functionality is also built-in in the PlatformIO integration. Open the `project tasks <https://docs.platformio.org/en/latest/integration/ide/vscode.html#project-tasks>`_ and expand the "Platform" tasks: 
+
+.. image:: images/pio_fs_upload.png
+
+The files you want to upload should be placed in a folder called ``data`` inside the project. This can be customized `if needed <https://docs.platformio.org/en/latest/projectconf/section_platformio.html#data-dir>`_.
+
+The task "Build Filesystem Image" will take all files in the data directory and create a ``littlefs.bin`` file from it using the ``mklittlefs`` tool.
+
+The task "Upload Filesystem Image" will upload the filesystem image to the Pico via the specified ``upload_protocol``. 
@@ -46,3 +46,61 @@ Also, this stack requires sketches to manually call
 sketch upload from the IDE.  If a sketch is run without this command
 in ``setup()``, the user will need to use the standard "hold BOOTSEL
 and plug in USB" method to enter program upload mode.
+
+Adafruit TinyUSB Configuration and Quirks
+-----------------------------------------
+
+The Adafruit TinyUSB's configuration header for RP2040 devices is stored
+in ``libraries/Adafruit_TinyUSB_Arduino/src/arduino/ports/rp2040/tusb_config_rp2040.h`` (`here <https://github.com/adafruit/Adafruit_TinyUSB_Arduino/blob/master/src/arduino/ports/rp2040/tusb_config_rp2040.h>`__).
+
+In some cases it is important to know what TinyUSB is configured with. For example, by having set 
+
+.. code:: cpp
+
+    #define CFG_TUD_CDC 1
+    #define CFG_TUD_MSC 1
+    #define CFG_TUD_HID 1
+    #define CFG_TUD_MIDI 1
+    #define CFG_TUD_VENDOR 1
+
+this configuration file defines the maximum number of USB CDC (serial)
+devices as 1. Hence, the example sketch `cdc_multi.ino <https://github.com/adafruit/Adafruit_TinyUSB_Arduino/blob/master/examples/CDC/cdc_multi/cdc_multi.ino>`__
+that is delivered with the library will not work, it will only create one
+USB CDC device instead of two. It will however work when the above
+``CFG_TUD_CDC`` macro is defined to 2 instead of 1.
+
+To do such a modification when using the Arduino IDE, the file can be
+locally modified in the Arduino core's package files. The base path can
+be found per `this article <https://support.arduino.cc/hc/en-us/articles/360018448279-Open-the-Arduino15-folder>`__,
+then navigate further to the ``packages/rp2040/hardware/rp2040/<core version>/libraries/Adafruit_TinyUSB_Arduino``
+folder to find the Adafruit TinyUSB library.
+
+When using PlatformIO, one can also make use of the feature that TinyUSB
+allows redirecting the configuration file to another one if a certain
+macro is set.
+
+.. code:: cpp
+
+    #ifdef CFG_TUSB_CONFIG_FILE
+        #include CFG_TUSB_CONFIG_FILE
+    #else
+        #include "tusb_config.h"
+    #endif
+
+And as such, in the ``platformio.ini`` of the project, one can add
+
+.. code:: ini
+
+    build_flags =
+      -DUSE_TINYUSB 
+      -DCFG_TUSB_CONFIG_FILE=\"custom_tusb_config.h\"
+      -Iinclude/ 
+
+and further add create the file ``include/custom_tusb_config.h`` as a copy
+of the original ``tusb_config_rp2040.h`` but with the needed modifications.
+
+*Note:* Some configuration file changes have no effect because upper levels
+of the library don't properly support them. In particular, even though the
+maximum number of HID devices can be set to 2, and two ``Adafruit_USBD_HID``
+can be created, it will not cause two HID devices to actually show up, because
+of `code limitations <https://github.com/adafruit/Adafruit_TinyUSB_Arduino/blob/7264c1492a73d9a285512752b03f2550841c06bc/src/arduino/hid/Adafruit_USBD_HID.cpp#L36-L37>`__.
@@ -13,7 +13,7 @@

 #define PICO_SDK_VERSION_MAJOR    1
 #define PICO_SDK_VERSION_MINOR    3
-#define PICO_SDK_VERSION_REVISION 1
-#define PICO_SDK_VERSION_STRING   "1.3.1"
+#define PICO_SDK_VERSION_REVISION 2
+#define PICO_SDK_VERSION_STRING   "1.3.2-develop"

 #endif
@@ -71,7 +71,6 @@
 -Wl,--wrap=atanf
 -Wl,--wrap=atanh
 -Wl,--wrap=atanhf
-Wl,--wrap=calloc
 -Wl,--wrap=cbrt
 -Wl,--wrap=cbrtf
 -Wl,--wrap=ceil
@@ -105,7 +104,6 @@
 -Wl,--wrap=fmaf
 -Wl,--wrap=fmod
 -Wl,--wrap=fmodf
-Wl,--wrap=free
 -Wl,--wrap=hypot
 -Wl,--wrap=hypotf
 -Wl,--wrap=ldexp
@@ -118,7 +116,6 @@
 -Wl,--wrap=log2
 -Wl,--wrap=log2f
 -Wl,--wrap=logf
-Wl,--wrap=malloc
 -Wl,--wrap=memcpy
 -Wl,--wrap=memset
 -Wl,--wrap=__popcountdi2
@@ -127,7 +124,6 @@
 -Wl,--wrap=powf
 -Wl,--wrap=powint
 -Wl,--wrap=powintf
-Wl,--wrap=realloc
 -Wl,--wrap=remainder
 -Wl,--wrap=remainderf
 -Wl,--wrap=remquo
@@ -148,3 +144,4 @@
 -Wl,--wrap=tanhf
 -Wl,--wrap=trunc
 -Wl,--wrap=truncf
+-Wl,--wrap=__getreent
@@ -27,6 +27,12 @@
 #define configSUPPORT_STATIC_ALLOCATION 0
 #define configSTACK_DEPTH_TYPE			uint32_t

+#define configUSE_NEWLIB_REENTRANT 1
+#define configNEWLIB_REENTRANT_IS_DYNAMIC 0 /* Note that we have a different config option, portSET_IMPURE_PTR */
+#include <reent.h>
+extern void __register_impure_ptr(struct _reent *p);
+#define portSET_IMPURE_PTR(x) __register_impure_ptr(x)
+
 /* Run time stats related definitions. */
 void vMainConfigureTimerForRunTimeStats( void );
 unsigned long ulMainGetRunTimeCounterValue( void );
@@ -409,10 +409,16 @@ static void __usb(void *param)
    }
 }

+extern void __SetupDescHIDReport();
+extern void __SetupUSBDescriptor();

 void __USBStart()
 {
    mutex_init(&__usb_mutex);
+
+    __SetupDescHIDReport();
+    __SetupUSBDescriptor();
+
    // Make highest prio and locked to core 0
    xTaskCreate(__usb, "USB", 256, 0, configMAX_PRIORITIES - 1, &__usbTask);
    vTaskCoreAffinitySet( __usbTask, 1 << 0 );
@@ -1,6 +1,6 @@
 {
  "name": "framework-arduinopico",
-  "version": "1.20100.0",
+  "version": "1.20202.0",
  "description": "Arduino Wiring-based Framework (RPi Pico RP2040)",
  "keywords": [
    "framework",
@@ -116,16 +116,6 @@ sed "s/version=.*/version=$ver/g" |\
 sed -E "s/name=([a-zA-Z0-9\ -]+).*/name=\1($ver)/g"\
 > $outdir/platform.txt

-# Put core version and short hash of git version into core_version.h
-ver_define=`echo $plain_ver | tr "[:lower:].\055" "[:upper:]_"`
-echo Ver define: $ver_define
-echo \#define ARDUINO_RP2040_GIT_VER 0x`git rev-parse --short=8 HEAD 2>/dev/null` >$outdir/cores/rp2040/core_version.h
-echo \#define ARDUINO_RP2040_GIT_DESC `git describe --tags 2>/dev/null` >>$outdir/cores/rp2040/core_version.h
-echo \#define ARDUINO_RP2040_RELEASE_$ver_define >>$outdir/cores/rp2040/core_version.h
-echo \#define ARDUINO_RP2040_RELEASE \"$ver_define\" >>$outdir/cores/rp2040/core_version.h
-
-sed -i 's/"version": .*/"version": "'$visible_ver'"/' $outdir/package.json
-
 # Zip the package
 pushd package/versions/$visible_ver
 echo "Making $package_name.zip"
@@ -108,22 +108,22 @@
               "toolsDependencies": [
                  {
                     "packager": "rp2040",
-                     "version": "1.3.4-c-5dd03b9",
+                     "version": "1.4.0-b-cb31b54",
                     "name": "pqt-gcc"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.4-c-5dd03b9",
+                     "version": "1.4.0-b-cb31b54",
                     "name": "pqt-mklittlefs"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.4-c-5dd03b9",
+                     "version": "1.4.0-b-cb31b54",
                     "name": "pqt-elf2uf2"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.4-c-5dd03b9",
+                     "version": "1.4.0-b-cb31b54",
                     "name": "pqt-pioasm"
                  },
                  {
@@ -133,7 +133,7 @@
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.3.4-c-5dd03b9",
+                     "version": "1.4.0-b-cb31b54",
                     "name": "pqt-openocd"
                  }
               ],
@@ -144,57 +144,57 @@
         ],
         "tools": [
            {
-               "version": "1.3.4-c-5dd03b9",
+               "version": "1.4.0-b-cb31b54",
               "name": "pqt-openocd",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
-                     "checksum": "SHA-256:e796e6d2eac20cf90be4e61fc0a5ed16d1d26269cf749ec7829650d2595810b2",
-                     "size": "5607245"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/aarch64-linux-gnu.openocd-e3428fadb.220619.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.openocd-e3428fadb.220619.tar.gz",
+                     "checksum": "SHA-256:8cdddf73090b6d7f5ef7fdb1b60e9f755166ce494d774b91004e6655a80abfa1",
+                     "size": "5607149"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.openocd-e3428fadb.220607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.openocd-e3428fadb.220607.tar.gz",
-                     "checksum": "SHA-256:bbb9b2b1504555b1804538786074e776ebc4b2dded36f12f85a72ad6ba67f402",
-                     "size": "5344211"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/arm-linux-gnueabihf.openocd-e3428fadb.220619.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.openocd-e3428fadb.220619.tar.gz",
+                     "checksum": "SHA-256:07d4e170396f57d5180569168d9bc24b258207900fbc8c87b38056ac1b2fed1e",
+                     "size": "5344134"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.openocd-e3428fadb.220607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.openocd-e3428fadb.220607.tar.gz",
-                     "checksum": "SHA-256:7162ff1807748f11bb711b33c64139eae37b05d03458d9b0ac9a8e0d36aeb1a9",
-                     "size": "5168326"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-linux-gnu.openocd-e3428fadb.220619.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.openocd-e3428fadb.220619.tar.gz",
+                     "checksum": "SHA-256:9e3f18ccfb47ee4051bb93c8b9b177e3135eedbbfb3fd9207524b649efe09aed",
+                     "size": "5168404"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.openocd-e3428fadb.220607.zip",
-                     "archiveFileName": "i686-w64-mingw32.openocd-e3428fadb.220607.zip",
-                     "checksum": "SHA-256:3cbdcd63ca2084c9b479c781f8efefdec1481917c1fc3fe33d230ea38464e624",
-                     "size": "2156819"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-w64-mingw32.openocd-e3428fadb.220619.zip",
+                     "archiveFileName": "i686-w64-mingw32.openocd-e3428fadb.220619.zip",
+                     "checksum": "SHA-256:c38bf855c099d933c09d92d57fd1473853eee205957fe22b618e3514d638fe4f",
+                     "size": "2156831"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.openocd-e3428fadb.220607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.openocd-e3428fadb.220607.tar.gz",
-                     "checksum": "SHA-256:1159ad88b998e040c2f33d8ce83e5e0130c4cf73c05320efe70ffdd1f6a52055",
-                     "size": "2002498"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-apple-darwin14.openocd-e3428fadb.220619.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.openocd-e3428fadb.220619.tar.gz",
+                     "checksum": "SHA-256:c36483c5cecfdeba8466b6e112552736c99a2409e6f8e80287b80a3f8d8fdb16",
+                     "size": "2002506"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.openocd-e3428fadb.220607.tar.gz",
-                     "checksum": "SHA-256:388d53ab399bbac0c1ed097fc1bfe08788e765ee78faf970c6e06b1eeb88bdac",
-                     "size": "5540543"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-linux-gnu.openocd-e3428fadb.220619.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.openocd-e3428fadb.220619.tar.gz",
+                     "checksum": "SHA-256:57083723758814567f6b54e4f81713ce1ce070c6878362a97636da73362f00c9",
+                     "size": "5540547"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.openocd-e3428fadb.220607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.openocd-e3428fadb.220607.zip",
-                     "checksum": "SHA-256:df3b5ed63c93f24a49ade6ecd1ec5bf84eb97677b7f3bd66e302b7871f20c2ed",
-                     "size": "2156820"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-w64-mingw32.openocd-e3428fadb.220619.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.openocd-e3428fadb.220619.zip",
+                     "checksum": "SHA-256:b05d1dbf32d277e214664ae44dd86be96bae61f615c0bac6c1c1c281d6b52b71",
+                     "size": "2156832"
                  }
               ]
            },
@@ -261,222 +261,222 @@
               ]
            },
            {
-               "version": "1.3.4-c-5dd03b9",
+               "version": "1.4.0-b-cb31b54",
               "name": "pqt-gcc",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "checksum": "SHA-256:ec0bbb010f8acbcddcb4671a98eada560d6dd9ea2bc8c6a2247198eaa8b15be0",
-                     "size": "78042296"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/aarch64-linux-gnu.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "checksum": "SHA-256:27dd4a1fe0b6010588928acc9b61937d149ebcd7a4aa47ce944506d71827c460",
+                     "size": "77881122"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "checksum": "SHA-256:c18839a74fe1ec1b449d80e6b7de358bd1d9444ff454edaf57d79fe2f734d60e",
-                     "size": "73499374"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/arm-linux-gnueabihf.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "checksum": "SHA-256:3e3547998b6c2382d7c6e91b43f0a7a3190e2955160bb471de4cc204b599a757",
+                     "size": "73345531"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "checksum": "SHA-256:e6546899155267e5539889764610439fdbeba38df0e498a9fd643aad13ba49f0",
-                     "size": "79642507"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-linux-gnu.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "checksum": "SHA-256:fca37e1e49a6e25dd507a24e2e9a6947fd0eec7d0a8a30f4bdcac524c9bd18a1",
+                     "size": "79497966"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
-                     "archiveFileName": "i686-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
-                     "checksum": "SHA-256:867c4bc810db9388fe0d814fc21ac81479a1e2be1c45f8e150981bb33846e04d",
-                     "size": "82878616"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-w64-mingw32.arm-none-eabi-cb31b54.220619.zip",
+                     "archiveFileName": "i686-w64-mingw32.arm-none-eabi-cb31b54.220619.zip",
+                     "checksum": "SHA-256:61f31ae875a67e8334e031c188fbe30d98c5f1bceb33305acf49d985d9ca71ce",
+                     "size": "82625221"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "checksum": "SHA-256:ef91ab4e0d7a66b3ae683d6d4b5ca8526eab7a7572a3aec60dd6a04795061bbe",
-                     "size": "82271912"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-apple-darwin14.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "checksum": "SHA-256:d32c7797be2c31d20dc4b5182a0dd77be67324c3c6a52737bfb4e63e1d622f80",
+                     "size": "82123114"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-5dd03b9.220607.tar.gz",
-                     "checksum": "SHA-256:59d16d192b8f623261f2c0605164da24e9257b1de210c367ea872131ef4d9f45",
-                     "size": "80508303"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-linux-gnu.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-cb31b54.220619.tar.gz",
+                     "checksum": "SHA-256:470cbe690b2553d3b780ece36cda9fc26c7b53db47362ced3a937d701e696e9e",
+                     "size": "80361816"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-5dd03b9.220607.zip",
-                     "checksum": "SHA-256:b140ec4e5986b73249a6350a53d9826ad5d74a8a2af12adf3d6c13bebc720c88",
-                     "size": "86320223"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-w64-mingw32.arm-none-eabi-cb31b54.220619.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-cb31b54.220619.zip",
+                     "checksum": "SHA-256:7b50d3f34cd602a28d8cf1580c65dd22e683088ce5b954be5bfb67ba50094134",
+                     "size": "86068608"
                  }
               ]
            },
            {
-               "version": "1.3.4-c-5dd03b9",
+               "version": "1.4.0-b-cb31b54",
               "name": "pqt-elf2uf2",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:a98b46d71e837927867789810b8577dcbc8f53c618adb9bb4083c1e2fa1cf483",
-                     "size": "79853"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/aarch64-linux-gnu.elf2uf2-2062372.220619.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.elf2uf2-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:74dd8cf38160bd9f972ea22e02bd6fa6b11bc510aa7738b603c7fbd016fe4b50",
+                     "size": "79874"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.elf2uf2-2062372.220607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.elf2uf2-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:64df2a9dbc6b5546a07bd15c26c4b6e0310d0b937e5d921f83b0f51ef02f1734",
-                     "size": "54249"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/arm-linux-gnueabihf.elf2uf2-2062372.220619.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.elf2uf2-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:efa24ac288a5eacad7b535ce4d9ac66a25686d993f80daf86248858310b3fc63",
+                     "size": "54265"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.elf2uf2-2062372.220607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.elf2uf2-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:1b877ef797c281b5dd2f4d98409ba83db120e528aac94f4a9a34effa2262eaa7",
-                     "size": "87893"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-linux-gnu.elf2uf2-2062372.220619.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.elf2uf2-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:c0816a703fe5821a1d1bf60dcb584d98185b83e926d532fd37c69e8801e211ff",
+                     "size": "87908"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.elf2uf2-2062372.220607.zip",
-                     "archiveFileName": "i686-w64-mingw32.elf2uf2-2062372.220607.zip",
-                     "checksum": "SHA-256:eed4693771f27851092d182e8477eee9c393cce7ddffde18d7492e78bd65140c",
-                     "size": "70405"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-w64-mingw32.elf2uf2-2062372.220619.zip",
+                     "archiveFileName": "i686-w64-mingw32.elf2uf2-2062372.220619.zip",
+                     "checksum": "SHA-256:7a2f86735220fef0946856f418a136ff4ed3ad4cf0cacc17d8016f6cbd1ca735",
+                     "size": "70416"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.elf2uf2-2062372.220607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.elf2uf2-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:af65feef470ce6b4b48102ea996703890f8d8d9604207f0781022b7912ce2cbd",
-                     "size": "81982"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-apple-darwin14.elf2uf2-2062372.220619.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.elf2uf2-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:2ae3ffd477eaabb891e68e1b4525e3d4d4b2fee3c6f70e6ae68c45746c03fb54",
+                     "size": "81995"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.elf2uf2-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:968240efe170187c4ece497c7abbb81bca274b6484f0df28e2b7a12e1c088f5f",
-                     "size": "79588"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-linux-gnu.elf2uf2-2062372.220619.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.elf2uf2-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:2be1052db1e676418c59a4331ef688f686b4a31053330c90348219ab1ecd6bcf",
+                     "size": "79610"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.elf2uf2-2062372.220607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.elf2uf2-2062372.220607.zip",
-                     "checksum": "SHA-256:04b85b5b515ec620a5b4106fb1025485de0b3d36482aab7024088e618e605e9d",
-                     "size": "78280"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-w64-mingw32.elf2uf2-2062372.220619.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.elf2uf2-2062372.220619.zip",
+                     "checksum": "SHA-256:2a39f7f20e42c5b981286dfdf50bc3d7201cbe63d191caf38a0ffa306422ed08",
+                     "size": "78291"
                  }
               ]
            },
            {
-               "version": "1.3.4-c-5dd03b9",
+               "version": "1.4.0-b-cb31b54",
               "name": "pqt-pioasm",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.pioasm-2062372.220607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.pioasm-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:d08d22b2eecbf17a8afd199eb4ce89c0f6fe2ffa90408d7762d4de7f91c88e13",
-                     "size": "453559"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/aarch64-linux-gnu.pioasm-2062372.220619.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.pioasm-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:71887999ad64e64f75658a1883029b337cb9738d87e04944b1dbc0321d3c7a67",
+                     "size": "453580"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.pioasm-2062372.220607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.pioasm-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:7bc20faea8b8d115fec189248b3dd3470128d0f7da855a61cb8a1fb6d4955450",
-                     "size": "360566"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/arm-linux-gnueabihf.pioasm-2062372.220619.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.pioasm-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:5b2e863e5764b0c4d53f536b5ea217e2a27f02f04b74da799e19b1fa6c8b39a8",
+                     "size": "360581"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.pioasm-2062372.220607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.pioasm-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:b8d26abd632e9599bc82c67619debac45fca0e5dd0daabe5a0ecad4cfd11183e",
-                     "size": "511402"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-linux-gnu.pioasm-2062372.220619.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.pioasm-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:fd5ec8b1940e51db6ec2e2beea73d7be7f1e9cf09f6e66d739e3ed1be177a7a6",
+                     "size": "511417"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.pioasm-2062372.220607.zip",
-                     "archiveFileName": "i686-w64-mingw32.pioasm-2062372.220607.zip",
-                     "checksum": "SHA-256:ab52ae2fd59fe3093060a238297f88d50645dca02cd12f59e882ce7cb4533b25",
-                     "size": "385748"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-w64-mingw32.pioasm-2062372.220619.zip",
+                     "archiveFileName": "i686-w64-mingw32.pioasm-2062372.220619.zip",
+                     "checksum": "SHA-256:6a4a5f4f3c0b7a3bc08b2b3bd8111d33a5619633de9b04e03bf0bca6f17d1337",
+                     "size": "385759"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.pioasm-2062372.220607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.pioasm-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:fb22e0c5d6b3e681a8518992a8183b277ebeb5a3876b1c98a247dda4e2c495e7",
-                     "size": "480494"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-apple-darwin14.pioasm-2062372.220619.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.pioasm-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:9d9d7a3addaaca00712fdf5516a21fdae94926210f12f7ae16dc8ebf7beacfe8",
+                     "size": "480510"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.pioasm-2062372.220607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.pioasm-2062372.220607.tar.gz",
-                     "checksum": "SHA-256:f5ea7d22357db358c7185896858463d63310391678bf7425f203cc2baf35789d",
-                     "size": "458726"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-linux-gnu.pioasm-2062372.220619.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.pioasm-2062372.220619.tar.gz",
+                     "checksum": "SHA-256:be77c350eb7777de01c93312919c370e4ef3e5e281f122f46a2348a21693c480",
+                     "size": "458738"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.pioasm-2062372.220607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.pioasm-2062372.220607.zip",
-                     "checksum": "SHA-256:5b63d07bb53ec4e25817d3a1195cd03f156c47dc00c5fdaf4921edb1baa9da9c",
-                     "size": "408649"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-w64-mingw32.pioasm-2062372.220619.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.pioasm-2062372.220619.zip",
+                     "checksum": "SHA-256:451ad335a5cebcee3b6acda73d887a488f98c4a8839b8e98d557425f8d7f47ea",
+                     "size": "408660"
                  }
               ]
            },
            {
-               "version": "1.3.4-c-5dd03b9",
+               "version": "1.4.0-b-cb31b54",
               "name": "pqt-mklittlefs",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/aarch64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
-                     "checksum": "SHA-256:46a2ee723b6dcad3f229aa6f97a8efd55224f7aafea77ac5c232aa5261720589",
-                     "size": "47271"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/aarch64-linux-gnu.mklittlefs-affa497.220619.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.mklittlefs-affa497.220619.tar.gz",
+                     "checksum": "SHA-256:1752294e6cc6ce3edd8b417e773c8703a1dc4e616f158ed6c928b62bec7289b5",
+                     "size": "47286"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/arm-linux-gnueabihf.mklittlefs-affa497.220607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.mklittlefs-affa497.220607.tar.gz",
-                     "checksum": "SHA-256:39462b3b88b614484c9fbfd7617af17440f9de4ddeb17bdb62b7bc615cae3a18",
-                     "size": "40810"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/arm-linux-gnueabihf.mklittlefs-affa497.220619.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.mklittlefs-affa497.220619.tar.gz",
+                     "checksum": "SHA-256:07e182ca15cf60d0f266030ff796ffc566c78e5e1fd148948a6ec3cbab444103",
+                     "size": "40823"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-linux-gnu.mklittlefs-affa497.220607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.mklittlefs-affa497.220607.tar.gz",
-                     "checksum": "SHA-256:c8eb593e6fc8bdc386566a72dd9a75f970a9a71fd4e069c0dca217cbe4b22060",
-                     "size": "50913"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-linux-gnu.mklittlefs-affa497.220619.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.mklittlefs-affa497.220619.tar.gz",
+                     "checksum": "SHA-256:774657fbfaca1793acd8461e90399de1be0e99715b9135af0b935adc40211c72",
+                     "size": "50926"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/i686-w64-mingw32.mklittlefs-affa497.220607.zip",
-                     "archiveFileName": "i686-w64-mingw32.mklittlefs-affa497.220607.zip",
-                     "checksum": "SHA-256:6fc3c989850ab4acf00509b86c77edf1cdd2f38ec95c3614ed633f8131d3f86d",
-                     "size": "334050"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/i686-w64-mingw32.mklittlefs-affa497.220619.zip",
+                     "archiveFileName": "i686-w64-mingw32.mklittlefs-affa497.220619.zip",
+                     "checksum": "SHA-256:473ba014d011737d97e703059cf2819d9ee2328f2af2f93f52c43eba53e34f55",
+                     "size": "334062"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-apple-darwin14.mklittlefs-affa497.220607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.mklittlefs-affa497.220607.tar.gz",
-                     "checksum": "SHA-256:a949b054259cea773779305f60b2748b51e1f40c53fe7c00ae3959d6688ce754",
-                     "size": "365751"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-apple-darwin14.mklittlefs-affa497.220619.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.mklittlefs-affa497.220619.tar.gz",
+                     "checksum": "SHA-256:ffc1fef60f4c359978f6476a8cc33995638d826e4820ca96fc17f3cf47250bec",
+                     "size": "365767"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.mklittlefs-affa497.220607.tar.gz",
-                     "checksum": "SHA-256:d1910196398bdeffae320cb69b1df79126ea086688d9e36a078dd0816f88dace",
-                     "size": "49774"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-linux-gnu.mklittlefs-affa497.220619.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.mklittlefs-affa497.220619.tar.gz",
+                     "checksum": "SHA-256:0a05281f13ae48a1ce4894107525e7027258746c1cac3a568b51b8082f99e93f",
+                     "size": "49786"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.4-c/x86_64-w64-mingw32.mklittlefs-affa497.220607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.mklittlefs-affa497.220607.zip",
-                     "checksum": "SHA-256:8be0f754073e036dc9a144fd3cf62a46fbd6d215cad179c2ba17e598848a1b57",
-                     "size": "347601"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.4.0-b/x86_64-w64-mingw32.mklittlefs-affa497.220619.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.mklittlefs-affa497.220619.zip",
+                     "checksum": "SHA-256:039981ec41f38a9c89de3466d9fd8c9e7c0723ab53798223ceb4d122fdcac914",
+                     "size": "347613"
                  }
               ]
            }
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification

 name=Raspberry Pi RP2040 Boards
-version=2.1.0
+version=2.2.2

 runtime.tools.pqt-gcc.path={runtime.platform.path}/system/arm-none-eabi
 runtime.tools.pqt-python3.path={runtime.platform.path}/system/python3
@@ -48,13 +48,13 @@ compiler.wrap="@{runtime.platform.path}/lib/platform_wrap.txt"
 compiler.libpico="{runtime.platform.path}/lib/libpico.a"

 compiler.c.cmd=arm-none-eabi-gcc
-compiler.c.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} {compiler.includes} -std=gnu17 -g
+compiler.c.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} -MMD {compiler.includes} -std=gnu17 -g
 compiler.c.elf.cmd=arm-none-eabi-g++
 compiler.c.elf.flags={compiler.warning_flags} {compiler.defines} {compiler.flags} {build.flags.optimize} -u _printf_float -u _scanf_float
 compiler.S.cmd=arm-none-eabi-gcc
 compiler.S.flags=-c {compiler.warning_flags} -g -x assembler-with-cpp -MMD {compiler.includes} -g
 compiler.cpp.cmd=arm-none-eabi-g++
-compiler.cpp.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} {compiler.includes} {build.flags.rtti} -std=gnu++17 -g
+compiler.cpp.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} -MMD {compiler.includes} {build.flags.rtti} -std=gnu++17 -g

 compiler.ar.cmd=arm-none-eabi-ar
 compiler.ar.flags=rcs
@@ -23,6 +23,8 @@ function skip_ino()
 /msc_sd/
 /msc_sdfat/
 /midi_pizza_box_dj/
+/msc_esp32_file_browser/
+/DualRole/
 EOL
        echo $ino | grep -q -F "$skiplist"
        echo $(( 1 - $? ))
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80f1"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "adafruit_feather",
-        "boot2_source": "boot2_w25x10cl_4_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80f1",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Feather RP2040"
-      }
-    }
+    "variant": "adafruit_feather"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Adafruit"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80fd"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ADAFRUIT_ITSYBITSY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "adafruit_itsybitsy",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80fd",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "ItsyBitsy RP2040"
-      }
-    }
+    "variant": "adafruit_itsybitsy"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Adafruit"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x8105"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ADAFRUIT_KB2040_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "adafruit_kb2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x8105",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "KB2040"
-      }
-    }
+    "variant": "adafruit_kb2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Adafruit"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x8107"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ADAFRUIT_MACROPAD_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "adafruit_macropad2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x8107",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "MacroPad RP2040"
-      }
-    }
+    "variant": "adafruit_macropad2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Adafruit"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80f7"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ADAFRUIT_QTPY_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "adafruit_qtpy",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80f7",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "QT Py RP2040"
-      }
-    }
+    "variant": "adafruit_qtpy"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Adafruit"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x80e3"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ADAFRUIT_STEMMAFRIEND_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "adafruit_stemmafriend",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x80e3",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "STEMMA Friend RP2040"
-      }
-    }
+    "variant": "adafruit_stemmafriend"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Adafruit"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239a",
+        "usb_pid": "0x8109"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ADAFRUIT_TRINKEYQT_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "adafruit_trinkeyrp2040qt",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x239a",
-        "usb_pid": "0x8109",
-        "usb_manufacturer": "Adafruit",
-        "usb_product": "Trinkey RP2040 QT"
-      }
-    }
+    "variant": "adafruit_trinkeyrp2040qt"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Adafruit"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2341",
+        "usb_pid": "0x0058"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_NANO_RP2040_CONNECT -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "arduino_nano_connect",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2341",
-        "usb_pid": "0x0058",
-        "usb_manufacturer": "Arduino",
-        "usb_product": "Nano RP2040 Connect"
-      }
-    }
+    "variant": "arduino_nano_connect"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Arduino"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1023"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_CHALLENGER_2040_LORA_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "challenger_2040_lora",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1023",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LoRa"
-      }
-    }
+    "variant": "challenger_2040_lora"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "iLabs"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x100b"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_CHALLENGER_2040_LTE_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "challenger_2040_lte",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x100b",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 LTE"
-      }
-    }
+    "variant": "challenger_2040_lte"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "iLabs"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1006"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_CHALLENGER_2040_WIFI_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "challenger_2040_wifi",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1006",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 WiFi"
-      }
-    }
+    "variant": "challenger_2040_wifi"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "iLabs"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x102C"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_CHALLENGER_2040_WIFI_BLE_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "challenger_2040_wifi_ble",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x102C",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger 2040 WiFi/BLE"
-      }
-    }
+    "variant": "challenger_2040_wifi_ble"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "iLabs"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x100b"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_CHALLENGER_NB_2040_WIFI_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "challenger_nb_2040_wifi",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x100b",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "Challenger NB 2040 WiFi"
-      }
-    }
+    "variant": "challenger_nb_2040_wifi"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "iLabs"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x100f"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_CYTRON_MAKER_NANO_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "cytron_maker_nano_rp2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x100f",
-        "usb_manufacturer": "Cytron",
-        "usb_product": "Maker Nano RP2040"
-      }
-    }
+    "variant": "cytron_maker_nano_rp2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Cytron"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1000"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_CYTRON_MAKER_PI_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "cytron_maker_pi_rp2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1000",
-        "usb_manufacturer": "Cytron",
-        "usb_product": "Maker Pi RP2040"
-      }
-    }
+    "variant": "cytron_maker_pi_rp2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Cytron"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x3343",
+        "usb_pid": "0x4253"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_DFROBOT_BEETLE_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "dfrobot_beetle_rp2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x3343",
-        "usb_pid": "0x4253",
-        "usb_manufacturer": "DFRobot",
-        "usb_product": "Beetle RP2040"
-      }
-    }
+    "variant": "dfrobot_beetle_rp2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "DFRobot"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x008a"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_FLYBOARD2040_CORE -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "flyboard2040_core",
-        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x008a",
-        "usb_manufacturer": "DeRuiLab",
-        "usb_product": "FlyBoard2040Core"
-      }
-    }
+    "variant": "flyboard2040_core"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "DeRuiLab"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0xf00a"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_GENERIC_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "generic",
-        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0xf00a",
-        "usb_manufacturer": "Generic",
-        "usb_product": "RP2040"
-      }
-    }
+    "variant": "generic"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Generic"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1010"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_ILABS_2040_RPICO32_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "ilabs_rpico32",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1010",
-        "usb_manufacturer": "iLabs",
-        "usb_product": "RPICO32"
-      }
-    }
+    "variant": "ilabs_rpico32"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "iLabs"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1005"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_MELOPERO_SHAKE_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "melopero_shake_rp2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1005",
-        "usb_manufacturer": "Melopero",
-        "usb_product": "Shake RP2040"
-      }
-    }
+    "variant": "melopero_shake_rp2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Melopero"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x000a"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_RASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "rpipico",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x000a",
-        "usb_manufacturer": "Raspberry Pi",
-        "usb_product": "Pico"
-      }
-    }
+    "variant": "rpipico"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Raspberry Pi"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x000a"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_SEEED_XAIO_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "seeed_xiao_rp2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x000a",
-        "usb_manufacturer": "Seeed",
-        "usb_product": "XAIO RP2040"
-      }
-    }
+    "variant": "seeed_xiao_rp2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Seeed"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
+        "usb_vid": "0x1209",
+        "usb_pid": "0xa182"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_SOLDERPARTY_RP2040_STAMP -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "solderparty_rp2040_stamp",
-        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x1209",
-        "usb_pid": "0xa182",
-        "usb_manufacturer": "Solder Party",
-        "usb_product": "RP2040 Stamp"
-      }
-    }
+    "variant": "solderparty_rp2040_stamp"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "Solder Party"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
+        "usb_vid": "0x1b4f",
+        "usb_pid": "0x0026"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_SPARKFUN_PROMICRO_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "sparkfun_promicrorp2040",
-        "boot2_source": "boot2_generic_03h_4_padded_checksum.S",
-        "usb_vid": "0x1b4f",
-        "usb_pid": "0x0026",
-        "usb_manufacturer": "SparkFun",
-        "usb_product": "ProMicro RP2040"
-      }
-    }
+    "variant": "sparkfun_promicrorp2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "SparkFun"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x1b4f",
+        "usb_pid": "0x0026"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_SPARKFUN_THINGPLUS_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "sparkfun_thingplusrp2040",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x1b4f",
-        "usb_pid": "0x0026",
-        "usb_manufacturer": "SparkFun",
-        "usb_product": "Thing Plus RP2040"
-      }
-    }
+    "variant": "sparkfun_thingplusrp2040"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "SparkFun"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1007"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_UPESY_RP2040_DEVKIT -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "upesy_rp2040_devkit",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1007",
-        "usb_manufacturer": "uPesy",
-        "usb_product": "RP2040 DevKit"
-      }
-    }
+    "variant": "upesy_rp2040_devkit"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "uPesy"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1027"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_WIZNET_5100S_EVB_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "wiznet_5100s_evb_pico",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1027",
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "W5100S-EVB-Pico"
-      }
-    }
+    "variant": "wiznet_5100s_evb_pico"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "WIZnet"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1029"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_WIZNET_5500_EVB_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "wiznet_5500_evb_pico",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1029",
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "W5500-EVB-Pico"
-      }
-    }
+    "variant": "wiznet_5500_evb_pico"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "WIZnet"
-}
+}
@@ -1,5 +1,12 @@
 {
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1028"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_WIZNET_WIZFI360_EVB_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
@@ -11,16 +18,7 @@
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "wiznet_wizfi360_evb_pico",
-        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
-        "usb_vid": "0x2e8a",
-        "usb_pid": "0x1028",
-        "usb_manufacturer": "WIZnet",
-        "usb_product": "WizFi360-EVB-Pico"
-      }
-    }
+    "variant": "wiznet_wizfi360_evb_pico"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -49,4 +47,4 @@
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "WIZnet"
-}
+}
@@ -32,7 +32,7 @@ def BuildDebugLevel(name):
        print("%s.menu.dbglvl.%s.build.debug_level=%s" % (name, l[0], l[1]))

 def BuildFreq(name):
-    for f in [ 133,  50, 100, 125, 150, 175, 200, 225, 250, 275, 300]:
+    for f in [ 133,  50, 100, 120, 125, 150, 175, 200, 225, 240, 250, 275, 300]:
        warn = ""
        if f > 133: warn = " (Overclock)"
        print("%s.menu.freq.%s=%s MHz%s" % (name, f, f, warn))
@@ -177,6 +177,13 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flash
 def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flashsizemb, boot2):
    json = """{
  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "BOOT2.S",
+        "usb_vid": "VID",
+        "usb_pid": "PID"
+      }
+    },
    "core": "earlephilhower",
    "cpu": "cortex-m0plus",
    "extra_flags": "-D ARDUINO_BOARDDEFINE -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=USBPWR",
@@ -188,16 +195,7 @@ def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, f
      ]
    ],
    "mcu": "rp2040",
-    "arduino": {
-      "earlephilhower": {
-        "variant": "VARIANTNAME",
-        "boot2_source": "BOOT2.S",
-        "usb_vid": "VID",
-        "usb_pid": "PID",
-        "usb_manufacturer": "VENDORNAME",
-        "usb_product": "PRODUCTNAME"
-      }
-    }
+    "variant": "VARIANTNAME"
  },
  "debug": {
    "jlink_device": "RP2040_M0_0",
@@ -226,7 +224,7 @@ def MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, f
  },
  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
  "vendor": "VENDORNAME"
-}""".replace('VARIANTNAME', name).replace('BOARDDEFINE', boarddefine).replace('BOOT2', boot2).replace('VID', vid).replace('PID', pid).replace('VENDORNAME', vendor_name).replace('PRODUCTNAME', product_name).replace('FLASHSIZE', str(1024*1024*flashsizemb)).replace('USBPWR', str(pwr))
+}\n""".replace('VARIANTNAME', name).replace('BOARDDEFINE', boarddefine).replace('BOOT2', boot2).replace('VID', vid).replace('PID', pid).replace('VENDORNAME', vendor_name).replace('PRODUCTNAME', product_name).replace('FLASHSIZE', str(1024*1024*flashsizemb)).replace('USBPWR', str(pwr))
    jsondir = os.path.abspath(os.path.dirname(__file__)) + "/json"
    f = open(jsondir + "/" + name + ".json", "w")
    f.write(json)
@@ -27,7 +27,8 @@ ram_size = 256 * 1024 # not the 264K, which is 256K SRAM + 2*4K SCRATCH(X/Y).
 FRAMEWORK_DIR = platform.get_package_dir("framework-arduinopico")
 assert os.path.isdir(FRAMEWORK_DIR)

-# read includes from this file to add them into CPPPATH later
+# read includes from this file to add them into CPPPATH later for good IDE intellisense
+# will use original -iprefix <prefix> @<file> for compilation though.
 includes_file = os.path.join(FRAMEWORK_DIR, "lib", "platform_inc.txt")
 file_lines = []
 includes = []
@@ -38,10 +39,41 @@ for l in file_lines:
    # emulate -iprefix <framework path>.
    path = os.path.join(FRAMEWORK_DIR, path)
    # prevent non-existent paths from being added
-    # looking at you here, pico-extras/src/common/pico_audio and co.
    if os.path.isdir(path):
        includes.append(path)

+def is_pio_build():
+	from SCons.Script import COMMAND_LINE_TARGETS
+	return "idedata" not in COMMAND_LINE_TARGETS and "_idedata" not in COMMAND_LINE_TARGETS
+
+# get all activated macros
+flatten_cppdefines = env.Flatten(env['CPPDEFINES'])
+
+#
+# Exceptions
+#
+stdcpp_lib = None
+if "PIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS" in flatten_cppdefines:
+    env.Append(
+        CXXFLAGS=["-fexceptions"]
+    )
+    stdcpp_lib = "stdc++-exc"
+else:
+    env.Append(
+        CXXFLAGS=["-fno-exceptions"]
+    )
+    stdcpp_lib = "stdc++"
+
+#
+# RTTI
+#
+# standard is -fno-rtti flag. If special macro is present, don't 
+# add that flag.
+if not "PIO_FRAMEWORK_ARDUINO_ENABLE_RTTI" in flatten_cppdefines:
+    env.Append(
+        CXXFLAGS=["-fno-rtti"]
+    )
+
 # update progsize expression to also check for bootloader.
 env.Replace(
    SIZEPROGREGEXP=r"^(?:\.boot2|\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*"
@@ -57,11 +89,8 @@ env.Append(
        "-mcpu=cortex-m0plus",
        "-mthumb",
        "-ffunction-sections",
-        "-fdata-sections",
-        # use explicit include (-I) paths, otherwise it's
-        # not visible in the IDE's intellisense.
-        #"-iprefix" + os.path.join(FRAMEWORK_DIR),
-        #"@%s" % os.path.join(FRAMEWORK_DIR, "lib", "platform_inc.txt")
+        "-fdata-sections"
+        # -iprefix etc. added lader if in build mode
    ],

    CFLAGS=[
@@ -70,8 +99,6 @@ env.Append(

    CXXFLAGS=[
        "-std=gnu++17",
-        "-fno-exceptions",
-        "-fno-rtti",
    ],

    CPPDEFINES=[
@@ -114,16 +141,27 @@ env.Append(
    # link lib/libpico.a by full path, ignore libstdc++
    LIBS=[
        File(os.path.join(FRAMEWORK_DIR, "lib", "libpico.a")), 
-        "m", "c", "stdc++", "c"]
+        "m", "c", stdcpp_lib, "c"]
 )
-# expand with read includes
-env.Append(CPPPATH=includes)
+
+# expand with read includes for IDE, but use -iprefix command for actual building
+if not is_pio_build():
+    env.Append(CPPPATH=includes)
+else:
+    env.Append(CCFLAGS=[
+        "-iprefix" + os.path.join(FRAMEWORK_DIR),
+        "@%s" % os.path.join(FRAMEWORK_DIR, "lib", "platform_inc.txt")
+    ])
+

 def configure_usb_flags(cpp_defines):
    global ram_size
    if "USE_TINYUSB" in cpp_defines:
        env.Append(CPPPATH=[os.path.join(
            FRAMEWORK_DIR, "libraries", "Adafruit_TinyUSB_Arduino", "src", "arduino")])
+        # automatically build with lib_archive = no to make weak linking work, needed for TinyUSB
+        env_section = "env:" + env["PIOENV"]
+        platform.config.set(env_section, "lib_archive", False)
    elif "PIO_FRAMEWORK_ARDUINO_NO_USB" in cpp_defines:
        env.Append(
            CPPPATH=[os.path.join(FRAMEWORK_DIR, "tools", "libpico")],
@@ -223,8 +261,8 @@ linkerscript_cmd = env.Command(

 # if no custom linker script is provided, we use the command that we prepared to generate one.
 if not board.get("build.ldscript", ""):
-    # execute fetch filesystem info stored in env to alawys have that info ready
-    env["fetch_fs_size"](env)
+    # execute fetch filesystem info stored in env to always have that info ready
+    env["__fetch_fs_size"](env)
    env.Depends("$BUILD_DIR/${PROGNAME}.elf", linkerscript_cmd)
    env.Replace(LDSCRIPT_PATH=os.path.join("$BUILD_DIR", "memmap_default.ld"))

@@ -20,8 +20,8 @@

 #pragma once

-#define DEFAULT_ESP32_BAUDRATE      115200
-#define DEFAULT_ESP_BAUDRATE        DEFAULT_ESP32_BAUDRATE
+#define DEFAULT_ESP8285_BAUDRATE    115200
+#define DEFAULT_ESP_BAUDRATE        DEFAULT_ESP8285_BAUDRATE

 class Challenger2040WiFiClass {
  public:
@@ -1,7 +1,7 @@
 /*
-    ESP8285 helper class for the Challenger RP2040 WiFi boards
+    ESP8285/ESP32C3 helper class for the Challenger RP2040 WiFi enabled boards

-    Copyright (c) 2021 P. Oldberg <pontus@ilabs.se>
+    Copyright (c) 2021,2022 P. Oldberg <pontus@ilabs.se>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -21,31 +21,33 @@
 #include <Arduino.h>
 #include <ChallengerWiFi.h>

-Challenger2040WiFiClass::Challenger2040WiFiClass() {
-  pinMode(PIN_ESP8285_RST, OUTPUT);
-  digitalWrite(PIN_ESP8285_RST, LOW);       // Hold ESP8285 in reset
-  pinMode(PIN_ESP8285_MODE, OUTPUT);
-  digitalWrite(PIN_ESP8285_MODE, HIGH);     // Prepare for normal start
+Challenger2040WiFiClass::Challenger2040WiFiClass(HardwareSerial* serial) {
+  _serial = serial;
+
+  pinMode(PIN_ESP_RST, OUTPUT);
+  digitalWrite(PIN_ESP_RST, LOW);       // Hold ESP in reset
+  pinMode(PIN_ESP_MODE, OUTPUT);
+  digitalWrite(PIN_ESP_MODE, HIGH);     // Prepare for normal start
 }

 // Do a HW reset by applying a low pulse to the reset line for 1mSec
 void Challenger2040WiFiClass::doHWReset() {
-  digitalWrite(PIN_ESP8285_RST, LOW);       // Hold ESP8285 in reset
+  digitalWrite(PIN_ESP_RST, LOW);       // Hold ESP in reset
  delay(1);
-  digitalWrite(PIN_ESP8285_RST, HIGH);      // Release ESP8285 reset
+  digitalWrite(PIN_ESP_RST, HIGH);      // Release ESP reset
 }

 // Set the mode flag high to indicate normal run operation and do a HW
 // reset.
-void Challenger2040WiFiClass::runReset() {  // Prepare ESP8285 for normal op
-  digitalWrite(PIN_ESP8285_MODE, HIGH);     // Prepare for normal start
+void Challenger2040WiFiClass::runReset() {  // Prepare ESP for normal op
+  digitalWrite(PIN_ESP_MODE, HIGH);     // Prepare for normal start
  doHWReset();
 }

 // Set the mode flag low to indicate flash operation and do a HW
 // reset.
-void Challenger2040WiFiClass::flashReset() { // Prepare ESP8285 for flashing
-  digitalWrite(PIN_ESP8285_MODE, LOW);       // Prepare for normal start
+void Challenger2040WiFiClass::flashReset() { // Prepare ESP for flashing
+  digitalWrite(PIN_ESP_MODE, LOW);       // Prepare for normal start
  doHWReset();
 }

@@ -55,53 +57,82 @@ void Challenger2040WiFiClass::flashReset() { // Prepare ESP8285 for flashing
 bool Challenger2040WiFiClass::waitForReady() {
  int timeout = 20;                         // Aprox max 2 sec

-  Serial2.begin(DEFAULT_ESP8285_BAUDRATE);
-  Serial2.setTimeout(100);
-  String rdy = Serial2.readStringUntil('\n');
+  _serial->setTimeout(100);
+  String rdy = _serial->readStringUntil('\n');
  while(!rdy.startsWith("ready") && timeout--) {
-    rdy = Serial2.readStringUntil('\n');
+    rdy = _serial->readStringUntil('\n');
  }
-  Serial2.setTimeout(1000);  // Reset default timeout to 1000
+  _serial->setTimeout(1000);  // Reset default timeout to 1000
  if (timeout)
    return true;
  return false;
 }

-// Reset the ESP8285 and wait for the "ready" prompt to be returned.
+// Reset the ESP and wait for the "ready" prompt to be returned.
 bool Challenger2040WiFiClass::reset() {
  runReset();
+  _serial->begin(DEFAULT_ESP_BAUDRATE);
  return waitForReady();
 }

 // Checks to see if the modem responds to the "AT" poll command.
 bool Challenger2040WiFiClass::isAlive() {
-  int timeout = 5;
+  int timeout = 100;

-  Serial2.setTimeout(250);
-  Serial2.println(F("AT"));
-  String rdy = Serial2.readStringUntil('\n');
+  _serial->setTimeout(250);
+  _serial->println(F("AT"));
+  String rdy = _serial->readStringUntil('\n');
  while(!rdy.startsWith(F("OK")) && timeout--) {
-    rdy = Serial2.readStringUntil('\n');
+    _serial->println(F("AT"));
+    rdy = _serial->readStringUntil('\n');
  }
-  Serial2.setTimeout(1000);
+  _serial->setTimeout(1000);

  if (timeout)
    return true;
  return false;
 }

-// Change the baud rate of the ESP8285 as well as the local UART.
+// Change the baud rate of the ESP device as well as the local UART.
 // No checking is done on the input baud rate so the user must know what
-// baud rates are valid. The function ends by checking if the ESP8285 is
+// baud rates are valid. The function ends by checking if the ESP is
 // reachable by doing an "AT" poll.
 bool Challenger2040WiFiClass::changeBaudRate(int baud) {
-  Serial2.print(F("AT+UART_CUR="));
-  Serial2.print(baud);
-  Serial2.println(F(",8,1,0,0"));
+  _serial->print(F("AT+UART_CUR="));
+  _serial->print(baud);
+  _serial->println(F(",8,1,0,0"));
  delay(100);
-  Serial2.end();
-  Serial2.begin(baud);
+  _serial->end();
+  _serial->begin(baud);
  return isAlive();
 }

+// This method should be called id the builtin object isn't needed any more
+// It basically just releases the UART pins for other use.
+void Challenger2040WiFiClass::release() {
+  _serial->end();
+}
+
+// We can assign a new hardware serial port to accommodate the ESP device here.
+// The function will release the previously used serial port and assign the
+// new port. The ESP will be left in a reset state ready to start normal
+// operation when exiting the function.
+// This function is useful for when using the PIO serial ports to communicate
+// with the ESP instead of the built in hardware serial port.
+void Challenger2040WiFiClass::setSerial(HardwareSerial* serial) {
+
+  release();
+  _serial = serial;
+
+  pinMode(PIN_ESP_RST, OUTPUT);
+  digitalWrite(PIN_ESP_RST, LOW);       // Hold ESP in reset
+  pinMode(PIN_ESP_MODE, OUTPUT);
+  digitalWrite(PIN_ESP_MODE, HIGH);     // Prepare for normal start
+}
+
+// Return the current serial object
+HardwareSerial* Challenger2040WiFiClass::getSerial() {
+  return _serial;
+}
+
 Challenger2040WiFiClass Challenger2040WiFi;
@@ -1,7 +1,7 @@
 /*
-    ESP8285 helper class for the Challenger RP2040 WiFi boards
+    ESP8285/ESP32C3 helper class for the Challenger RP2040 WiFi enabled boards

-    Copyright (c) 2021 P. Oldberg <pontus@ilabs.se>
+    Copyright (c) 2021,2022 P. Oldberg <pontus@ilabs.se>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -17,20 +17,27 @@
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
 #pragma once

-#define DEFAULT_ESP8285_BAUDRATE      115200
+#define DEFAULT_ESP8285_BAUDRATE    115200
+#define DEFAULT_ESP_BAUDRATE        DEFAULT_ESP8285_BAUDRATE

 class Challenger2040WiFiClass {
  public:
-    Challenger2040WiFiClass();
+    Challenger2040WiFiClass(HardwareSerial* = &ESP_SERIAL_PORT);
    void doHWReset();
    void runReset();
    void flashReset();
    bool waitForReady();
    bool reset();
    bool isAlive();
-    bool changeBaudRate(int baud);
+    bool changeBaudRate(int);
+    void release();
+    void setSerial(HardwareSerial*);
+    HardwareSerial* getSerial();
+  private:
+    HardwareSerial* _serial;
 };

 extern Challenger2040WiFiClass Challenger2040WiFi;
@@ -1,7 +1,5 @@
 #pragma once

-#include <ChallengerWiFi.h>
-
 #define PINS_COUNT          (24u)
 #define NUM_DIGITAL_PINS    (24u)
 #define NUM_ANALOG_INPUTS   (4u)
@@ -20,6 +18,13 @@
 #define PIN_SERIAL2_RX      (5u)
 #define PIN_ESP8285_RST     (19u)
 #define PIN_ESP8285_MODE    (13u)
+#define ESP8285_SERIAL      Serial2
+// Uart define esp serial abstraction pins
+#define PIN_ESP_TX          PIN_SERIAL2_TX
+#define PIN_ESP_RX          PIN_SERIAL2_RX
+#define PIN_ESP_RST         PIN_ESP8285_RST
+#define PIN_ESP_MODE        PIN_ESP8285_MODE
+#define ESP_SERIAL_PORT     ESP8285_SERIAL

 // SPI
 #define PIN_SPI0_MISO       (24u)
Author	SHA1	Message	Date
Earle F. Philhower, III	cfaae84813	Update version	2022-06-28 15:07:55 -07:00
Earle F. Philhower, III	da8ab1e9dd	Return # of bytes written by SerialUSB::write (#662 ) Before always returned 0 on a ::write. Now properly return the count of bytes that were sent to the USB port. Thanks to Terry Haas for the report.	2022-06-28 13:01:06 -07:00
Maximilian Gerhardt	baf65f510f	Add notes on TinyUSB documentation and quirks (#659 ) Fixes #648	2022-06-26 15:26:23 -07:00
Maximilian Gerhardt	13f68fbc64	Make TinyUSB linking work automatically with PIO (#658 )	2022-06-26 13:24:55 -07:00
Stefan Staub	3071b3f2dd	Update GPIO docs (digital.rst) (#656 )	2022-06-25 10:00:29 -07:00
Earle F. Philhower, III	de069cf8c9	Update version	2022-06-24 11:25:21 -07:00
Earle F. Philhower, III	8cf8923a18	Update to Adafruit_TinyUSB_Arduino 1.12.0 (#654 ) * Update to Adafruit_TinyUSB_Arduino 1.12.0 * DualRole requires add'l libraries, skip in CI	2022-06-24 11:24:31 -07:00
Earle F. Philhower, III	d954510c9d	Update to latest pico-sdk develop branch (#653 ) Fixes #651	2022-06-24 02:19:24 -07:00
Earle F. Philhower, III	8966a9b094	Actually pass in the PIO key for auto-publishing (#652 ) Need to manually list the secrets to export to the environment.	2022-06-23 17:12:21 -07:00
Earle F. Philhower, III	3d9611d020	Update FreeRTOS SMP branch to latest upstream (#649 )	2022-06-22 17:18:50 -07:00
Earle F. Philhower, III	78b7f26076	Update README.md	2022-06-20 19:17:52 -07:00
Earle F. Philhower, III	7233c39166	Update to latest pico-sdk, allow lock.c->lock.cpp (#646 ) Minor change to keep the core all CPP. Patch just made it into pico-sdk develop branch allowing recursive mutexes to be auto_init in C++. Update and rebuild libpico.a.	2022-06-20 11:14:31 -07:00
Earle F. Philhower, III	0ee072671b	Update version	2022-06-20 08:30:24 -07:00
Earle F. Philhower, III	1130007761	Make mutexes init in DATA, not ((counstructor)) (#645 ) There was a race condition in making mutexes that were only init in an __attribute((constructor)) code block. For example, a global object might do a `malloc` in its constructor which would depend on the malloc mutex...which may not yet have been initted. Make them initted in the .data section, instead, which is guaranteed good before any global constructors are called.	2022-06-20 08:29:08 -07:00
Earle F. Philhower, III	a0060d9c3a	Add dependency file generation to build (#644 ) Fixes #643	2022-06-20 07:50:28 -07:00
Earle F. Philhower, III	66eb0613b0	Major multicore fixes Newlib and FreeRTOS (#640 ) Instead of wrapping the memory functions in the link stage, rebuild Newlib and enable retargetable locks. Override the weak definitions in the libc.a with our own, SDK based ones. The wrapping utilized before catches app-level memory allocations but misses allocations inside Newlib libc (like printf/etc.). Each core needs its own _impure_ptr or else crashes like the one seen in parallel printf_floats can happen. Enable it in the toolchain build and implement a simple swapper here. FreeRTOS SMP doesn't support Newlib's dynamic reent which is needed to allow save MT support. Minor patch to FreeRTOS and update the FreeRTOS variant.cpp and setup to support it.	2022-06-20 07:35:30 -07:00
Earle F. Philhower, III	af8f544913	Update pio publish to match PIO PR build (#641 )	2022-06-19 09:14:08 -07:00
Earle F. Philhower, III	803184c164	Update to latest Adafruit_TinyUSB (#639 ) Fixes #582	2022-06-19 08:57:14 -07:00
Earle F. Philhower, III	857f91771f	Update to develop branch of pico-sdk (#636 ) The realloc() wrapper was included in the develop branch of pico-sdk, so use it instead of a local, unreproducible version of the SDK. Should have no effect on code.	2022-06-17 12:13:01 -07:00
Maximilian Gerhardt	592418d9f3	Minor PIO Docs Fixup (#635 ) * Fix link display in PlatformIO Docs, Remove JLink warning * Remove unfinished sentence	2022-06-17 09:49:51 -07:00
Maximilian Gerhardt	0a23dfeb42	Update PlatformIO board files, add PIO CI (#634 ) * Shift arduino attribute higher in JSON file * Try out PlatformIO CI * Trigger CI * Clone recursively, actually use own repo * Fix YAML * Build Verbose * Revert to checkout@v2 version, add TinyUSB to examples * Try fix TInyUSB example * Pull repo recursively * Use v3 after all, correct path to example * Only do CI on PR	2022-06-17 08:57:18 -07:00
Maximilian Gerhardt	4a94677ee5	Update PlatformIO builder script and docs (#633 ) * Update board generation, use renamed function * Update documentation with new platform integration state * Remove accidentally pushed file * Use correct update command * Use correct highlighting * Use correct language * Add section on debugging * Add docs on filesystem, minor corrections * Use -iprefix in compilation, but still expose all include paths to IDE * Add exception and RTTI support, document them * Fix typo	2022-06-16 18:59:46 -07:00
mnltake	3414b73172	Add analogReadResolution() docs (#631 )	2022-06-16 08:16:58 -07:00
Pontus Oldberg	3bcbb24603	Updated helper class for Challenger NB board. (#629 )	2022-06-15 09:16:47 -07:00
Ha Thach	26752f6f90	Aadd f_cpu 120, 240 mhz option (#628 )	2022-06-15 09:12:43 -07:00
Earle F. Philhower, III	8999ec2c7a	Add Platform.IO publish to release process	2022-06-14 13:07:19 -07:00
Earle F. Philhower, III	778cf4cb9e	Update version	2022-06-14 12:34:22 -07:00
Earle F. Philhower, III	b6a9e756e4	Remove unneeded and invalid file changes The makever script sets up the repo properly, so no need to patch things in the package stage.	2022-06-14 12:32:26 -07:00