Update pins_arduino.h for challenger_2040_wifi (#356 )

Adding definitions for internal reset and mode pins for ESP8285.
Add WIZnet W5100S-EVB-Pico board (#355 )
2021-12-01 08:08:37 -08:00 · 2021-11-30 17:11:08 -08:00 · 2021-11-30 17:06:58 -08:00 · 2021-11-28 09:00:14 -08:00 · 2021-11-02 08:54:47 -07:00 · 2021-10-29 08:22:27 -07:00
59 changed files with 6207 additions and 793 deletions
@@ -37,6 +37,8 @@ jobs:
    - name: Check boards.txt was not edited after makeboards.py
      run: |
        ./tools/makeboards.py > boards.txt
+        # If anything changed, GIT should return an error and fail the test
+        git diff --exit-code
    - name: Run astyle on all code/examples
      run: |
        sudo apt update
@@ -18,7 +18,13 @@ See https://arduino-pico.readthedocs.io/en/latest/ along with the examples for m
 * Adafruit STEMMA Friend RP2040
 * Adafruit Trinkey RP2040 QT
 * Arduino Nano RP2040 Connect (preliminary)
+* Cytron Maker Pi RP2040
+* Invector Labs Challenger RP2040 WiFi
+* Invector Labs Challenger RP2040 LTE
+* Melopero Shake RP2040
 * SparkFun ProMicro RP2040
+* uPesy RP2040 DevKit
+* WIZnet W5100S-EVB-Pico
 * Generic (configurable flash, I/O pins)

 # Installing via Arduino Boards Manager
@@ -102,8 +108,25 @@ The first line creates a file with the USB vendor and ID of the Picoprobe and te

 Once Picoprobe permissions are set up properly, then select the board "Raspberry Pi Pico (Picoprobe)" in the Tools menu and upload as normal.

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

 # Features
 * Adafruit TinyUSB Arduino (USB mouse, keyboard, flash drive, generic HID, CDC Serial, MIDI, WebUSB, others)
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "hardware/regs/m0plus.h"
-#include "hardware/platform_defs.h"
-#include "hardware/regs/addressmap.h"
-#include "hardware/regs/sio.h"
-#include "pico/binary_info/defs.h"
-
-#ifdef NDEBUG
-#ifndef COLLAPSE_IRQS
-#define COLLAPSE_IRQS
-#endif
-#endif
-
-.syntax unified
-.cpu cortex-m0plus
-.thumb
-
-.section .vectors, "ax"
-.align 2
-
-.global __vectors
-__vectors:
-.word __StackTop
-.word _reset_handler
-.word isr_nmi
-.word isr_hardfault
-.word isr_invalid // Reserved, should never fire
-.word isr_invalid // Reserved, should never fire
-.word isr_invalid // Reserved, should never fire
-.word isr_invalid // Reserved, should never fire
-.word isr_invalid // Reserved, should never fire
-.word isr_invalid // Reserved, should never fire
-.word isr_invalid // Reserved, should never fire
-.word isr_svcall
-.word isr_invalid // Reserved, should never fire
-.word isr_invalid // Reserved, should never fire
-.word isr_pendsv
-.word isr_systick
-.word isr_irq0
-.word isr_irq1
-.word isr_irq2
-.word isr_irq3
-.word isr_irq4
-.word isr_irq5
-.word isr_irq6
-.word isr_irq7
-.word isr_irq8
-.word isr_irq9
-.word isr_irq10
-.word isr_irq11
-.word isr_irq12
-.word isr_irq13
-.word isr_irq14
-.word isr_irq15
-.word isr_irq16
-.word isr_irq17
-.word isr_irq18
-.word isr_irq19
-.word isr_irq20
-.word isr_irq21
-.word isr_irq22
-.word isr_irq23
-.word isr_irq24
-.word isr_irq25
-.word isr_irq26
-.word isr_irq27
-.word isr_irq28
-.word isr_irq29
-.word isr_irq30
-.word isr_irq31
-
-// Declare a weak symbol for each ISR.
-// By default, they will fall through to the undefined IRQ handler below (breakpoint),
-// but can be overridden by C functions with correct name.
-
-.macro decl_isr_bkpt name
-.weak \name
-.type \name,%function
-.thumb_func
-\name:
-    bkpt #0
-.endm
-
-// these are separated out for clarity
-decl_isr_bkpt isr_invalid
-decl_isr_bkpt isr_nmi
-decl_isr_bkpt isr_hardfault
-decl_isr_bkpt isr_svcall
-decl_isr_bkpt isr_pendsv
-decl_isr_bkpt isr_systick
-
-.macro decl_isr name
-.weak \name
-.type \name,%function
-.thumb_func
-\name:
-.endm
-
-decl_isr isr_irq0
-decl_isr isr_irq1
-decl_isr isr_irq2
-decl_isr isr_irq3
-decl_isr isr_irq4
-decl_isr isr_irq5
-decl_isr isr_irq6
-decl_isr isr_irq7
-decl_isr isr_irq8
-decl_isr isr_irq9
-decl_isr isr_irq10
-decl_isr isr_irq11
-decl_isr isr_irq12
-decl_isr isr_irq13
-decl_isr isr_irq14
-decl_isr isr_irq15
-decl_isr isr_irq16
-decl_isr isr_irq17
-decl_isr isr_irq18
-decl_isr isr_irq19
-decl_isr isr_irq20
-decl_isr isr_irq21
-decl_isr isr_irq22
-decl_isr isr_irq23
-decl_isr isr_irq24
-decl_isr isr_irq25
-decl_isr isr_irq26
-decl_isr isr_irq27
-decl_isr isr_irq28
-decl_isr isr_irq29
-decl_isr isr_irq30
-decl_isr isr_irq31
-
-// All unhandled USER IRQs fall through to here
-.global __unhandled_user_irq
-.thumb_func
-__unhandled_user_irq:
-    bl __get_current_exception
-    subs r0, #16
-.global unhandled_user_irq_num_in_r0
-unhandled_user_irq_num_in_r0:
-    bkpt #0
-
-.section .reset, "ax"
-
-// This is the beginning of the image, which is entered from stage2 or bootrom USB MSD watchdog reboot
-
-// note if we are NO_FLASH then start: below is currently identical anyway, so save 4 bytes
-#if !PICO_NO_FLASH
-    // We simply install our own vector table and redirect through it
-    ldr r0, =__vectors
-    b __vector_entry
-#endif
-
-// ELF entry point generally called when we load an ELF via debugger
-.type _entry_point,%function
-.thumb_func
-.global _entry_point
-_entry_point:
-
-#if PICO_NO_FLASH
-    // non flash
-    ldr r0, =__vectors
-#else
-    // todo clear watchdog?
-    // When using flash, we install and use the ROM vector table to go thru regular bootrom/stage2 flash sequence
-    movs r0, #0
-#endif
-
-__vector_entry:
-    ldr r1, =(PPB_BASE + M0PLUS_CPUID_OFFSET)
-    str r0, [r1, #8]
-    ldmia r0!, {r1, r2}
-    msr msp, r1
-    bx r2
-
-// ----------------------------------------------------------------------------
-// Reset handler:
-// - initialises .data
-// - clears .bss
-// - calls runtime_init
-// - calls main
-// - calls exit (which should eventually hang the processor via _exit)
-
-.type _reset_handler,%function
-.thumb_func
-_reset_handler:
-    // Hang all cores except core 0
-    ldr r0, =(SIO_BASE + SIO_CPUID_OFFSET)
-    ldr r0, [r0]
-    cmp r0, #0
-    bne wait_for_vector
-
-    adr r4, data_cpy_table
-
-    // assume there is at least one entry
-1:
-    ldmia r4!, {r1-r3}
-    cmp r1, #0
-    beq 2f
-    bl data_cpy
-    b 1b
-2:
-
-    // Zero out the BSS
-    ldr r1, =__bss_start__
-    ldr r2, =__bss_end__
-    movs r0, #0
-    b bss_fill_test
-bss_fill_loop:
-    stm r1!, {r0}
-bss_fill_test:
-    cmp r1, r2
-    bne bss_fill_loop
-
-platform_entry: // symbol for stack traces
-    // Use 32-bit jumps, in case these symbols are moved out of branch range
-    // (e.g. if main is in SRAM and crt0 in flash)
-    ldr r1, =runtime_init
-    blx r1
-    ldr r1, =main
-    blx r1
-    ldr r1, =exit
-    blx r1
-    // exit should not return.  If it does, hang the core.
-    // (fall thru into our hang _exit impl
-.weak _exit
-.type _exit,%function
-.thumb_func
-_exit:
-1: // separate label because _exit can be moved out of branch range
-    bkpt #0
-    b 1b
-
-data_cpy_loop:
-    ldm r1!, {r0}
-    stm r2!, {r0}
-data_cpy:
-    cmp r2, r3
-    blo data_cpy_loop
-    bx lr
-
-#if !PICO_NO_BINARY_INFO
-binary_info_header:
-.word BINARY_INFO_MARKER_START
-.word __binary_info_start
-.word __binary_info_end
-.word data_cpy_table // we may need to decode pointers that are in RAM at runtime.
-.word BINARY_INFO_MARKER_END
-#endif
-
-.align 2
-data_cpy_table:
-#if PICO_COPY_TO_RAM
-.word __ram_text_source__
-.word __ram_text_start__
-.word __ram_text_end__
-#endif
-.word __etext
-.word __data_start__
-.word __data_end__
-
-.word __scratch_x_source__
-.word __scratch_x_start__
-.word __scratch_x_end__
-
-.word __scratch_y_source__
-.word __scratch_y_start__
-.word __scratch_y_end__
-
-.word 0 // null terminator
-
-// ----------------------------------------------------------------------------
-// Provide safe defaults for _exit and runtime_init
-// Full implementations usually provided by platform.c
-
-.weak runtime_init
-.type runtime_init,%function
-.thumb_func
-runtime_init:
-    bx lr
-
-// ----------------------------------------------------------------------------
-// In case core 1's VTOR has already been moved into flash, we need to handle
-// core 1 reset. However, we do so by just jumping back into bootrom version of
-// wait_for_vector
-
-wait_for_vector:
-    ldr r0, = 'W' | ('V' << 8)
-    bl rom_func_lookup
-    bx r0
-
-.global __get_current_exception
-.thumb_func
-__get_current_exception:
-    mrs  r0, ipsr
-    uxtb r0, r0
-    bx   lr
-
-// ----------------------------------------------------------------------------
-// Stack/heap dummies to set size
-
-.section .stack
-// align to allow for memory protection (although this alignment is pretty much ignored by linker script)
-.align 5
-    .equ StackSize, PICO_STACK_SIZE
-.space StackSize
-
-.section .heap
-.align 2
-    .equ HeapSize, PICO_HEAP_SIZE
-.space HeapSize
@@ -21,6 +21,8 @@
 #include <hardware/clocks.h>
 #include <hardware/irq.h>
 #include <hardware/pio.h>
+#include <hardware/exception.h>
+#include <hardware/structs/systick.h>
 #include <pico/multicore.h>
 #include <pico/util/queue.h>
 #include <CoreMutex.h>
@@ -114,8 +116,21 @@ private:
    static constexpr int _GOTOSLEEP = 0x66666666;
 };

+class RP2040;
+extern RP2040 rp2040;
 class RP2040 {
 public:
+    RP2040() {
+        _epoch = 0;
+        // Enable SYSTICK exception
+        exception_set_exclusive_handler(SYSTICK_EXCEPTION, _SystickHandler);
+        systick_hw->csr = 0x7;
+        systick_hw->rvr = 0x00FFFFFF;
+    }
+
+    ~RP2040() { /* noop */ }
+
+
    // Convert from microseconds to PIO clock cycles
    static int usToPIOCycles(int us) {
        // Parenthesis needed to guarantee order of operations to avoid 32bit overflow
@@ -127,18 +142,44 @@ public:
        return clock_get_hz(clk_sys);
    }

+    // Get CPU cycle count.  Needs to do magic to extens 24b HW to something longer
+    volatile uint64_t _epoch = 0;
+    inline uint32_t getCycleCount() {
+        uint32_t epoch;
+        uint32_t ctr;
+        do {
+            epoch = (uint32_t)_epoch;
+            ctr = systick_hw->cvr;
+        } while (epoch != (uint32_t)_epoch);
+        return epoch + (1 << 24) - ctr; /* CTR counts down from 1<<24-1 */
+    }
+
+    inline uint64_t getCycleCount64() {
+        uint64_t epoch;
+        uint64_t ctr;
+        do {
+            epoch = _epoch;
+            ctr = systick_hw->cvr;
+        } while (epoch != _epoch);
+        return epoch + (1LL << 24) - ctr;
+    }
+
    void idleOtherCore() {
        fifo.idleOtherCore();
    }
+
    void resumeOtherCore() {
        fifo.resumeOtherCore();
    }

    // Multicore comms FIFO
    _MFIFO fifo;
-};

-extern RP2040 rp2040;
+private:
+    static void _SystickHandler() {
+        rp2040._epoch += 1LL << 24;
+    }
+};

 // Wrapper class for PIO programs, abstracting common operations out
 // TODO - Add unload/destructor
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef USE_TINYUSB
+#if !defined(USE_TINYUSB) && !defined(NO_USB)

 #include <Arduino.h>
 #include "CoreMutex.h"
@@ -122,32 +122,48 @@ int __USBGetMouseReportID() {
 }

 static uint8_t *GetDescHIDReport(int *len) {
+    static uint8_t *report = nullptr;
+    int report_len = 0;
+
+    if (report) {
+        free(report);
+        report = nullptr;
+    }
+
    if (__USBInstallKeyboard && __USBInstallMouse) {
-        static uint8_t desc_hid_report[] = {
+        uint8_t desc_hid_report[] = {
            TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(1)),
            TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(2))
        };
-        if (len) {
-            *len = sizeof(desc_hid_report);
+        report_len = sizeof(desc_hid_report);
+        report = (uint8_t *)malloc(report_len);
+        if (report) {
+            memcpy(report, desc_hid_report, report_len);
        }
-        return desc_hid_report;
    } else if (__USBInstallKeyboard && ! __USBInstallMouse) {
-        static uint8_t desc_hid_report[] = {
+        uint8_t desc_hid_report[] = {
            TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(1))
        };
-        if (len) {
-            *len = sizeof(desc_hid_report);
+        report_len = sizeof(desc_hid_report);
+        report = (uint8_t *)malloc(report_len);
+        if (report) {
+            memcpy(report, desc_hid_report, report_len);
        }
-        return desc_hid_report;
    } else { // if (!__USBInstallKeyboard && __USBInstallMouse) {
-        static uint8_t desc_hid_report[] = {
+        uint8_t desc_hid_report[] = {
            TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(1))
        };
-        if (len) {
-            *len = sizeof(desc_hid_report);
+        report_len = sizeof(desc_hid_report);
+        report = (uint8_t *)malloc(report_len);
+        if (report) {
+            memcpy(report, desc_hid_report, report_len);
        }
-        return desc_hid_report;
    }
+
+    if (len) {
+        *len = report_len;
+    }
+    return report;
 }

 // Invoked when received GET HID REPORT DESCRIPTOR
@@ -161,14 +177,14 @@ uint8_t const * tud_hid_descriptor_report_cb(uint8_t instance) {

 const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
    (void)index;
-    static uint8_t *usbd_desc_cfg;
+    static uint8_t *usbd_desc_cfg = nullptr;

    if (!usbd_desc_cfg) {
        bool hasHID = __USBInstallKeyboard || __USBInstallMouse;

        uint8_t interface_count = (__USBInstallSerial ? 2 : 0) + (hasHID ? 1 : 0) + (__USBInstallMIDI ? 2 : 0);

-        static uint8_t cdc_desc[TUD_CDC_DESC_LEN] = {
+        uint8_t cdc_desc[TUD_CDC_DESC_LEN] = {
            // Interface number, string index, protocol, report descriptor len, EP In & Out address, size & polling interval
            TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD, USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE)
        };
@@ -176,40 +192,42 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
        int hid_report_len;
        GetDescHIDReport(&hid_report_len);
        uint8_t hid_itf = __USBInstallSerial ? 2 : 0;
-        static uint8_t hid_desc[TUD_HID_DESC_LEN] = {
+        uint8_t hid_desc[TUD_HID_DESC_LEN] = {
            // Interface number, string index, protocol, report descriptor len, EP In & Out address, size & polling interval
            TUD_HID_DESCRIPTOR(hid_itf, 0, HID_ITF_PROTOCOL_NONE, hid_report_len, EPNUM_HID, CFG_TUD_HID_EP_BUFSIZE, 10)
        };

        uint8_t midi_itf = hid_itf + (hasHID ? 1 : 0);
-        static uint8_t midi_desc[TUD_MIDI_DESC_LEN] = {
+        uint8_t midi_desc[TUD_MIDI_DESC_LEN] = {
            // Interface number, string index, EP Out & EP In address, EP size
            TUD_MIDI_DESCRIPTOR(midi_itf, 0, EPNUM_MIDI, 0x80 | EPNUM_MIDI, 64)
        };

        int usbd_desc_len = TUD_CONFIG_DESC_LEN + (__USBInstallSerial ? sizeof(cdc_desc) : 0) + (hasHID ? sizeof(hid_desc) : 0) + (__USBInstallMIDI ? sizeof(midi_desc) : 0);

-        static uint8_t tud_cfg_desc[TUD_CONFIG_DESC_LEN] = {
+        uint8_t tud_cfg_desc[TUD_CONFIG_DESC_LEN] = {
            // Config number, interface count, string index, total length, attribute, power in mA
            TUD_CONFIG_DESCRIPTOR(1, interface_count, USBD_STR_0, usbd_desc_len, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA)
        };

        // Combine to one descriptor
        usbd_desc_cfg = (uint8_t *)malloc(usbd_desc_len);
-        bzero(usbd_desc_cfg, usbd_desc_len);
-        uint8_t *ptr = usbd_desc_cfg;
-        memcpy(ptr, tud_cfg_desc, sizeof(tud_cfg_desc));
-        ptr += sizeof(tud_cfg_desc);
-        if (__USBInstallSerial) {
-            memcpy(ptr, cdc_desc, sizeof(cdc_desc));
-            ptr += sizeof(cdc_desc);
-        }
-        if (hasHID) {
-            memcpy(ptr, hid_desc, sizeof(hid_desc));
-            ptr += sizeof(hid_desc);
-        }
-        if (__USBInstallMIDI) {
-            memcpy(ptr, midi_desc, sizeof(midi_desc));
+        if (usbd_desc_cfg) {
+            bzero(usbd_desc_cfg, usbd_desc_len);
+            uint8_t *ptr = usbd_desc_cfg;
+            memcpy(ptr, tud_cfg_desc, sizeof(tud_cfg_desc));
+            ptr += sizeof(tud_cfg_desc);
+            if (__USBInstallSerial) {
+                memcpy(ptr, cdc_desc, sizeof(cdc_desc));
+                ptr += sizeof(cdc_desc);
+            }
+            if (hasHID) {
+                memcpy(ptr, hid_desc, sizeof(hid_desc));
+                ptr += sizeof(hid_desc);
+            }
+            if (__USBInstallMIDI) {
+                memcpy(ptr, midi_desc, sizeof(midi_desc));
+            }
        }
    }
    return usbd_desc_cfg;
@@ -277,6 +295,7 @@ void __USBStart() {
    }

    mutex_init(&__usb_mutex);
+
    tusb_init();

    irq_set_exclusive_handler(USB_TASK_IRQ, usb_irq);
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef USE_TINYUSB
+#if !defined(USE_TINYUSB) && !defined(NO_USB)

 #include <Arduino.h>
 #include "CoreMutex.h"
@@ -1,90 +0,0 @@
-/*
-    The MIT License (MIT)
-
-    Copyright (c) 2018, hathach for Adafruit
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-*/
-
-#ifndef _TUSB_CONFIG_H_
-#define _TUSB_CONFIG_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//--------------------------------------------------------------------
-// COMMON CONFIGURATION
-//--------------------------------------------------------------------
-#ifdef USE_TINYUSB
-#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
-#else
-#define CFG_TUSB_RHPORT0_MODE       OPT_MODE_NONE
-#endif
-
-//#ifndef CFG_TUSB_MCU
-// #define CFG_TUSB_MCU                OPT_MCU_RP2040
-//#endif
-#define CFG_TUSB_OS                 OPT_OS_PICO
-
-#define CFG_TUSB_DEBUG              0
-//#if CFG_TUSB_DEBUG
-//  #define tu_printf                 serial1_printf
-//  extern int serial1_printf(const char *__restrict __format, ...);
-//#endif
-
-#define CFG_TUSB_MEM_SECTION
-#define CFG_TUSB_MEM_ALIGN          TU_ATTR_ALIGNED(4)
-
-//--------------------------------------------------------------------
-// DEVICE CONFIGURATION
-//--------------------------------------------------------------------
-
-#define CFG_TUD_ENDOINT0_SIZE       64
-
-//------------- CLASS -------------//
-#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
-
-// CDC FIFO size of TX and RX
-#define CFG_TUD_CDC_RX_BUFSIZE      256
-#define CFG_TUD_CDC_TX_BUFSIZE      256
-
-// MSC Buffer size of Device Mass storage
-#define CFG_TUD_MSC_BUFSIZE         512
-
-// HID buffer size Should be sufficient to hold ID (if any) + Data
-#define CFG_TUD_HID_BUFSIZE         64
-
-// MIDI FIFO size of TX and RX
-#define CFG_TUD_MIDI_RX_BUFSIZE     128
-#define CFG_TUD_MIDI_TX_BUFSIZE     128
-
-// Vendor FIFO size of TX and RX
-#define CFG_TUD_VENDOR_RX_BUFSIZE   64
-#define CFG_TUD_VENDOR_TX_BUFSIZE   64
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _TUSB_CONFIG_H_ */
@@ -61,6 +61,7 @@ extern "C" int main() {
    mutex_init(&_pioMutex);
    initVariant();

+#ifndef NO_USB
 #ifdef USE_TINYUSB
    TinyUSB_Device_Init(0);

@@ -72,11 +73,13 @@ extern "C" int main() {
    Serial.begin(115200);
 #endif
 #endif
-
-#if defined DEBUG_RP2040_PORT
-    DEBUG_RP2040_PORT.begin();
 #endif

+#if defined DEBUG_RP2040_PORT
+    DEBUG_RP2040_PORT.begin(115200);
+#endif
+
+#ifndef NO_USB
    if (setup1 || loop1) {
        rp2040.fifo.begin(2);
        multicore_launch_core1(main1);
@@ -84,6 +87,7 @@ extern "C" int main() {
        rp2040.fifo.begin(1);
    }
    rp2040.fifo.registerCore();
+#endif

    setup();
    while (true) {
@@ -30,6 +30,8 @@ static uint32_t analogScale = 255;
 static uint16_t analogFreq = 1000;
 static bool pwmInitted = false;
 static bool adcInitted = false;
+static uint16_t analogWritePseudoScale = 1;
+static uint16_t analogWriteSlowScale = 1;

 auto_init_mutex(_dacMutex);

@@ -77,6 +79,21 @@ extern "C" void analogWrite(pin_size_t pin, int val) {
        return;
    }
    if (!pwmInitted) {
+        // For low frequencies, we need to scale the output max value up to achieve lower periods
+        analogWritePseudoScale = 1;
+        while (((clock_get_hz(clk_sys) / (float)(analogScale * analogFreq)) > 255.0) && (analogScale < 32678)) {
+            analogWritePseudoScale++;
+            analogScale *= 2;
+            DEBUGCORE("Adjusting analogWrite values PS=%d, scale=%d\n", analogWritePseudoScale, analogScale);
+        }
+        // For high frequencies, we need to scale the output max value down to actually hit the frequency target
+        analogWriteSlowScale = 1;
+        while (((clock_get_hz(clk_sys) / (float)(analogScale * analogFreq)) < 2.0) && (analogScale > 32)) {
+            analogWriteSlowScale++;
+            analogScale /= 2;
+            DEBUGCORE("Adjusting analogWrite values SS=%d, scale=%d\n", analogWriteSlowScale, analogScale);
+        }
+
        pwm_config c = pwm_get_default_config();
        pwm_config_set_clkdiv(&c, clock_get_hz(clk_sys) / (float)(analogScale * analogFreq));
        pwm_config_set_wrap(&c, analogScale);
@@ -86,6 +103,9 @@ extern "C" void analogWrite(pin_size_t pin, int val) {
        pwmInitted = true;
    }

+    val <<= analogWritePseudoScale;
+    val >>= analogWriteSlowScale;
+
    if (val < 0) {
        val = 0;
    } else if ((uint32_t)val > analogScale) {
@@ -101,7 +121,10 @@ auto_init_mutex(_adcMutex);
 extern "C" int analogRead(pin_size_t pin) {
    CoreMutex m(&_adcMutex);

-    if ((pin < A0) || (pin > A3) || !m) {
+    pin_size_t maxPin = max(A0, A3);
+    pin_size_t minPin = min(A0, A3);
+
+    if ((pin < minPin) || (pin > maxPin) || !m) {
        DEBUGCORE("ERROR: Illegal analogRead pin (%d)\n", pin);
        return 0;
    }
@@ -109,7 +132,7 @@ extern "C" int analogRead(pin_size_t pin) {
        adc_init();
    }
    adc_gpio_init(pin);
-    adc_select_input(pin - A0);
+    adc_select_input(pin - minPin);
    return adc_read();
 }

@@ -28,6 +28,7 @@ extern "C" void pinMode(pin_size_t ulPin, PinMode ulMode) {
    case INPUT:
        gpio_init(ulPin);
        gpio_set_dir(ulPin, false);
+        gpio_disable_pulls(ulPin);
        break;
    case INPUT_PULLUP:
        gpio_init(ulPin);
@@ -38,7 +38,7 @@ extern "C" unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeo
    }

    // Wait for assert
-    while ((!!gpio_get(pin) != !state) && (time_us_64() < abort));
+    while ((!!gpio_get(pin) != !!state) && (time_us_64() < abort));
    uint64_t begin = time_us_64();
    if (begin >= abort) {
        return 0;
@@ -20,6 +20,8 @@ For the latest version, always check https://github.com/earlephilhower/arduino-p
   Installation <install>
   IDE Menus <ide>

+   Platform.IO Integration <platformio>
+
   Pin (Re)Assignment <pins>

   Analog I/O <analog>
@@ -135,6 +135,25 @@ The first line creates a file with the USB vendor and ID of the Picoprobe and te

 Once Picoprobe permissions are set up properly, then select the board "Raspberry Pi Pico (Picoprobe)" in the Tools menu and upload as normal.

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

        ::setSCK(pin)
+        ::setCS(pin)
        ::setRX(pin)
        ::setTX(pin)

@@ -0,0 +1,219 @@
+Using this core with PlatformIO
+===============================
+
+What is PlatformIO? 
+-------------------
+
+`PlatformIO <https://platformio.org/>`__  is a free, open-source build-tool written in Python, which also integrates into VSCode code as an extension.
+
+PlatformIO significantly simplifies writing embedded software by offering a unified build system, yet being able to create project files for many different IDEs, including VSCode, Eclipse, CLion, etc. 
+Through this, PlatformIO can offer extensive features such as IntelliSense (autocomplete), debugging, unit testing etc., which not available in the standard Arduino IDE.
+
+The Arduino IDE experience:
+
+.. image:: images/the_arduinoide_experience.png
+
+The PlatformIO experience:
+
+.. image:: images/the_platformio_experience.png
+
+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.
+
+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.
+
+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`` 
+
+.. code:: ini
+
+    [env:pico]
+    platform = raspberrypi
+    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.
+
+.. code:: ini
+
+    [env:pico]
+    platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+    board = pico
+    framework = arduino
+    ; 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.
+
+Selecting the new core
+----------------------
+
+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
+
+.. code:: ini
+
+    board_build.core = earlephilhower
+
+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>`__.
+
+Flash size
+----------
+
+Controlled via specifying the size allocated for the filesystem.
+Available sketch size is calculated accordingly by using (as in
+``makeboards.py``) that number and the (constant) EEPROM size (4096
+bytes) and the total flash size as known to PlatformIO via the board
+definition file. The expression on the right can involve "b","k","m"
+(bytes/kilobytes/megabytes) and floating point numbers. This makes it
+actually more flexible than in the Arduino IDE where there is a finite
+list of choices. Calculations happen in `the
+platform <https://github.com/maxgerhardt/platform-raspberrypi/blob/77e0d3a29d1dbf00fd3ec3271104e3bf4820869c/builder/main.py#L118-L184>`__.
+
+.. code:: ini
+
+    ; in reference to a board = pico config (2MB flash)
+    ; Flash Size: 2MB (Sketch: 1MB, FS:1MB)
+    board_build.filesystem_size = 1m
+    ; Flash Size: 2MB (No FS)
+    board_build.filesystem_size = 0m
+    ; Flash Size: 2MB (Sketch: 0.5MB, FS:1.5MB)
+    board_build.filesystem_size = 1.5m
+
+CPU Speed
+---------
+
+As for all other PlatformIO platforms, the ``f_cpu`` macro value (which
+is passed to the core) can be changed as
+`documented <https://docs.platformio.org/en/latest/boards/raspberrypi/pico.html#configuration>`__
+
+.. code:: ini
+
+    ; 133MHz
+    board_build.f_cpu = 133000000L
+
+Debug Port
+----------
+
+Via
+`build_flags <https://docs.platformio.org/en/latest/projectconf/section_env_build.html#build-flags>`__
+as done for many other cores
+(`example <https://docs.platformio.org/en/latest/platforms/ststm32.html#configuration>`__).
+
+.. code:: ini
+
+    ; Debug Port: Serial
+    build_flags = -DDEBUG_RP2040_PORT=Serial
+    ; Debug Port: Serial 1
+    build_flags = -DDEBUG_RP2040_PORT=Serial1
+    ; Debug Port: Serial 2
+    build_flags = -DDEBUG_RP2040_PORT=Serial2
+
+Debug Level
+-----------
+
+Done again by directly adding the needed `build
+flags <https://github.com/earlephilhower/arduino-pico/blob/05356da2c5552413a442f742e209c6fa92823666/boards.txt#L104-L114>`__.
+When wanting to define multiple build flags, they must be accumulated in
+either a sing line or a newline-separated expression.
+
+.. code:: ini
+
+    ; Debug level: Core
+    build_flags = -DDEBUG_RP2040_CORE
+    ; Debug level: SPI
+    build_flags = -DDEBUG_RP2040_SPI
+    ; Debug level: Wire
+    build_flags = -DDEBUG_RP2040_WIRE
+    ; Debug level: All
+    build_flags = -DDEBUG_RP2040_WIRE -DDEBUG_RP2040_SPI -DDEBUG_RP2040_CORE
+    ; Debug level: NDEBUG
+    build_flags = -DNDEBUG
+
+    ; example: Debug port on serial 2 and all debug output
+    build_flags = -DDEBUG_RP2040_WIRE -DDEBUG_RP2040_SPI -DDEBUG_RP2040_CORE -DDEBUG_RP2040_PORT=Serial2
+    ; equivalent to above
+    build_flags = 
+       -DDEBUG_RP2040_WIRE
+       -DDEBUG_RP2040_SPI
+       -DDEBUG_RP2040_CORE
+       -DDEBUG_RP2040_PORT=Serial2
+
+USB Stack
+---------
+
+Not specifying any special build flags regarding this gives one the
+default Pico SDK USB stack. To change it, add
+
+.. code:: ini
+
+    ; Adafruit TinyUSB
+    build_flags = -DUSE_TINYUSB
+    ; No USB stack
+    build_flags = -DPIO_FRAMEWORK_ARDUINO_NO_USB
+
+Note that the special "No USB" setting is also supported, through the
+shortcut-define ``PIO_FRAMEWORK_ARDUINO_NO_USB``.
+
+
+Selecting a different core version
+----------------------------------
+
+If you wish to use a different version of the core, e.g., the latest git
+``master`` version, you can use a
+`platform_packages <https://docs.platformio.org/en/latest/projectconf/section_env_platform.html#platform-packages>`__
+directive to do so. Simply specify that the framework package
+(``framework-arduinopico``) comes from a different source.
+
+.. code:: ini
+
+    platform_packages =
+       framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#master
+
+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.
+
+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.
+
+Examples 
+--------
+
+The following example ``platformio.ini`` can be used for a Raspberry Pi Pico
+and 0.5MByte filesystem. 
+
+.. code:: ini
+
+    [env:pico]
+    platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+    board = pico
+    framework = arduino
+    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.
@@ -9,12 +9,27 @@
 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################
-setup1  KEYWORD2
-loop2   KEYWORD2
+
+setup1	KEYWORD2
+loop2	KEYWORD2
+
 analogWriteFreq	KEYWORD2
 analogWriteRange	KEYWORD2
-analogWriteResolution KEYWORD2
+analogWriteResolution	KEYWORD2

-######################################
-# Constants (LITERAL1)
-#######################################
+push	KEYWORD2
+push_nb	KEYWORD2
+pop	KEYWORD2
+pop_nb	KEYWORD2
+
+rp2040	KEYWORD2
+RP2040	KEYWORD2
+usToPIOCycles	KEYWORD2
+f_cpu	KEYWORD2
+getCycleCount	KEYWORD2
+getCycleCount64	KEYWORD2
+idleOtherCore	KEYWORD2
+resumeOtherCore	KEYWORD2
+
+PIOProgram	KEYWORD2
+prepare	KEYWORD2
@@ -24,7 +24,7 @@
 MEMORY
 {
    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __FLASH_LENGTH__
-    RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 256k
+    RAM(rwx) : ORIGIN =  0x20000000, LENGTH = __RAM_LENGTH__
    SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
    SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k
 }
@@ -1,13 +1,11 @@
 -iwithprefixbefore/cores/rp2040/api/deprecated-avr-comp/
 -iwithprefixbefore/lib/pico_base/
-iwithprefixbefore/pico-examples/build/generated/pico_base
 -iwithprefixbefore/pico-extras/src/common/pico_audio/include
 -iwithprefixbefore/pico-extras/src/common/pico_util_buffer/include
 -iwithprefixbefore/pico-extras/src/rp2_common/pico_audio_i2s/include
 -iwithprefixbefore/pico-sdk/lib/tinyusb/src/
 -iwithprefixbefore/pico-sdk/src/boards/include
 -iwithprefixbefore/pico-sdk/src/common/pico_base/include
-iwithprefixbefore/pico-sdk/src/common/pico_base/include/
 -iwithprefixbefore/pico-sdk/src/common/pico_binary_info/include
 -iwithprefixbefore/pico-sdk/src/common/pico_bit_ops/include
 -iwithprefixbefore/pico-sdk/src/common/pico_divider/include
@@ -16,8 +14,6 @@
 -iwithprefixbefore/pico-sdk/src/common/pico_time/include
 -iwithprefixbefore/pico-sdk/src/common/pico_util/include
 -iwithprefixbefore/pico-sdk/src/rp2040/hardware_regs/include
-iwithprefixbefore/pico-sdk/src/rp2040/hardware_regs/include/
-iwithprefixbefore/pico-sdk/src/rp2040/hardware_regs/include/
 -iwithprefixbefore/pico-sdk/src/rp2040/hardware_structs/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_adc/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_base/include
@@ -25,10 +21,12 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_clocks/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_divider/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_dma/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_exception/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_flash/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_gpio/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_i2c/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_irq/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_rtc/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_pio/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_pll/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_pwm/include
@@ -36,7 +34,6 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_spi/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_sync/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_timer/include
-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_timer/include/
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_uart/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_vreg/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_watchdog/include
@@ -46,12 +43,9 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_float/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_int64_ops/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_multicore/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_multicore/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_platform/include/
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_printf/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_runtime/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_stdio/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_stdio_uart/include
-iwithprefixbefore/pico-sdk/src/rp2_common/pico_stdio_usb/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_unique_id/include
@@ -176,6 +176,9 @@ public:
    }

    bool begin() override {
+        if (_mounted) {
+            return true;
+        }
        if (_size <= 0) {
            DEBUGV("LittleFS size is <= zero");
            return false;
@@ -135,8 +135,8 @@ public:
    size_t size() {
        uint64_t sz = size64();
 #ifdef DEBUG_ESP_PORT
-        if (sz > (uint64_t)SIZE_MAX) {
-            DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld>= 4GB).  Please update source to use size64().\n"), sz);
+        if (sz > std::numeric_limits<uint32_t>::max()) {
+            DEBUG_ESP_PORT.printf_P(PSTR("WARNING: SD card size overflow (%lld >= 4GB).  Please update source to use size64().\n"), (long long)sz);
        }
 #endif
        return (size_t)sz;
@@ -191,9 +191,6 @@ private:


 // Expose FatStructs.h helpers for MS-DOS date/time for use with dateTimeCallback
-static inline uint16_t FAT_DATE(uint16_t year, uint8_t month, uint8_t day) {
-    return (year - 1980) << 9 | month << 5 | day;
-}
 static inline uint16_t FAT_YEAR(uint16_t fatDate) {
    return 1980 + (fatDate >> 9);
 }
@@ -203,9 +200,6 @@ static inline uint8_t FAT_MONTH(uint16_t fatDate) {
 static inline uint8_t FAT_DAY(uint16_t fatDate) {
    return fatDate & 0X1F;
 }
-static inline uint16_t FAT_TIME(uint8_t hour, uint8_t minute, uint8_t second) {
-    return hour << 11 | minute << 5 | second >> 1;
-}
 static inline uint8_t FAT_HOUR(uint16_t fatTime) {
    return fatTime >> 11;
 }
@@ -64,13 +64,13 @@ FileImplPtr SDFSImpl::open(const char* path, OpenMode openMode, AccessMode acces
        }
        free(pathStr);
    }
-    sdfat::File32 fd = _fs.open(path, flags);
+    File32 fd = _fs.open(path, flags);
    if (!fd) {
        DEBUGV("SDFSImpl::openFile: fd=%p path=`%s` openMode=%d accessMode=%d",
               &fd, path, openMode, accessMode);
        return FileImplPtr();
    }
-    auto sharedFd = std::make_shared<sdfat::File32>(fd);
+    auto sharedFd = std::make_shared<File32>(fd);
    return std::make_shared<SDFSFileImpl>(this, sharedFd, path);
 }

@@ -90,7 +90,7 @@ DirImplPtr SDFSImpl::openDir(const char* path)
    }
    // At this point we have a name of "/blah/blah/blah" or "blah" or ""
    // If that references a directory, just open it and we're done.
-    sdfat::File32 dirFile;
+    File32 dirFile;
    const char *filter = "";
    if (!pathStr[0]) {
        // openDir("") === openDir("/")
@@ -135,7 +135,7 @@ DirImplPtr SDFSImpl::openDir(const char* path)
        DEBUGV("SDFSImpl::openDir: path=`%s`\n", path);
        return DirImplPtr();
    }
-    auto sharedDir = std::make_shared<sdfat::File32>(dirFile);
+    auto sharedDir = std::make_shared<File32>(dirFile);
    auto ret = std::make_shared<SDFSDirImpl>(filter, this, sharedDir, pathStr);
    free(pathStr);
    return ret;
@@ -145,12 +145,12 @@ bool SDFSImpl::format() {
    if (_mounted) {
        return false;
    }
-    sdfat::SdCardFactory cardFactory;
-    sdfat::SdCard* card = cardFactory.newCard(sdfat::SdSpiConfig(_cfg._csPin, DEDICATED_SPI, _cfg._spiSettings));
+    SdCardFactory cardFactory;
+    SdCard* card = cardFactory.newCard(SdSpiConfig(_cfg._csPin, DEDICATED_SPI, _cfg._spiSettings));
    if (!card || card->errorCode()) {
        return false;
    }
-    sdfat::FatFormatter fatFormatter;
+    FatFormatter fatFormatter;
    uint8_t *sectorBuffer = new uint8_t[512];
    bool ret = fatFormatter.format(card, sectorBuffer, nullptr);
    delete[] sectorBuffer;
@@ -96,11 +96,11 @@ public:
            return false;
        }
        info.maxOpenFiles = 999; // TODO - not valid
-        info.blockSize = _fs.vol()->sectorsPerCluster() * _fs.vol()->bytesPerSector();
+        info.blockSize = _fs.vol()->bytesPerCluster();
        info.pageSize = 0; // TODO ?
        info.maxPathLength = 255; // TODO ?
        info.totalBytes =_fs.vol()->clusterCount() * info.blockSize;
-        info.usedBytes = info.totalBytes - (_fs.vol()->freeClusterCount() * _fs.vol()->sectorsPerCluster() * _fs.vol()->bytesPerSector());
+        info.usedBytes = info.totalBytes - (_fs.vol()->freeClusterCount() * _fs.vol()->bytesPerCluster());
        return true;
    }

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

    bool begin() override {
        if (_mounted) {
-            end();
+            return true;
        }
        _mounted = _fs.begin(_cfg._csPin, _cfg._spiSettings);
        if (!_mounted && _cfg._autoFormat) {
            format();
            _mounted = _fs.begin(_cfg._csPin, _cfg._spiSettings);
        }
-	sdfat::FsDateTime::setCallback(dateTimeCB);
+	FsDateTime::setCallback(dateTimeCB);
        return _mounted;
    }

@@ -184,7 +184,7 @@ public:
        return (totalClusters() / blocksPerCluster());
    }
    size_t clusterSize() {
-        return blocksPerCluster() * _fs.vol()->bytesPerSector();
+        return _fs.vol()->bytesPerCluster();
    }
    size_t size() {
        return (clusterSize() * totalClusters());
@@ -228,7 +228,7 @@ protected:
    friend class SDFileImpl;
    friend class SDFSDirImpl;

-    sdfat::SdFat* getFs()
+    SdFat* getFs()
    {
        return &_fs;
    }
@@ -245,16 +245,17 @@ protected:
        if (openMode & OM_TRUNCATE) {
            mode |= O_TRUNC;
        }
-        if (accessMode & AM_READ) {
+        if ((accessMode & (AM_READ | AM_WRITE)) == (AM_READ | AM_WRITE)) {
+            mode |= O_RDWR;
+        } else if (accessMode & AM_READ) {
            mode |= O_READ;
-        }
-        if (accessMode & AM_WRITE) {
+        } else if (accessMode & AM_WRITE) {
            mode |= O_WRITE;
        }
        return mode;
    }

-    sdfat::SdFat _fs;
+    SdFat _fs;
    SDFSConfig   _cfg;
    bool         _mounted;
 };
@@ -263,7 +264,7 @@ protected:
 class SDFSFileImpl : public FileImpl
 {
 public:
-    SDFSFileImpl(SDFSImpl *fs, std::shared_ptr<sdfat::File32> fd, const char *name)
+    SDFSFileImpl(SDFSImpl *fs, std::shared_ptr<File32> fd, const char *name)
        : _fs(fs), _fd(fd), _opened(true)
    {
        _name = std::shared_ptr<char>(new char[strlen(name) + 1], std::default_delete<char[]>());
@@ -379,7 +380,7 @@ public:
    time_t getLastWrite() override {
        time_t ftime = 0;
        if (_opened && _fd) {
-            sdfat::DirFat_t tmp;
+            DirFat_t tmp;
            if (_fd.get()->dirEntry(&tmp)) {
                ftime = SDFSImpl::FatToTimeT(*(uint16_t*)tmp.modifyDate, *(uint16_t*)tmp.modifyTime);
            }
@@ -390,7 +391,7 @@ public:
    time_t getCreationTime() override {
        time_t ftime = 0;
        if (_opened && _fd) {
-            sdfat::DirFat_t tmp;
+            DirFat_t tmp;
            if (_fd.get()->dirEntry(&tmp)) {
                ftime = SDFSImpl::FatToTimeT(*(uint16_t*)tmp.createDate, *(uint16_t*)tmp.createTime);
            }
@@ -399,16 +400,16 @@ public:
    }

 protected:
-    SDFSImpl*                     _fs;
-    std::shared_ptr<sdfat::File32>  _fd;
-    std::shared_ptr<char>         _name;
-    bool                          _opened;
+    SDFSImpl*                _fs;
+    std::shared_ptr<File32>  _fd;
+    std::shared_ptr<char>    _name;
+    bool                     _opened;
 };

 class SDFSDirImpl : public DirImpl
 {
 public:
-    SDFSDirImpl(const String& pattern, SDFSImpl* fs, std::shared_ptr<sdfat::File32> dir, const char *dirPath = nullptr)
+    SDFSDirImpl(const String& pattern, SDFSImpl* fs, std::shared_ptr<File32> dir, const char *dirPath = nullptr)
        : _pattern(pattern), _fs(fs), _dir(dir), _valid(false), _dirPath(nullptr)
    {
        if (dirPath) {
@@ -483,14 +484,14 @@ public:
    {
        const int n = _pattern.length();
        do {
-            sdfat::File32 file;
+            File32 file;
            file.openNext(_dir.get(), O_READ);
            if (file) {
                _valid = 1;
                _size = file.fileSize();
                _isFile = file.isFile();
                _isDirectory = file.isDir();
-                sdfat::DirFat_t tmp;
+                DirFat_t tmp;
                if (file.dirEntry(&tmp)) {
                    _time = SDFSImpl::FatToTimeT(*(uint16_t*)tmp.modifyDate, *(uint16_t*)tmp.modifyTime);
                    _creation = SDFSImpl::FatToTimeT(*(uint16_t*)tmp.createDate, *(uint16_t*)tmp.createTime);
@@ -515,17 +516,17 @@ public:
    }

 protected:
-    String                       _pattern;
-    SDFSImpl*                    _fs;
-    std::shared_ptr<sdfat::File32> _dir;
-    bool                         _valid;
-    char                         _lfn[64];
-    time_t                       _time;
-    time_t                       _creation;
-    std::shared_ptr<char>        _dirPath;
-    uint32_t                     _size;
-    bool                         _isFile;
-    bool                         _isDirectory;
+    String                  _pattern;
+    SDFSImpl*               _fs;
+    std::shared_ptr<File32> _dir;
+    bool                    _valid;
+    char                    _lfn[64];
+    time_t                  _time;
+    time_t                  _creation;
+    std::shared_ptr<char>   _dirPath;
+    uint32_t                _size;
+    bool                    _isFile;
+    bool                    _isDirectory;
 };

 }; // namespace sdfs
@@ -139,7 +139,6 @@ void TwoWire::begin(uint8_t addr) {
 }

 void TwoWire::onIRQ() {
-    Serial.printf("Wire.IRQ=%08x\n", _i2c->hw->intr_stat);
    if (_i2c->hw->intr_stat & (1 << 10)) {
        _buffLen = 0;
        _buffOff = 0;
@@ -182,6 +181,8 @@ void TwoWire::end() {
        return;
    }
    i2c_deinit(_i2c);
+    pinMode(_sda, INPUT);
+    pinMode(_scl, INPUT);
    _running = false;
    _txBegun = false;
 }
@@ -193,6 +194,7 @@ void TwoWire::beginTransmission(uint8_t addr) {
    }
    _addr = addr;
    _buffLen = 0;
+    _buffOff = 0;
    _txBegun = true;
 }

@@ -201,7 +203,10 @@ size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) {
        return 0;
    }

-    _buffLen = i2c_read_blocking_until(_i2c, address, _buff, quantity, !stopBit, make_timeout_time_ms(50));
+    _buffLen = i2c_read_blocking_until(_i2c, address, _buff, quantity, !stopBit, make_timeout_time_ms(_timeout));
+    if (_buffLen == PICO_ERROR_GENERIC) {
+        _buffLen = 0;
+    }
    _buffOff = 0;
    return _buffLen;
 }
@@ -289,7 +294,7 @@ uint8_t TwoWire::endTransmission(bool stopBit) {
        return _probe(_addr, _sda, _scl, _clkHz) ? 0 : 2;
    } else {
        auto len = _buffLen;
-        auto ret = i2c_write_blocking_until(_i2c, _addr, _buff, _buffLen, !stopBit, make_timeout_time_ms(50));
+        auto ret = i2c_write_blocking_until(_i2c, _addr, _buff, _buffLen, !stopBit, make_timeout_time_ms(_timeout));
        _buffLen = 0;
        return (ret == len) ? 0 : 4;
    }
@@ -0,0 +1,21 @@
+void setup() {
+  Serial.begin(115200);
+  delay(3000);
+  Serial.println("High precision timing measurements/delays can be built using");
+  Serial.println("rp2040.getCycleCount() and rp2040.getCycleCount64().\n");
+  uint32_t a = rp2040.getCycleCount();
+  delay(1000);
+  uint32_t b = rp2040.getCycleCount();
+  Serial.printf("There are %d cycles in one second.\n\n\n", b - a);
+
+  delay(3000);
+
+  Serial.println("Note that the (32-bit) getCycleCount() will wraparound in ~30 seconds.");
+  Serial.println("Using the 64-bit getCycleCount64() makes it practically infinite.");
+  Serial.printf("\n%15s - %15s\n", "getCycleCount", "getCycleCount64");
+}
+
+void loop() {
+  Serial.printf("%15u - %15llu\n", rp2040.getCycleCount(), rp2040.getCycleCount64());
+  delay(1500);
+}
@@ -1,6 +1,17 @@
 {
-    "name": "framework-arduinopico",
-    "description": "Arduino Wiring-based Framework (RPi Pico RP2040)",
-    "url": "https://github.com/esrlephilhower/arduino-pico",
-    "version": "0.9.2"
+  "name": "framework-arduinopico",
+  "version": "1.10905.0",
+  "description": "Arduino Wiring-based Framework (RPi Pico RP2040)",
+  "keywords": [
+    "framework",
+    "arduino",
+    "Cortex-M",
+    "Raspberry Pi",
+    "RP2040"
+  ],
+  "homepage": "https://arduino-pico.readthedocs.io/en/latest/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/earlephilhower/arduino-pico"
+  }
 }
@@ -41,9 +41,18 @@
                  {
                     "name": "Arduino Nano RP2040 Connect"
                  },
+                  {
+                     "name": "Cytron Maker Pi RP2040"
+                  },
                  {
                     "name": "SparkFun ProMicro RP2040"
                  },
+                  {
+                     "name": "Melopero Shake RP2040"
+                  },
+                  {
+                     "name": "uPesy RP2040 DevKit"
+                  },
                  {
                     "name": "Generic RP2040 Module"
                  }
@@ -51,22 +60,22 @@
               "toolsDependencies": [
                  {
                     "packager": "rp2040",
-                     "version": "1.2.0-a-407f016",
+                     "version": "1.3.1-a-7855b0c",
                     "name": "pqt-gcc"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.2.0-a-407f016",
+                     "version": "1.3.1-a-7855b0c",
                     "name": "pqt-mklittlefs"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.2.0-a-407f016",
+                     "version": "1.3.1-a-7855b0c",
                     "name": "pqt-elf2uf2"
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.2.0-a-407f016",
+                     "version": "1.3.1-a-7855b0c",
                     "name": "pqt-pioasm"
                  },
                  {
@@ -76,7 +85,7 @@
                  },
                  {
                     "packager": "rp2040",
-                     "version": "1.2.0-a-407f016",
+                     "version": "1.3.1-a-7855b0c",
                     "name": "pqt-openocd"
                  }
               ],
@@ -87,57 +96,57 @@
         ],
         "tools": [
            {
-               "version": "1.2.0-a-407f016",
+               "version": "1.3.1-a-7855b0c",
               "name": "pqt-openocd",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/aarch64-linux-gnu.openocd-d58c2ef5e.210607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.openocd-d58c2ef5e.210607.tar.gz",
-                     "checksum": "SHA-256:a85f1df05614ac0bba3742df0aa36b0a87b9bbef0fbadd4d0ccfa1938801ae98",
-                     "size": "6144933"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/aarch64-linux-gnu.openocd-e3428fadb.210706.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.openocd-e3428fadb.210706.tar.gz",
+                     "checksum": "SHA-256:62662b74a7cbbb5db0998987585d74a3261c3e6f0c1440d7449505832020e095",
+                     "size": "6224364"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/arm-linux-gnueabihf.openocd-d58c2ef5e.210607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.openocd-d58c2ef5e.210607.tar.gz",
-                     "checksum": "SHA-256:f79ffe70110512ce41c61477910e33fa5ef986fbc142aedfd89f7009f132b237",
-                     "size": "5849262"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/arm-linux-gnueabihf.openocd-e3428fadb.210706.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.openocd-e3428fadb.210706.tar.gz",
+                     "checksum": "SHA-256:15b188279382ee182253984ed45785f3a15387576583a1c6bff2c71d724ff76a",
+                     "size": "5931976"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-linux-gnu.openocd-d58c2ef5e.210607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.openocd-d58c2ef5e.210607.tar.gz",
-                     "checksum": "SHA-256:b4a8af73539ae2e2a653f8fbe029a5b52db80580c942f0399cafb7d3829498c0",
-                     "size": "5651754"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-linux-gnu.openocd-e3428fadb.210706.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.openocd-e3428fadb.210706.tar.gz",
+                     "checksum": "SHA-256:40a7a417b46875b2ccff582309b0e8ffcfd5c038ad1dc1775d53c683708c363c",
+                     "size": "5728004"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-w64-mingw32.openocd-d58c2ef5e.210607.zip",
-                     "archiveFileName": "i686-w64-mingw32.openocd-d58c2ef5e.210607.zip",
-                     "checksum": "SHA-256:7156af6e650df6fc4bfc8541f2f1fd05bfe136b3547b4a0aef91668af88f8b6d",
-                     "size": "8330281"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-w64-mingw32.openocd-e3428fadb.210706.zip",
+                     "archiveFileName": "i686-w64-mingw32.openocd-e3428fadb.210706.zip",
+                     "checksum": "SHA-256:945cf4b0de879b935e05af2f438a6964949fbbf6d163e96e507939c55cafbff0",
+                     "size": "8539935"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-apple-darwin14.openocd-d58c2ef5e.210607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.openocd-d58c2ef5e.210607.tar.gz",
-                     "checksum": "SHA-256:965e35faf4a93396c4f4a22a504fd6b4f639752922996447d5c1e0e65d7329de",
-                     "size": "1981786"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-apple-darwin14.openocd-e3428fadb.210706.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.openocd-e3428fadb.210706.tar.gz",
+                     "checksum": "SHA-256:b28b54580b16e6d7f0229a653acf68aeab8cc3270d8b9dcaf178b8b8c0aafcb7",
+                     "size": "2006182"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-linux-gnu.openocd-d58c2ef5e.210607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.openocd-d58c2ef5e.210607.tar.gz",
-                     "checksum": "SHA-256:c54390c9464bcf2a32265ecbafaec6d68cdd41471fa14ba4afabe43fe0a11645",
-                     "size": "6076479"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-linux-gnu.openocd-e3428fadb.210706.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.openocd-e3428fadb.210706.tar.gz",
+                     "checksum": "SHA-256:90aec3a7818697e04e798a0470133caf62e7583a48f7ae3848b9b536c3180b0b",
+                     "size": "6154827"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-w64-mingw32.openocd-d58c2ef5e.210607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.openocd-d58c2ef5e.210607.zip",
-                     "checksum": "SHA-256:4b481449371b39b4e0e87bd5e5a247f99c025b97ccd186c3b1ca58ff2cb44875",
-                     "size": "8719676"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-w64-mingw32.openocd-e3428fadb.210706.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.openocd-e3428fadb.210706.zip",
+                     "checksum": "SHA-256:86e0341d50723d5e0c2969a903e911273e3b70ed5b794284b7d7ec7a1f09ee2f",
+                     "size": "8929726"
                  }
               ]
            },
@@ -204,221 +213,221 @@
               ]
            },
            {
-               "version": "1.2.0-a-407f016",
+               "version": "1.3.1-a-7855b0c",
               "name": "pqt-gcc",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/aarch64-linux-gnu.arm-none-eabi-407f016.210607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-407f016.210607.tar.gz",
-                     "checksum": "SHA-256:fc30b07b98fe965db814178b71f368895790f6789d503d71c8af70ff92451d5c",
-                     "size": "103186508"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/aarch64-linux-gnu.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "checksum": "SHA-256:32f2a28e0f12bd1c8aaefa10bc2646f0f058b77d0030bec3e1e0ec89409d2380",
+                     "size": "103186082"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/arm-linux-gnueabihf.arm-none-eabi-407f016.210607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-407f016.210607.tar.gz",
-                     "checksum": "SHA-256:4a6ecfaf485ab428e233cc06e853b91dc272146ca0200fbbcdcb87f1930239b8",
-                     "size": "95858053"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/arm-linux-gnueabihf.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "checksum": "SHA-256:0cca5b4c429acf26eeb093bf21b16c2265fd6c04aafe91ceb304dfee35a662d7",
+                     "size": "95859088"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-linux-gnu.arm-none-eabi-407f016.210607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.arm-none-eabi-407f016.210607.tar.gz",
-                     "checksum": "SHA-256:8f97c67d20077c551b13344c1a96a9f51dd3a91b178a4731cd9dcc27a19217e6",
-                     "size": "105954517"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-linux-gnu.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "checksum": "SHA-256:9a1ba7cdcb11d817ddbcb60d53f5b804b787a7a3c2e0bc5a33e86b8bbf653391",
+                     "size": "105956199"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-w64-mingw32.arm-none-eabi-407f016.210607.zip",
-                     "archiveFileName": "i686-w64-mingw32.arm-none-eabi-407f016.210607.zip",
-                     "checksum": "SHA-256:c30e8b67d16ae6f29bcca84c166ecc3fced209d73b1b8925d5dd0e79b850f923",
-                     "size": "105487629"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-w64-mingw32.arm-none-eabi-7855b0c.210706.zip",
+                     "archiveFileName": "i686-w64-mingw32.arm-none-eabi-7855b0c.210706.zip",
+                     "checksum": "SHA-256:5b06d0dcfcf78c83b85aadbcbd8b6e3301b60acd14d6319e066e125586331aac",
+                     "size": "105493451"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-apple-darwin14.arm-none-eabi-407f016.210607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.arm-none-eabi-407f016.210607.tar.gz",
-                     "checksum": "SHA-256:5c617ffcf86518a6451701bd5756e28f9b7587acc0cb2cd503b6c600b8cf417d",
-                     "size": "107365915"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-apple-darwin14.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "checksum": "SHA-256:6d4dfd0e032df43687683504b747a0010cea53b2d86f4662f72997fd0cbd8b1a",
+                     "size": "107371801"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-linux-gnu.arm-none-eabi-407f016.210607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-407f016.210607.tar.gz",
-                     "checksum": "SHA-256:0a2b7d03f79f723d62255595f9af862807feee601456bb0e2477ce188a4a975f",
-                     "size": "107847587"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-linux-gnu.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-7855b0c.210706.tar.gz",
+                     "checksum": "SHA-256:791b6386a6b6742d627af3277f401db7bb2b407852c8b3f49eaee30fcc5ceb8a",
+                     "size": "107845636"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-w64-mingw32.arm-none-eabi-407f016.210607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-407f016.210607.zip",
-                     "checksum": "SHA-256:675ee78477afc5f2daf1e25f3c0560a3adbaa7f2d73d99059e549835b4022bf8",
-                     "size": "110334002"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-w64-mingw32.arm-none-eabi-7855b0c.210706.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-7855b0c.210706.zip",
+                     "checksum": "SHA-256:7f8b591902e9f164904974bb8224808371b025affaf7cbffdeb3f3ff259b9464",
+                     "size": "110342777"
                  }
               ]
            },
            {
-               "version": "1.2.0-a-407f016",
+               "version": "1.3.1-a-7855b0c",
               "name": "pqt-elf2uf2",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/aarch64-linux-gnu.elf2uf2-fc10a97.210607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.elf2uf2-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:59f6c2f08f1809987bf40df51808f848146a00c626dff06d3cabafb726db8830",
-                     "size": "79850"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/aarch64-linux-gnu.elf2uf2-fc10a97.210706.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.elf2uf2-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:3c67eb63da563c505dd046cd069aee1754ff735e9d0d7dacfd8b003a85a078ca",
+                     "size": "79842"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/arm-linux-gnueabihf.elf2uf2-fc10a97.210607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.elf2uf2-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:fb6d4270aaa017b5fa60937f82674e5e55cf12da392fd23cc5d1f6de279bcd04",
-                     "size": "54220"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/arm-linux-gnueabihf.elf2uf2-fc10a97.210706.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.elf2uf2-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:62457fc90b0993d720a3523537e8d55e9378769db1595709ff01357ebc13a3dd",
+                     "size": "54219"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-linux-gnu.elf2uf2-fc10a97.210607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.elf2uf2-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:b55b823e59b7fa4d1ea130621c6144d84a96f3cb9571109f878472fecbcda7f8",
-                     "size": "87882"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-linux-gnu.elf2uf2-fc10a97.210706.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.elf2uf2-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:59e83f09322a2a292c20a4852512aa8c086b5b0d02842e11dfb9cb122485fb84",
+                     "size": "87881"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-w64-mingw32.elf2uf2-fc10a97.210607.zip",
-                     "archiveFileName": "i686-w64-mingw32.elf2uf2-fc10a97.210607.zip",
-                     "checksum": "SHA-256:e66f3959fcdc2874dd4074d6e5205715235551062d5283da22906e369dc24bf0",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-w64-mingw32.elf2uf2-fc10a97.210706.zip",
+                     "archiveFileName": "i686-w64-mingw32.elf2uf2-fc10a97.210706.zip",
+                     "checksum": "SHA-256:2b7c676fa0ff8a7fb6638dfe770787e6bdd9c6cd2f5a0d86f8c64c267a9bc328",
                     "size": "70429"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-apple-darwin14.elf2uf2-fc10a97.210607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.elf2uf2-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:f85403c39741498547448f40fa6ae323519452af7ab0118c4cf7408340c20e07",
-                     "size": "81920"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-apple-darwin14.elf2uf2-fc10a97.210706.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.elf2uf2-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:1154dd7bb3186bb66b8b53699d29083a688564ace502f28cf53cf9f15214d816",
+                     "size": "81919"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-linux-gnu.elf2uf2-fc10a97.210607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.elf2uf2-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:5e9155cea5639b3716f5149e5a98fa864fe3abd9281f53f1dec65fdbe24d8f28",
-                     "size": "79515"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-linux-gnu.elf2uf2-fc10a97.210706.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.elf2uf2-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:0ed4a2a3973ee2e7a5edc4932bd2485ac0825750b72fabdb8a96e8d274dc30a4",
+                     "size": "79516"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-w64-mingw32.elf2uf2-fc10a97.210607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.elf2uf2-fc10a97.210607.zip",
-                     "checksum": "SHA-256:e48b9e8d1c238f29e078056f6fedce715b773b042e52bf63df3759822fa66e64",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-w64-mingw32.elf2uf2-fc10a97.210706.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.elf2uf2-fc10a97.210706.zip",
+                     "checksum": "SHA-256:81c3c458fda68840439afc7b16133febb21e023a910924761abaee9c011a44db",
                     "size": "78298"
                  }
               ]
            },
            {
-               "version": "1.2.0-a-407f016",
+               "version": "1.3.1-a-7855b0c",
               "name": "pqt-pioasm",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/aarch64-linux-gnu.pioasm-fc10a97.210607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.pioasm-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:6076ec3624c40cb59c456b501450621c57097bd83af4ebcbd03e3b46333fa745",
-                     "size": "453301"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/aarch64-linux-gnu.pioasm-fc10a97.210706.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.pioasm-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:bbc6735939ffab312e700b687c29ecf7873564cec9028588c39b7be5a5b18ba3",
+                     "size": "453297"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/arm-linux-gnueabihf.pioasm-fc10a97.210607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.pioasm-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:a6fe07241fb913e846c74855165e038b327705d75d2ca576dd714b42e17749c4",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/arm-linux-gnueabihf.pioasm-fc10a97.210706.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.pioasm-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:9390b87fa87fa03d1033cf75624c0dd3d2acd7b2d794f5ab91a800ffb7546a17",
                     "size": "360370"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-linux-gnu.pioasm-fc10a97.210607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.pioasm-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:47808419d4a6019e527a0aec8c13b5a8bad7d838547fbb97abcddca866f3fc6b",
-                     "size": "511410"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-linux-gnu.pioasm-fc10a97.210706.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.pioasm-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:a84e7389c5e959a409b6ce8b1150fad7641fad4ac55c129888439f33c5bfb7cc",
+                     "size": "511409"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-w64-mingw32.pioasm-fc10a97.210607.zip",
-                     "archiveFileName": "i686-w64-mingw32.pioasm-fc10a97.210607.zip",
-                     "checksum": "SHA-256:c815d6845d374133c346e3ae3e40746217be3a6313190a9b4cdc43a4cd2e2bea",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-w64-mingw32.pioasm-fc10a97.210706.zip",
+                     "archiveFileName": "i686-w64-mingw32.pioasm-fc10a97.210706.zip",
+                     "checksum": "SHA-256:d1f1e34bd6e4b32301f3e7b147a9eb6710c2b52f816288a11e9aeb619f242355",
                     "size": "385662"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-apple-darwin14.pioasm-fc10a97.210607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.pioasm-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:cd19c8ff52ebed430e039b18fd5bf5bfa33f60727a51ca1c81ad3bbcbb6ec763",
-                     "size": "480403"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-apple-darwin14.pioasm-fc10a97.210706.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.pioasm-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:f9cb3bf99c84221b8c63d95dd22bbd1cc1ba40bd847530819392ee047962571e",
+                     "size": "480405"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-linux-gnu.pioasm-fc10a97.210607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.pioasm-fc10a97.210607.tar.gz",
-                     "checksum": "SHA-256:9b8d778a2b3dd5b6bc110dac86e4f9a8321e0bd43f8149bd2722b992b3684515",
-                     "size": "458642"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-linux-gnu.pioasm-fc10a97.210706.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.pioasm-fc10a97.210706.tar.gz",
+                     "checksum": "SHA-256:96721566a97f07cbe4af3a1d80d63336a75b129a7cb821a407260d250666a30f",
+                     "size": "458641"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-w64-mingw32.pioasm-fc10a97.210607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.pioasm-fc10a97.210607.zip",
-                     "checksum": "SHA-256:87b5f6cd9c760e5091d1d6e6383028a4255c07d054e6eab0583590dbdc05de69",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-w64-mingw32.pioasm-fc10a97.210706.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.pioasm-fc10a97.210706.zip",
+                     "checksum": "SHA-256:15fe69c11ad86ddf78c1ee26610b8b0f9d4a2323af13854e8e6b5e20d5a6fff5",
                     "size": "408341"
                  }
               ]
            },
            {
-               "version": "1.2.0-a-407f016",
+               "version": "1.3.1-a-7855b0c",
               "name": "pqt-mklittlefs",
               "systems": [
                  {
                     "host": "aarch64-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/aarch64-linux-gnu.mklittlefs-6b5c62d.210607.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.mklittlefs-6b5c62d.210607.tar.gz",
-                     "checksum": "SHA-256:6475b7cb24ba165fa97e5ae9e66e56901e3609b57b0edb359b75c810b8267d73",
-                     "size": "44791"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/aarch64-linux-gnu.mklittlefs-6b5c62d.210706.tar.gz",
+                     "archiveFileName": "aarch64-linux-gnu.mklittlefs-6b5c62d.210706.tar.gz",
+                     "checksum": "SHA-256:3b318dbefd8ac36b3f1531d14d018d7aaad26b4f7f259a3a0c116939e74c76f6",
+                     "size": "44788"
                  },
                  {
                     "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/arm-linux-gnueabihf.mklittlefs-6b5c62d.210607.tar.gz",
-                     "archiveFileName": "arm-linux-gnueabihf.mklittlefs-6b5c62d.210607.tar.gz",
-                     "checksum": "SHA-256:39bfd76f25b5da89244f708de856a5e9548db37eec7c5a88e4832dc5c3d0ee1f",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/arm-linux-gnueabihf.mklittlefs-6b5c62d.210706.tar.gz",
+                     "archiveFileName": "arm-linux-gnueabihf.mklittlefs-6b5c62d.210706.tar.gz",
+                     "checksum": "SHA-256:2b67c6ab2d6fd7239944963beeca0664f85fbffb7b68bcf9eaa7c64e81cad7a5",
                     "size": "38247"
                  },
                  {
                     "host": "i686-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-linux-gnu.mklittlefs-6b5c62d.210607.tar.gz",
-                     "archiveFileName": "i686-linux-gnu.mklittlefs-6b5c62d.210607.tar.gz",
-                     "checksum": "SHA-256:9b6841d1c5070fb1f2b4a5b6c6850395740ac997aa3fbf888f8cd6e7628200e8",
-                     "size": "48240"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-linux-gnu.mklittlefs-6b5c62d.210706.tar.gz",
+                     "archiveFileName": "i686-linux-gnu.mklittlefs-6b5c62d.210706.tar.gz",
+                     "checksum": "SHA-256:791f12a6969e3b78d13e4355b7977a49e5b567261499451a10ce0781a7d08d70",
+                     "size": "48237"
                  },
                  {
                     "host": "i686-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/i686-w64-mingw32.mklittlefs-6b5c62d.210607.zip",
-                     "archiveFileName": "i686-w64-mingw32.mklittlefs-6b5c62d.210607.zip",
-                     "checksum": "SHA-256:9b6d7ab130c1f07d63a045e987f69496bfc5e3bb4bf6edc9bf4cd04d363c2ac4",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/i686-w64-mingw32.mklittlefs-6b5c62d.210706.zip",
+                     "archiveFileName": "i686-w64-mingw32.mklittlefs-6b5c62d.210706.zip",
+                     "checksum": "SHA-256:a5bf0308b8f279f5e06c2b5f24f6843d934046ceba84fd7ed5c44ba682b770c4",
                     "size": "332804"
                  },
                  {
                     "host": "x86_64-apple-darwin",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-apple-darwin14.mklittlefs-6b5c62d.210607.tar.gz",
-                     "archiveFileName": "x86_64-apple-darwin14.mklittlefs-6b5c62d.210607.tar.gz",
-                     "checksum": "SHA-256:538c30d2a072845873d2e3552ac725dcef022f9ac9a873925c218d5564615321",
-                     "size": "362807"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-apple-darwin14.mklittlefs-6b5c62d.210706.tar.gz",
+                     "archiveFileName": "x86_64-apple-darwin14.mklittlefs-6b5c62d.210706.tar.gz",
+                     "checksum": "SHA-256:e5dd89a7a4ffe494440975ec511cdf24d5978da07a9bff96429a48ad0a7054e7",
+                     "size": "362810"
                  },
                  {
                     "host": "x86_64-pc-linux-gnu",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-linux-gnu.mklittlefs-6b5c62d.210607.tar.gz",
-                     "archiveFileName": "x86_64-linux-gnu.mklittlefs-6b5c62d.210607.tar.gz",
-                     "checksum": "SHA-256:f2b4d849a2146e54fec52abdfc4391894addfbf1e904094424fb5a2a22873e58",
-                     "size": "46918"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-linux-gnu.mklittlefs-6b5c62d.210706.tar.gz",
+                     "archiveFileName": "x86_64-linux-gnu.mklittlefs-6b5c62d.210706.tar.gz",
+                     "checksum": "SHA-256:f1e3b374c66811bfe07997b12b6cb318c58ac84973c46e6887553aea13276884",
+                     "size": "46915"
                  },
                  {
                     "host": "x86_64-mingw32",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.2.0-a/x86_64-w64-mingw32.mklittlefs-6b5c62d.210607.zip",
-                     "archiveFileName": "x86_64-w64-mingw32.mklittlefs-6b5c62d.210607.zip",
-                     "checksum": "SHA-256:c1105383c2c694978aee521dc1d921fb2e2c3452015c5456f323ffad09595725",
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.3.1-a/x86_64-w64-mingw32.mklittlefs-6b5c62d.210706.zip",
+                     "archiveFileName": "x86_64-w64-mingw32.mklittlefs-6b5c62d.210706.zip",
+                     "checksum": "SHA-256:f5d69785c0bb5397eb49cccaa23dd131d32ab013e1124e38c15f758ded799fdb",
                     "size": "345250"
                  }
               ]
@@ -426,4 +435,4 @@
         ]
      }
   ]
-}
+}
@@ -32,26 +32,27 @@ compiler.path={runtime.tools.pqt-gcc.path}/bin/
 # Compile variables
 # -----------------

-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
+compiler.warning_flags=-Werror=return-type
+compiler.warning_flags.none=-Werror=return-type
+compiler.warning_flags.default=-Werror=return-type
+compiler.warning_flags.more=-Wall -Werror=return-type -Wno-ignored-qualifiers
+compiler.warning_flags.all=-Wall -Wextra -Werror=return-type -Wno-ignored-qualifiers

 compiler.defines={build.led} {build.usbstack_flags} -DCFG_TUSB_MCU=OPT_MCU_RP2040 -DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
 compiler.includes="-iprefix{runtime.platform.path}/" "@{runtime.platform.path}/lib/platform_inc.txt"
-compiler.flags=-Os -march=armv6-m -mcpu=cortex-m0plus -mthumb -ffunction-sections -fdata-sections -fno-exceptions
+compiler.flags=-march=armv6-m -mcpu=cortex-m0plus -mthumb -ffunction-sections -fdata-sections -fno-exceptions
 compiler.wrap="@{runtime.platform.path}/lib/platform_wrap.txt"
 compiler.libpico="{runtime.platform.path}/lib/libpico.a"
+compiler.libstdcpp="-lstdc++"

 compiler.c.cmd=arm-none-eabi-gcc
-compiler.c.flags=-c {compiler.defines} {compiler.flags} {compiler.includes} -std=gnu17 -g
+compiler.c.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} {compiler.includes} -std=gnu17 -g
 compiler.c.elf.cmd=arm-none-eabi-g++
-compiler.c.elf.flags={compiler.defines} {compiler.flags} -u _printf_float -u _scanf_float
+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 -g -x assembler-with-cpp -MMD {compiler.includes} -g
+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.defines} {compiler.flags} {compiler.includes} -fno-rtti -std=gnu++17 -g
+compiler.cpp.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} {compiler.includes} {build.flags.rtti} -std=gnu++17 -g

 compiler.ar.cmd=arm-none-eabi-ar
 compiler.ar.flags=rcs
@@ -79,6 +80,8 @@ compiler.elf2hex.extra_flags=
 # Board configuration, set in boards.txt.  Present here to ensure substitution works
 build.flash_length=
 build.eeprom_start=
+build.flags.optimize=-Os
+build.flags.rtti=-fno-rtti
 build.fs_start=
 build.fs_end=
 build.usbstack_flags=
@@ -86,17 +89,17 @@ build.usbstack_flags=
 build.boot2=boot2_generic_03h_4_padded_checksum

 # Allow Pico boards do be auto-discovered by the IDE
-discovery.rp2040.pattern="{runtime.tools.pqt-python3.path}/python3" "{runtime.platform.path}/tools/discovery.py"
+discovery.rp2040.pattern="{runtime.tools.pqt-python3.path}/python3" -I "{runtime.platform.path}/tools/discovery.py"


 # Compile patterns
 # ----------------

 ## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} {build.usbpid} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DBOARD_NAME="{build.board}" -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {build.debug_port} {build.debug_level} {includes} "{source_file}" -o "{object_file}"
+recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} {build.usbpid} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DBOARD_NAME="{build.board}" -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {build.debug_port} {build.debug_level} {build.flags.optimize} {includes} "{source_file}" -o "{object_file}"

 ## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {build.usbpid} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DBOARD_NAME="{build.board}" -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {build.debug_port} {build.debug_level} {includes} "{source_file}" -o "{object_file}"
+recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {build.usbpid} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DBOARD_NAME="{build.board}" -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {build.debug_port} {build.debug_level} {build.flags.optimize} {includes} "{source_file}" -o "{object_file}"

 ## Compile S files
 recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} {build.usbpid} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DBOARD_NAME="{build.board}" -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {build.debug_port} {build.debug_level} {includes} "{source_file}" -o "{object_file}"
@@ -107,13 +110,13 @@ archive_file_path={build.path}/{archive_file}
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"

 ## Generate the linker map with specific flash sizes/locations
-recipe.hooks.linking.prelink.1.pattern="{runtime.tools.pqt-python3.path}/python3" "{runtime.platform.path}/tools/simplesub.py" --input "{runtime.platform.path}/lib/memmap_default.ld" --out "{build.path}/memmap_default.ld" --sub __FLASH_LENGTH__ {build.flash_length} --sub __EEPROM_START__ {build.eeprom_start} --sub __FS_START__ {build.fs_start} --sub __FS_END__ {build.fs_end}
+recipe.hooks.linking.prelink.1.pattern="{runtime.tools.pqt-python3.path}/python3" -I "{runtime.platform.path}/tools/simplesub.py" --input "{runtime.platform.path}/lib/memmap_default.ld" --out "{build.path}/memmap_default.ld" --sub __FLASH_LENGTH__ {build.flash_length} --sub __EEPROM_START__ {build.eeprom_start} --sub __FS_START__ {build.fs_start} --sub __FS_END__ {build.fs_end} --sub __RAM_LENGTH__ {build.ram_length}

 ## Compile the boot stage 2 blob
-recipe.hooks.linking.prelink.2.pattern="{compiler.path}{compiler.S.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -c "{runtime.platform.path}/assembly/{build.boot2}.S" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" -o "{build.path}/boot2.o"
+recipe.hooks.linking.prelink.2.pattern="{compiler.path}{compiler.S.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -c "{runtime.platform.path}/boot2/{build.boot2}.S" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" -o "{build.path}/boot2.o"

 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.ldflags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" "{build.path}/boot2.o" {compiler.libpico} -lm -lc -lstdc++ -lc -Wl,--end-group
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.ldflags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group {object_files} "{build.path}/{archive_file}" "{build.path}/boot2.o" {compiler.libpico} -lm -lc {compiler.libstdcpp} -lc -Wl,--end-group

 ## Create output (UF2 file)
 recipe.objcopy.uf2.pattern="{runtime.tools.pqt-elf2uf2.path}/elf2uf2" "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.uf2"
@@ -138,7 +141,7 @@ tools.uf2conv.cmd={runtime.platform.path}/system/python3/python3
 tools.uf2conv.upload.protocol=uf2
 tools.uf2conv.upload.params.verbose=
 tools.uf2conv.upload.params.quiet=
-tools.uf2conv.upload.pattern="{cmd}" "{runtime.platform.path}/tools/uf2conv.py" --serial "{serial.port}" --family RP2040 --deploy "{build.path}/{build.project_name}.uf2"
+tools.uf2conv.upload.pattern="{cmd}" -I "{runtime.platform.path}/tools/uf2conv.py" --serial "{serial.port}" --family RP2040 --deploy "{build.path}/{build.project_name}.uf2"


 #tools.picoprobe.cmd={runtime.tools.pqt-openocd.path}
@@ -146,4 +149,10 @@ tools.picoprobe.cmd={runtime.platform.path}/system/openocd
 tools.picoprobe.upload.protocol=picoprobe
 tools.picoprobe.upload.params.verbose=
 tools.picoprobe.upload.params.quiet=
-tools.picoprobe.upload.pattern="{cmd}/bin/openocd" -f "interface/picoprobe.cfg" -f "target/rp2040.cfg" -s "{cmd}/share/openocd/scripts" -c "program {build.path}/{build.project_name}.elf verify reset exit"
+tools.picoprobe.upload.pattern="{cmd}/bin/openocd" -f "interface/picoprobe.cfg" -f "target/rp2040.cfg" -s "{cmd}/share/openocd/scripts" -c "program {{build.path}/{build.project_name}.elf} verify reset exit"
+
+tools.picodebug.cmd={runtime.platform.path}/system/openocd
+tools.picodebug.upload.protocol=pico-debug
+tools.picodebug.upload.params.verbose=
+tools.picodebug.upload.params.quiet=
+tools.picodebug.upload.pattern="{cmd}/bin/openocd" -f "board/pico-debug.cfg" -s "{cmd}/share/openocd/scripts" -c "program {{build.path}/{build.project_name}.elf} verify reset exit"
@@ -9,16 +9,13 @@ function skip_ino()
    read -d '' skiplist << EOL || true
 /#attic/
 /AvrAdcLogger/
-/BackwardCompatibility/
 /examplesV1/
-/ExFatFormatter/
-/ExFatLogger/
-/ExFatUnicodeTest/
 /RtcTimestampTest/
 /SoftwareSpi/
-/STM32Test/
+/TeensyDmaAdcLogger/
 /TeensyRtcTimestamp/
 /TeensySdioDemo/
+/TeensySdioLogger/
 /UserChipSelectFunction/
 /UserSPIDriver/
 /Adafruit_TinyUSB_Arduino/
@@ -13,9 +13,11 @@ pico_sdk_init()

 add_library(pico STATIC)

+# Use a longer XOSC startup time, to accommodate Adafruit and other boards that may need it.
 target_compile_definitions(pico PUBLIC
 	PICO_PRINTF_ALWAYS_INCLUDED=1
 	PICO_FLASH_SIZE_BYTES=16777216
+	PICO_XOSC_STARTUP_DELAY_MULTIPLIER=64
 )

 target_compile_options(pico PUBLIC
@@ -25,7 +27,7 @@ target_compile_options(pico PUBLIC

 include_directories(BEFORE ${PICO_SDK_PATH}/../tools/libpico)

-target_link_libraries(pico 
+target_link_libraries(pico
 	boot_stage2
 	hardware_adc
 	hardware_base
@@ -33,6 +35,7 @@ target_link_libraries(pico
 	hardware_clocks
 	hardware_divider
 	hardware_dma
+	hardware_exception
 	hardware_flash
 	hardware_gpio
 	hardware_i2c
@@ -67,18 +70,13 @@ target_link_libraries(pico
 	pico_standard_link
 	pico_stdlib
 	pico_unique_id
+	pico_util
 	tinyusb
-        tinyusb_device_unmarked
+	tinyusb_device_unmarked
 	pico_audio
 	pico_audio_i2s
 )

-add_custom_command(TARGET pico PRE_BUILD
-	COMMAND arm-none-eabi-gcc -g -c ../../../assembly/crt0.S -I "${PICO_SDK_PATH}/src/rp2040/hardware_regs/include" -I "${PICO_SDK_PATH}/src/common/pico_binary_info/include/"
-)
-
 add_custom_command(TARGET pico POST_BUILD
-	COMMAND ar d libpico.a crt0.S.obj
-	COMMAND ar r libpico.a crt0.o
 	COMMAND ar d libpico.a stdio.c.obj stdio_usb.c.obj stdio_usb_descriptors.c.obj
 )
@@ -42,4 +42,4 @@ for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
                   -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
    done
 done
-mv *.S ../../../../assembly/.
+mv *.S ../../../../boot2/.
@@ -34,41 +34,17 @@
 // COMMON CONFIGURATION
 //--------------------------------------------------------------------

-// defined by board.mk
 #ifndef CFG_TUSB_MCU
-  #error CFG_TUSB_MCU must be defined
+ #define CFG_TUSB_MCU             OPT_MCU_RP2040
 #endif

-// RHPort number used for device can be defined by board.mk, default to port 0
-#ifndef BOARD_DEVICE_RHPORT_NUM
-  #define BOARD_DEVICE_RHPORT_NUM     0
-#endif
-
-// RHPort max operational speed can defined by board.mk
-// Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
-#ifndef BOARD_DEVICE_RHPORT_SPEED
-  #if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \
-       CFG_TUSB_MCU == OPT_MCU_NUC505  || CFG_TUSB_MCU == OPT_MCU_CXD56)
-    #define BOARD_DEVICE_RHPORT_SPEED   OPT_MODE_HIGH_SPEED
-  #else
-    #define BOARD_DEVICE_RHPORT_SPEED   OPT_MODE_FULL_SPEED
-  #endif
-#endif
-
-// Device mode with rhport and speed defined by board.mk
-#if   BOARD_DEVICE_RHPORT_NUM == 0
-  #define CFG_TUSB_RHPORT0_MODE     (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED)
-#elif BOARD_DEVICE_RHPORT_NUM == 1
-  #define CFG_TUSB_RHPORT1_MODE     (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED)
-#else
-  #error "Incorrect RHPort configuration"
-#endif
-
-// This example doesn't use an RTOS
-//#define CFG_TUSB_OS               OPT_OS_NONE
+#define CFG_TUSB_RHPORT0_MODE     OPT_MODE_DEVICE
+#define CFG_TUSB_OS               OPT_OS_PICO

 // CFG_TUSB_DEBUG is defined by compiler in DEBUG build
-// #define CFG_TUSB_DEBUG           0
+#ifndef CFG_TUSB_DEBUG
+#define CFG_TUSB_DEBUG           0
+#endif

 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
 * Tinyusb use follows macros to declare transferring memory so that they can be put
@@ -36,6 +36,18 @@ def BuildFreq(name):
        print("%s.menu.freq.%s=%s MHz%s" % (name, f, f, warn))
        print("%s.menu.freq.%s.build.f_cpu=%dL" % (name, f, f * 1000000))

+def BuildOptimize(name):
+    for l in [ ("Small", "Small", "-Os", " (standard)"), ("Optimize", "Optimize", "-O", ""), ("Optimize2", "Optimize More", "-O2", ""),
+               ("Optimize3", "Optimize Even More", "-O3", ""), ("Fast", "Fast", "-Ofast", " (maybe slower)"), ("Debug", "Debug", "-Og", "") ]:
+        print("%s.menu.opt.%s=%s (%s)%s" % (name, l[0], l[1], l[2], l[3]))
+        print("%s.menu.opt.%s.build.flags.optimize=%s" % (name, l[0], l[2]))
+
+def BuildRTTI(name):
+    print("%s.menu.rtti.Disabled=Disabled" % (name))
+    print("%s.menu.rtti.Disabled.build.flags.rtti=-fno-rtti" % (name))
+    print("%s.menu.rtti.Enabled=Enabled" % (name))
+    print("%s.menu.rtti.Enabled.build.flags.rtti=" % (name))
+
 def BuildBoot(name):
    for l in [ ("Generic SPI /2", "boot2_generic_03h_2_padded_checksum"),  ("Generic SPI /4", "boot2_generic_03h_4_padded_checksum"),
            ("IS25LP080 QSPI /2", "boot2_is25lp080_2_padded_checksum"), ("IS25LP080 QSPI /4", "boot2_is25lp080_4_padded_checksum"),
@@ -46,18 +58,22 @@ def BuildBoot(name):

 def BuildUSBStack(name):
    print("%s.menu.usbstack.picosdk=Pico SDK" % (name))
-    print("%s.menu.usbstack.picosdk.build.usbstack_flags=" % (name))
+    print('%s.menu.usbstack.picosdk.build.usbstack_flags="-I{runtime.platform.path}/tools/libpico"' % (name))
    print("%s.menu.usbstack.tinyusb=Adafruit TinyUSB" % (name))
-    print('%s.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{build.core.path}/TinyUSB" "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"' % (name))
+    print('%s.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"' % (name))

-def BuildHeader(name, vendor_name, product_name, pidtouse, vid, pid, boarddefine, variant, uploadtool, flashsize, boot2):
+def BuildWithoutUSBStack(name):
+    print("%s.menu.usbstack.nousb=No USB" % (name))
+    print('%s.menu.usbstack.nousb.build.usbstack_flags="-DNO_USB -DDISABLE_USB_SERIAL -I{runtime.platform.path}/tools/libpico"' % (name))
+
+def BuildHeader(name, vendor_name, product_name, vidtouse, pidtouse, vid, pid, boarddefine, variant, uploadtool, flashsize, ramsize, boot2):
    prettyname = vendor_name + " " + product_name
    print()
    print("# -----------------------------------")
    print("# %s" % (prettyname))
    print("# -----------------------------------")
    print("%s.name=%s" % (name, prettyname))
-    print("%s.vid.0=%s" % (name, vid))
+    print("%s.vid.0=%s" % (name, vidtouse))
    print("%s.pid.0=%s" % (name, pidtouse))
    print("%s.build.usbpid=-DSERIALUSB_PID=%s" % (name, pid))
    print("%s.build.board=%s" % (name, boarddefine))
@@ -65,7 +81,7 @@ def BuildHeader(name, vendor_name, product_name, pidtouse, vid, pid, boarddefine
    print("%s.build.variant=%s" % (name, variant))
    print("%s.upload.tool=%s" % (name, uploadtool))
    print("%s.upload.maximum_size=%d" % (name, flashsize))
-    print("%s.upload.maximum_data_size=262144" % (name))
+    print("%s.upload.maximum_data_size=%d" % (name, ramsize))
    print("%s.upload.wait_for_upload_port=true" % (name))
    print("%s.upload.erase_cmd=" % (name))
    print("%s.serial.disableDTR=false" % (name))
@@ -75,6 +91,7 @@ def BuildHeader(name, vendor_name, product_name, pidtouse, vid, pid, boarddefine
    print("%s.build.core=rp2040" % (name))
    print("%s.build.mcu=rp2040" % (name))
    print("%s.build.ldscript=memmap_default.ld" % (name))
+    print("%s.build.ram_length=%dk" % (name, ramsize / 1024))
    print("%s.build.boot2=%s" % (name, boot2))
    print("%s.build.vid=%s" % (name, vid))
    print("%s.build.pid=%s" % (name, pid))
@@ -85,6 +102,8 @@ def BuildGlobalMenuList():
    print("menu.BoardModel=Model")
    print("menu.flash=Flash Size")
    print("menu.freq=CPU Speed")
+    print("menu.opt=Optimize")
+    print("menu.rtti=RTTI")
    print("menu.dbgport=Debug Port")
    print("menu.dbglvl=Debug Level")
    print("menu.boot2=Boot Stage 2")
@@ -92,17 +111,23 @@ def BuildGlobalMenuList():


 def MakeBoard(name, vendor_name, product_name, vid, pid, boarddefine, flashsizemb, boot2):
-    for a, b, c in [ ["", "", "uf2conv"], ["picoprobe", " (Picoprobe)", "picoprobe"]]:
+    for a, b, c in [ ["", "", "uf2conv"], ["picoprobe", " (Picoprobe)", "picoprobe"], ["picodebug", " (pico-debug)", "picodebug"]]:
        n = name + a
        p = product_name + b
        fssizelist = [ 0, 64 * 1024, 128 * 1024, 256 * 1024, 512 * 1024 ]
        for i in range(1, flashsizemb):
            fssizelist.append(i * 1024 * 1024)
+        vidtouse = vid;
+        ramsizekb = 256;
        if a == "picoprobe":
            pidtouse = '0x0004'
+        elif a == "picodebug":
+            vidtouse = '0x1209'
+            pidtouse = '0x2488'
+            ramsizekb = 240;
        else:
            pidtouse = pid
-        BuildHeader(n, vendor_name, p, pidtouse, vid, pid, boarddefine, name, c, flashsizemb * 1024 * 1024, boot2)
+        BuildHeader(n, vendor_name, p, vidtouse, pidtouse, vid, pid, boarddefine, name, c, flashsizemb * 1024 * 1024, ramsizekb * 1024, boot2)
        if name == "generic":
            BuildFlashMenu(n, 2*1024*1024, [0, 1*1024*1024])
            BuildFlashMenu(n, 4*1024*1024, [0, 2*1024*1024])
@@ -111,9 +136,14 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, boarddefine, flashsizem
        else:
            BuildFlashMenu(n, flashsizemb * 1024 * 1024, fssizelist)
        BuildFreq(n)
+        BuildOptimize(n)
+        BuildRTTI(n)
        BuildDebugPort(n)
        BuildDebugLevel(n)
-        BuildUSBStack(n)
+        if a == "picodebug":
+            BuildWithoutUSBStack(n)
+        else:
+            BuildUSBStack(n)
        if name == "generic":
            BuildBoot(n)

@@ -122,11 +152,16 @@ BuildGlobalMenuList()
 MakeBoard("rpipico", "Raspberry Pi", "Pico", "0x2e8a", "0x000a", "RASPBERRY_PI_PICO", 2, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_feather", "Adafruit", "Feather RP2040", "0x239a", "0x80f1", "ADAFRUIT_FEATHER_RP2040", 8, "boot2_w25x10cl_4_padded_checksum")
 MakeBoard("adafruit_itsybitsy", "Adafruit", "ItsyBitsy RP2040", "0x239a", "0x80fd", "ADAFRUIT_ITSYBITSY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
-MakeBoard("adafruit_qtpy", "Adafruit", "QT Py RP2040", "0x239a", "0x80f7", "ADAFRUIT_QTPY_RP2040", 8, "boot2_generic_03h_4_padded_checksum")
+MakeBoard("adafruit_qtpy", "Adafruit", "QT Py RP2040", "0x239a", "0x80f7", "ADAFRUIT_QTPY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_stemmafriend", "Adafruit", "STEMMA Friend RP2040", "0x239a", "0x80e3", "ADAFRUIT_STEMMAFRIEND_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_trinkeyrp2040qt", "Adafruit", "Trinkey RP2040 QT", "0x239a", "0x8109", "ADAFRUIT_TRINKEYQT_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_macropad2040", "Adafruit", "MacroPad RP2040", "0x239a", "0x8107", "ADAFRUIT_MACROPAD_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("arduino_nano_connect", "Arduino", "Nano RP2040 Connect", "0x2341", "0x0058", "ARDUINO_NANO_RP2040_CONNECT", 16, "boot2_w25q080_2_padded_checksum")
+MakeBoard("cytron_maker_pi_rp2040", "Cytron", "Maker Pi RP2040", "0x2e8a", "0x1000", "CYTRON_MAKER_PI_RP2040", 2, "boot2_w25q080_2_padded_checksum")
 MakeBoard("sparkfun_promicrorp2040", "SparkFun", "ProMicro RP2040", "0x1b4f", "0x0026", "SPARKFUN_PROMICRO_RP2040", 16, "boot2_generic_03h_4_padded_checksum")
 MakeBoard("generic", "Generic", "RP2040", "0x2e8a", "0xf00a", "GENERIC_RP2040", 16, "boot2_generic_03h_4_padded_checksum")
-
+MakeBoard("challenger_2040_wifi", "iLabs", "Challenger 2040 WiFi", "0x2e8a", "0x1006", "CHALLENGER_2040_WIFI_RP2040", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("challenger_2040_lte", "iLabs", "Challenger 2040 LTE", "0x2e8a", "0x100b", "CHALLENGER_2040_LTE_RP2040", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("melopero_shake_rp2040", "Melopero", "Shake RP2040", "0x2e8a", "0x1005", "MELOPERO_SHAKE_RP2040", 16, "boot2_w25q080_2_padded_checksum")
+MakeBoard("upesy_rp2040_devkit", "uPesy", "RP2040 DevKit", "0x2e8a", "0x1007", "UPESY_RP2040_DEVKIT", 2, "boot2_w25q080_2_padded_checksum")
+MakeBoard("wiznet_5100s_evb_pico", "WIZnet", "W5100S-EVB-Pico", "0x2e8a", "0x1008", "WIZNET_5100S_EVB_PICO", 2, "boot2_w25q080_2_padded_checksum")
@@ -0,0 +1,228 @@
+# Copyright 2021-present Maximilian Gerhardt <maximilian.gerhardt@rub.de>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os, re, sys
+from SCons.Script import DefaultEnvironment, Builder, AlwaysBuild
+
+env = DefaultEnvironment()
+platform = env.PioPlatform()
+board = env.BoardConfig()
+upload_protocol = env.subst("$UPLOAD_PROTOCOL") or "picotool"
+ram_size = board.get("upload.maximum_ram_size")
+
+FRAMEWORK_DIR = platform.get_package_dir("framework-arduinopico")
+assert os.path.isdir(FRAMEWORK_DIR)
+
+# update progsize expression to also check for bootloader.
+env.Replace(
+    SIZEPROGREGEXP=r"^(?:\.boot2|\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*"
+)
+
+env.Append(
+    ASFLAGS=env.get("CCFLAGS", [])[:],
+
+    CCFLAGS=[
+        "-Werror=return-type",
+        "-march=armv6-m",
+        "-mcpu=cortex-m0plus",
+        "-mthumb",
+        "-ffunction-sections",
+        "-fdata-sections",
+        "-iprefix" + os.path.join(FRAMEWORK_DIR),
+        "@%s" % os.path.join(FRAMEWORK_DIR, "lib", "platform_inc.txt")
+    ],
+
+    CFLAGS=[
+        "-std=gnu17"
+    ],
+
+    CXXFLAGS=[
+        "-std=gnu++17",
+        "-fno-exceptions",
+        "-fno-rtti",
+    ],
+
+    CPPDEFINES=[
+        ("ARDUINO", 10810),
+        "ARDUINO_ARCH_RP2040",
+        ("F_CPU", "$BOARD_F_CPU"),
+        ("BOARD_NAME", '\\"%s\\"' % env.subst("$BOARD")),
+    ],
+
+    CPPPATH=[
+        os.path.join(FRAMEWORK_DIR, "cores", "rp2040"),
+        os.path.join(FRAMEWORK_DIR, "cores", "rp2040", "api", "deprecated"),
+        os.path.join(FRAMEWORK_DIR, "cores", "rp2040",
+                     "api", "deprecated-avr-comp")
+    ],
+
+    LINKFLAGS=[
+        "-march=armv6-m",
+        "-mcpu=cortex-m0plus",
+        "-mthumb",
+        "@%s" % os.path.join(FRAMEWORK_DIR, "lib", "platform_wrap.txt"),
+        "-u_printf_float",
+        "-u_scanf_float",
+        # no cross-reference table, heavily spams the output
+        # "-Wl,--cref",
+        "-Wl,--check-sections",
+        "-Wl,--gc-sections",
+        "-Wl,--unresolved-symbols=report-all",
+        "-Wl,--warn-common"
+    ],
+
+    LIBSOURCE_DIRS=[os.path.join(FRAMEWORK_DIR, "libraries")],
+
+    LIBPATH=[
+        os.path.join(FRAMEWORK_DIR, "lib")
+    ],
+
+    # link lib/libpico.a
+    LIBS=["pico", "m", "c", "stdc++", "c"]
+)
+
+
+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")])
+    elif "PIO_FRAMEWORK_ARDUINO_NO_USB" in cpp_defines:
+        env.Append(
+            CPPPATH=[os.path.join(FRAMEWORK_DIR, "tools", "libpico")],
+            CPPDEFINES=[
+                "NO_USB",
+                "DISABLE_USB_SERIAL" 
+            ]
+        )
+        # do not further add more USB flags or update sizes. no USB used.
+        return
+    else:
+        # standard Pico SDK USB stack used.
+        env.Append(CPPPATH=[os.path.join(FRAMEWORK_DIR, "tools", "libpico")])
+    # in any case, add standard flags
+    # preferably use USB information from arduino.earlephilhower section,
+    # but fallback to sensible values derived from other parts otherwise.
+    usb_pid = board.get("build.arduino.earlephilhower.usb_pid",
+                        board.get("build.hwids", [[0, 0]])[0][1])
+    usb_vid = board.get("build.arduino.earlephilhower.usb_vid",
+                        board.get("build.hwids", [[0, 0]])[0][0])
+    usb_manufacturer = board.get(
+        "build.arduino.earlephilhower.usb_manufacturer", board.get("vendor", "Raspberry Pi"))
+    usb_product = board.get(
+        "build.arduino.earlephilhower.usb_product", board.get("name", "Pico"))
+
+    # Copy logic from makeboards.py. 
+    # Depending on whether a certain upload / debug method is used, change
+    # the PID/VID.
+    # https://github.com/earlephilhower/arduino-pico/blob/master/tools/makeboards.py
+    vidtouse = usb_vid
+    pidtouse = usb_pid
+    if upload_protocol == "picoprobe": 
+        pidtouse = '0x0004'
+    elif upload_protocol == "picodebug":
+        vidtouse = '0x1209'
+        pidtouse = '0x2488'
+        ram_size = 240 * 1024
+
+    env.Append(CPPDEFINES=[
+        ("CFG_TUSB_MCU", "OPT_MCU_RP2040"),
+        ("USB_VID", usb_vid),
+        ("USB_PID", usb_pid),
+        ("USB_MANUFACTURER", '\\"%s\\"' % usb_manufacturer),
+        ("USB_PRODUCT", '\\"%s\\"' % usb_product),
+        ("SERIALUSB_PID", usb_pid)
+    ])
+
+    # use vidtouse and pidtouse 
+    # for USB PID/VID autodetection
+    hw_ids = board.get("build.hwids", [["0x2E8A", "0x00C0"]])
+    hw_ids[0][0] = vidtouse
+    hw_ids[0][1] = pidtouse
+    board.update("build.hwids", hw_ids)
+    board.update("upload.maximum_ram_size", ram_size)
+
+#
+# Process configuration flags
+#
+cpp_defines = env.Flatten(env.get("CPPDEFINES", []))
+
+configure_usb_flags(cpp_defines)
+
+# info about the filesystem is already parsed by the platform's main.py 
+# script. We can just use the info here
+ 
+linkerscript_cmd = env.Command(
+    os.path.join("$BUILD_DIR", "memmap_default.ld"),  # $TARGET
+    os.path.join(FRAMEWORK_DIR, "lib", "memmap_default.ld"),  # $SOURCE
+    env.VerboseAction(" ".join([
+        '"$PYTHONEXE" "%s"' % os.path.join(
+            FRAMEWORK_DIR, "tools", "simplesub.py"),
+        "--input", "$SOURCE",
+        "--out", "$TARGET",
+        "--sub", "__FLASH_LENGTH__", "$PICO_FLASH_LENGTH",
+        "--sub", "__EEPROM_START__", "$PICO_EEPROM_START",
+        "--sub", "__FS_START__", "$FS_START",
+        "--sub", "__FS_END__", "$FS_END",
+        "--sub", "__RAM_LENGTH__", "%dk" % (ram_size // 1024),
+    ]), "Generating linkerscript $BUILD_DIR/memmap_default.ld")
+)
+
+# 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)
+    env.Depends("$BUILD_DIR/${PROGNAME}.elf", linkerscript_cmd)
+    env.Replace(LDSCRIPT_PATH=os.path.join("$BUILD_DIR", "memmap_default.ld"))
+
+libs = []
+
+variant = board.get("build.arduino.earlephilhower.variant", board.get("build.variant", None))
+
+if variant is not None:
+    env.Append(CPPPATH=[
+        os.path.join(FRAMEWORK_DIR, "variants", variant)
+    ])
+
+    libs.append(
+        env.BuildLibrary(
+            os.path.join("$BUILD_DIR", "FrameworkArduinoVariant"),
+            os.path.join(FRAMEWORK_DIR, "variants", variant)))
+
+libs.append(
+    env.BuildLibrary(
+        os.path.join("$BUILD_DIR", "FrameworkArduino"),
+        os.path.join(FRAMEWORK_DIR, "cores", "rp2040")))
+
+bootloader_src_file = board.get(
+    "build.arduino.earlephilhower.boot2_source", "boot2_generic_03h_2_padded_checksum.S")
+
+# Add bootloader file (boot2.o)
+# Only build the needed .S file, exclude all others via src_filter.
+env.BuildSources(
+    os.path.join("$BUILD_DIR", "FrameworkArduinoBootloader"),
+    os.path.join(FRAMEWORK_DIR, "boot2"),
+    "-<*> +<%s>" % bootloader_src_file,
+)
+# Add include flags for all .S assembly file builds
+env.Append(
+    ASFLAGS=[
+        "-I", os.path.join(FRAMEWORK_DIR, "pico-sdk", "src",
+                           "rp2040", "hardware_regs", "include"),
+        "-I", os.path.join(FRAMEWORK_DIR, "pico-sdk", "src",
+                           "common", "pico_binary_info", "include")
+    ]
+)
+
+env.Prepend(LIBS=libs)
@@ -27,12 +27,10 @@
 #define PIN_SPI1_SS    (31u)

 // Wire
-#define PIN_WIRE0_SDA  (2u)
-#define PIN_WIRE0_SCL  (3u)
-
-// Not pinned out
-#define PIN_WIRE1_SDA  (31u)
-#define PIN_WIRE1_SCL  (31u)
+#define PIN_WIRE0_SDA  (24u)
+#define PIN_WIRE0_SCL  (25u)
+#define PIN_WIRE1_SDA  (2u)
+#define PIN_WIRE1_SCL  (3u)

 #define SERIAL_HOWMANY (2u)
 #define SPI_HOWMANY    (1u)
@@ -27,15 +27,13 @@
 #define PIN_SPI1_SS    (31u)

 // Wire
-#define PIN_WIRE0_SDA  (2u)
-#define PIN_WIRE0_SCL  (3u)
-
-// Not pinned out
-#define PIN_WIRE1_SDA  (31u)
-#define PIN_WIRE1_SCL  (31u)
+#define PIN_WIRE0_SDA  (24u)
+#define PIN_WIRE0_SCL  (25u)
+#define PIN_WIRE1_SDA  (2u)
+#define PIN_WIRE1_SCL  (3u)

 #define SERIAL_HOWMANY (2u)
 #define SPI_HOWMANY    (1u)
-#define WIRE_HOWMANY   (1u)
+#define WIRE_HOWMANY   (2u)

 #include "../generic/common.h"
@@ -0,0 +1,75 @@
+#pragma once
+
+#define PINS_COUNT          (28u)
+#define NUM_DIGITAL_PINS    (28u)
+#define NUM_ANALOG_INPUTS   (4u)
+#define NUM_ANALOG_OUTPUTS  (0u)
+#define ADC_RESOLUTION      (12u)
+
+// LEDs
+#define PIN_LED             (19u)
+
+// Serial1 (User serial port)
+#define PIN_SERIAL1_TX      (16u)
+#define PIN_SERIAL1_RX      (17u)
+
+// Serial2, connected to SARA-R4XX modem
+#define PIN_SERIAL2_TX      (4u)
+#define PIN_SERIAL2_RX      (5u)
+#define PIN_SERIAL2_CTS     (6u)
+#define PIN_SERIAL2_RTS     (7u)
+#define PIN_SARA_ON         (13u)
+#define PIN_SARA_RST        (14u)
+#define PIN_SARA_PWR        (15u)
+
+// SPI
+#define PIN_SPI0_MISO       (24u)
+#define PIN_SPI0_MOSI       (23u)
+#define PIN_SPI0_SCK        (22u)
+#define PIN_SPI0_SS         (21u)
+
+// Not pinned out
+#define PIN_SPI1_MISO       (31u)
+#define PIN_SPI1_MOSI       (31u)
+#define PIN_SPI1_SCK        (31u)
+#define PIN_SPI1_SS         (31u)
+
+// Wire
+#define PIN_WIRE0_SDA       (0u)
+#define PIN_WIRE0_SCL       (1u)
+
+// Not pinned out
+#define PIN_WIRE1_SDA       (31u)
+#define PIN_WIRE1_SCL       (31u)
+
+#define SERIAL_HOWMANY      (2u)
+#define SPI_HOWMANY         (1u)
+#define WIRE_HOWMANY        (1u)
+
+#define LED_BUILTIN         PIN_LED
+
+static const uint8_t D0 =   (16u);
+static const uint8_t D1 =   (17u);
+static const uint8_t D2 =   (24u);
+static const uint8_t D3 =   (23u);
+static const uint8_t D4 =   (22u);
+static const uint8_t D5 =   (2u);
+static const uint8_t D6 =   (3u);
+static const uint8_t D7 =   (0u);
+static const uint8_t D8 =   (1u);
+static const uint8_t D9 =   (12u);
+static const uint8_t D10 =  (11u);
+static const uint8_t D11 =  (10u);
+static const uint8_t D12 =  (9u);
+static const uint8_t D13 =  (8u);
+static const uint8_t D14 =  (13u);
+static const uint8_t D15 =  (14u);
+static const uint8_t D16 =  (15u);
+static const uint8_t D17 =  (19u);
+
+static const uint8_t A0 =   (29u);
+static const uint8_t A1 =   (28u);
+static const uint8_t A2 =   (27u);
+static const uint8_t A3 =   (26u);
+static const uint8_t A4 =   (25u);
+static const uint8_t A5 =   (21u);
@@ -0,0 +1,107 @@
+/*
+    ESP8285 helper class for the Challenger RP2040 WiFi boards
+
+    Copyright (c) 2021 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
+    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 <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
+}
+
+// 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
+  delay(1);
+  digitalWrite(PIN_ESP8285_RST, HIGH);      // Release ESP8285 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
+  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
+  doHWReset();
+}
+
+// Wait for the modem to reply with a "ready" prompt. This can be done
+// after a sw or hw reset have been performed to ensure that the AT
+// interpreter is up and running.
+bool Challenger2040WiFiClass::waitForReady() {
+  int timeout = 20;                         // Aprox max 2 sec
+
+  Serial2.begin(DEFAULT_ESP8285_BAUDRATE);
+  Serial2.setTimeout(100);
+  String rdy = Serial2.readStringUntil('\n');
+  while(!rdy.startsWith("ready") && timeout--) {
+    rdy = Serial2.readStringUntil('\n');
+  }
+  Serial2.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.
+bool Challenger2040WiFiClass::reset() {
+  runReset();
+  return waitForReady();
+}
+
+// Checks to see if the modem responds to the "AT" poll command.
+bool Challenger2040WiFiClass::isAlive() {
+  int timeout = 5;
+
+  Serial2.setTimeout(250);
+  Serial2.println(F("AT"));
+  String rdy = Serial2.readStringUntil('\n');
+  while(!rdy.startsWith(F("OK")) && timeout--) {
+    rdy = Serial2.readStringUntil('\n');
+  }
+  Serial2.setTimeout(1000);
+
+  if (timeout)
+    return true;
+  return false;
+}
+
+// Change the baud rate of the ESP8285 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
+// 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"));
+  delay(100);
+  Serial2.end();
+  Serial2.begin(baud);
+  return isAlive();
+}
+
+Challenger2040WiFiClass Challenger2040WiFi;
@@ -0,0 +1,36 @@
+/*
+    ESP8285 helper class for the Challenger RP2040 WiFi boards
+
+    Copyright (c) 2021 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
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#pragma once
+
+#define DEFAULT_ESP8285_BAUDRATE      115200
+
+class Challenger2040WiFiClass {
+  public:
+    Challenger2040WiFiClass();
+    void doHWReset();
+    void runReset();
+    void flashReset();
+    bool waitForReady();
+    bool reset();
+    bool isAlive();
+    bool changeBaudRate(int baud);
+};
+
+extern Challenger2040WiFiClass Challenger2040WiFi;
@@ -0,0 +1,73 @@
+#pragma once
+
+#define PINS_COUNT          (24u)
+#define NUM_DIGITAL_PINS    (24u)
+#define NUM_ANALOG_INPUTS   (4u)
+#define NUM_ANALOG_OUTPUTS  (0u)
+#define ADC_RESOLUTION      (12u)
+
+// LEDs
+#define PIN_LED             (12u)
+
+// Serial
+#define PIN_SERIAL1_TX      (16u)
+#define PIN_SERIAL1_RX      (17u)
+
+// Connected to ESP8285
+#define PIN_SERIAL2_TX      (4u)
+#define PIN_SERIAL2_RX      (5u)
+#define PIN_ESP8285_RST     (19u)
+#define PIN_ESP8285_MODE    (13u)
+
+// SPI
+#define PIN_SPI0_MISO       (24u)
+#define PIN_SPI0_MOSI       (23u)
+#define PIN_SPI0_SCK        (22u)
+#define PIN_SPI0_SS         (21u)
+
+// Not pinned out
+#define PIN_SPI1_MISO       (31u)
+#define PIN_SPI1_MOSI       (31u)
+#define PIN_SPI1_SCK        (31u)
+#define PIN_SPI1_SS         (31u)
+
+// Wire
+#define PIN_WIRE0_SDA       (0u)
+#define PIN_WIRE0_SCL       (1u)
+
+// Not pinned out
+#define PIN_WIRE1_SDA       (31u)
+#define PIN_WIRE1_SCL       (31u)
+
+#define SERIAL_HOWMANY      (2u)
+#define SPI_HOWMANY         (1u)
+#define WIRE_HOWMANY        (1u)
+
+#define LED_BUILTIN         PIN_LED
+#define NEOPIXEL            (11u)
+
+static const uint8_t D0 =   (16u);
+static const uint8_t D1 =   (17u);
+static const uint8_t D2 =   (24u);
+static const uint8_t D3 =   (23u);
+static const uint8_t D4 =   (22u);
+static const uint8_t D5 =   (2u);
+static const uint8_t D6 =   (3u);
+static const uint8_t D7 =   (0u);
+static const uint8_t D8 =   (1u);
+static const uint8_t D9 =   (6u);
+static const uint8_t D10 =  (7u);
+static const uint8_t D11 =  (8u);
+static const uint8_t D12 =  (9u);
+static const uint8_t D13 = (10u);
+static const uint8_t D14 = (11u);
+static const uint8_t D15 = (12u);
+static const uint8_t D16 = (13u);
+static const uint8_t D17 = (19u);
+
+static const uint8_t A0 = (26u);
+static const uint8_t A1 = (27u);
+static const uint8_t A2 = (28u);
+static const uint8_t A3 = (29u);
+static const uint8_t A4 = (25u);
+static const uint8_t A5 = (21u);
@@ -0,0 +1,57 @@
+#pragma once
+
+// LEDs
+#define PIN_LED             (3u)
+
+// Neopixel
+#define PIN_NEOPIXEL        (18u)
+#define NUM_NEOPIXEL        (2u)
+#define PIN_RGB             PIN_NEOPIXEL
+
+// Buzzer
+#define PIN_BUZZER          (22u)
+
+// Motor Driver
+#define PIN_M1A	            (8u)
+#define PIN_M1B	            (9u)
+#define PIN_M2A	            (10u)
+#define PIN_M2B	            (11u)
+
+// Voltage Monitor
+#define PIN_VBATT           (29u)
+#define PIN_VOLTAGE_MONITOR PIN_VBATT
+
+
+
+// Serial
+#define PIN_SERIAL1_TX      (0u)
+#define PIN_SERIAL1_RX      (1u)
+
+#define PIN_SERIAL2_TX      (4u)
+#define PIN_SERIAL2_RX      (5u)
+
+// SPI (Not pinned out)
+#define PIN_SPI0_MISO       (31u)
+#define PIN_SPI0_MOSI       (31u)
+#define PIN_SPI0_SCK        (31u)
+#define PIN_SPI0_SS         (31u)
+
+#define PIN_SPI1_MISO       (31u)
+#define PIN_SPI1_MOSI       (31u)
+#define PIN_SPI1_SCK        (31u)
+#define PIN_SPI1_SS         (31u)
+
+// Wire
+#define PIN_WIRE0_SDA       (16u)
+#define PIN_WIRE0_SCL       (17u)
+
+#define PIN_WIRE1_SDA       (2u)
+#define PIN_WIRE1_SCL       (3u)
+
+
+
+#define SERIAL_HOWMANY      (2u)
+#define SPI_HOWMANY         (0u)
+#define WIRE_HOWMANY        (2u)
+
+#include "../generic/common.h"
@@ -0,0 +1,39 @@
+#pragma once
+
+// Pin definitions taken from:
+//    https://datasheets.raspberrypi.org/pico/pico-datasheet.pdf
+
+
+// LEDs
+#define PIN_LED        (25u)
+
+// Serial
+#define PIN_SERIAL1_TX (0u)
+#define PIN_SERIAL1_RX (1u)
+
+#define PIN_SERIAL2_TX (8u)
+#define PIN_SERIAL2_RX (9u)
+
+// SPI
+#define PIN_SPI0_MISO  (20u)
+#define PIN_SPI0_MOSI  (19u)
+#define PIN_SPI0_SCK   (18u)
+#define PIN_SPI0_SS    (1u)
+
+#define PIN_SPI1_MISO  (12u)
+#define PIN_SPI1_MOSI  (11u)
+#define PIN_SPI1_SCK   (10u)
+#define PIN_SPI1_SS    (13u)
+
+// Wire
+#define PIN_WIRE0_SDA  (8u) 
+#define PIN_WIRE0_SCL  (9u)
+
+#define PIN_WIRE1_SDA  (2u) 
+#define PIN_WIRE1_SCL  (3u)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY    (2u)
+#define WIRE_HOWMANY   (2u)
+
+#include "../generic/common.h"
@@ -0,0 +1,39 @@
+#pragma once
+
+// Pin definitions taken from:
+//    https://datasheets.raspberrypi.org/pico/pico-datasheet.pdf
+
+
+// LEDs
+#define PIN_LED        (25u)
+
+// Serial
+#define PIN_SERIAL1_TX (0u)
+#define PIN_SERIAL1_RX (1u)
+
+#define PIN_SERIAL2_TX (8u)
+#define PIN_SERIAL2_RX (9u)
+
+// SPI
+#define PIN_SPI0_MISO  (16u)
+#define PIN_SPI0_MOSI  (19u)
+#define PIN_SPI0_SCK   (18u)
+#define PIN_SPI0_SS    (17u)
+
+#define PIN_SPI1_MISO  (12u)
+#define PIN_SPI1_MOSI  (15u)
+#define PIN_SPI1_SCK   (14u)
+#define PIN_SPI1_SS    (13u)
+
+// Wire
+#define PIN_WIRE0_SDA  (4u)
+#define PIN_WIRE0_SCL  (5u)
+
+#define PIN_WIRE1_SDA  (22u)
+#define PIN_WIRE1_SCL  (23u)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY    (2u)
+#define WIRE_HOWMANY   (2u)
+
+#include "../generic/common.h"
@@ -0,0 +1 @@
+#include "../generic/pins_arduino.h"
Author	SHA1	Message	Date
Eric Lind	238a6c83db	Update pins_arduino.h for challenger_2040_wifi (#356 ) Adding definitions for internal reset and mode pins for ESP8285.	2021-12-01 08:08:37 -08:00
Earle F. Philhower, III	77f03a44b6	Add WIZnet W5100S-EVB-Pico board (#355 )	2021-11-30 17:11:08 -08:00
Earle F. Philhower, III	29756de336	Update to SDFat 2.1.1 with UTF-8 support (#343 )	2021-11-30 17:06:58 -08:00
Earle F. Philhower, III	1afbbaba63	Add RTC headers to path and pico_utils to link (#353 ) Fixes #348 Add the RTC header path in the SDK to the Arduino build path. Also add pico_utils to the libpico.a for the datetime_to_str call. Note that the pico_sdk has a bug in the datetime.h header so you need to manually bracket the include file as "C": extern "C" { #include "pico/util/datetime.h" }	2021-11-28 09:00:14 -08:00
Maximilian Gerhardt	52b3120448	Correct typo in PlatformIO docs (#342 )	2021-11-02 08:54:47 -07:00
Earle F. Philhower, III	b7d76bd51d	Add RTTI menu to support apps which need RTTI (#338 ) By default RTTI (Run-Time Type Information) is disabled because most apps don't need run time type info enabled. However, certain libraries expect to be able to query types of objects at runtime, so add a menu to enable it.	2021-10-29 08:22:27 -07:00
Earle F. Philhower, III	c0411eefeb	Update README.md	2021-10-29 08:13:08 -07:00
uPesy Electronics	3d821f73a4	Add board variant for uPesy RP2040 DevKit (#335 )	2021-10-29 08:12:45 -07:00
Earle F. Philhower, III	1726f56a27	Update README.md	2021-10-29 08:04:33 -07:00
Wai Weng	a305b30d90	Added board variants Cytron Maker Pi RP2040. (#340 )	2021-10-29 08:04:15 -07:00
Giampiero Baggiani	9bed59858b	Disable pull-up/pull-down when setting pin as input (#332 ) In `pinMode()` I think it would be better to call `gpio_disable_pulls()` on the ulPin when ulMode == INPUT. Adding `gpio_disable_pulls(RP_PIN);` after `pinMode(RP_PIN, INPUT);` solves the issue.	2021-10-06 03:26:11 -07:00
apendley	cf63040c5a	Fix Wire pin definitions on ItsyBitsy (#325 )	2021-09-26 18:19:49 -07:00
Leonardo La Rocca	e8ec79290b	Reverted Wire and Wire1 for Melopero (#323 )	2021-09-26 18:11:25 -07:00
Mike Lynch	0c22150fdb	Add compiler Optimize option (#322 )	2021-09-26 18:05:35 -07:00
Ha Thach	423476dc87	Change qtpy boot2 to w25q080_2_padded (#321 )	2021-09-22 07:40:03 -07:00
Leonardo La Rocca	bfa3819b0d	Melopero Shake: Switched Wire1 with Wire for simpler use (#320 )	2021-09-22 07:39:25 -07:00
Earle F. Philhower, III	adf1c88c27	Fix spelling and update readme. Prep for 1.9.5 (#319 )	2021-09-19 13:43:26 -07:00
Dan Halbert	ad905ae992	Build libpico.a with PICO_XOSC_STARTUP_DELAY_MULTIPLIER=64 (#315 ) Fixes #312	2021-09-19 13:31:39 -07:00
Leonardo La Rocca	608a5da480	Adds board variant definition for Melopero Shake RP2040 (#318 )	2021-09-19 13:26:33 -07:00
Maximilian Gerhardt	3df3f0741a	Add PlatformIO support (#250 ) * Add package.json To make package easily integratable with PlatformIO * Correct name back to original one * Format package.json * Add first shot at builder script * Add USB stack flags, fix compile flags * Formatting * Add more link & USB flags * Build Boot2 bootloader * Formatting * Generate linkerscript, linker fixes * Fix linkflags, make firmware runnable * Update USB flags and RAM size * Correct USB flags, add dynamic sketch partitioning * Restructure filesystem size and flash size logic into platform code * Move C++ only flags to CXXFLAGS * Add PlatformIO documentation * Link to new platform.io document in the docs TOC * Fix typos in platformio docs * Fix one additional typo in platformio.rst * Update docs * Remove wrongly commited build folder	2021-09-13 21:28:07 -07:00
SirSydom	3585c58688	Reset the SDA and SCL pins to INPUT at Wire.end() to prevent multiple pins connected to I2C when changing pins (#302 )	2021-09-03 08:40:18 -07:00
Earle F. Philhower, III	a8121f31d4	Fix pulseIn detection (#293 ) Fixes #289	2021-08-30 12:40:38 -07:00
AustinMorris	38c005c208	Fix wire defines on feather (#281 )	2021-08-23 20:45:12 -07:00
Pontus Oldberg	cd91d3ef0f	Added minimal HW support for onboard WiFi modem. (#287 )	2021-08-23 20:34:25 -07:00
Pontus Oldberg	02e8577f45	Add support for reverse numbering of analog pins. (#283 )	2021-08-17 09:44:28 -07:00
Earle F. Philhower, III	8451bc21ec	Don't use no-c++-exceptions version of libstdc++ (#280 ) Per #276, #277, #274 there seems to be an issue with interrupts and some other low-level ARM operations when using the distributed libstdc++. Use the default libstdc++ built with the toolchain, instead. Fixes #277 Fixes #276 Fixes #274	2021-08-12 12:50:39 -07:00
Earle F. Philhower, III	28fe90e504	Update README.md	2021-08-12 08:55:12 -07:00
Pontus Oldberg	2c29314578	Add support for our new Challenger RP2040 board with LTE modem. (#275 ) * Adds support for Challenger RP2040 WiFi boards * Added Challenger board to makeboards build script * Adds new challenger board with LTE modem. * Updated after getting approved PID from Raspberry Pi	2021-08-12 08:42:09 -07:00
Earle F. Philhower, III	e196db9645	Update README.md	2021-07-29 09:02:45 -07:00
Pontus Oldberg	733aca5ac3	Adds support for Challenger RP2040 WiFi boards (#268 )	2021-07-29 08:59:27 -07:00
Earle F. Philhower, III	177a2d03a1	Update pull-request.yml	2021-07-29 07:56:10 -07:00
Earle F. Philhower, III	fec3ea882d	Minor paranoid nullptr checks in USB interface (#267 ) Identify some spots that GCC's -fanalyzer noted might need nullptr checks, and add them.	2021-07-28 18:11:25 -07:00
Earle F. Philhower, III	580970cd72	Use Stream::setTimeout to specify I2C TO (#263 ) Use the existing Arduino Stream method of setTimeout to set the Wire I2C timeout delay. Fixes #260	2021-07-23 15:20:34 -07:00
Earle F. Philhower, III	c13bb1ec2b	Make multiple SDFS/LittleFS.begin calls noops (#262 ) When LittleFS.begin() or SDFS.begin() is called after the filesystem is already mounted, don't unmount/remount. When an unmount happens, all old Files become invalid (but the core doesn't know this), so you would end up with random crashes in FS code. Now, check for _mounted, and if so just return immediately from begin().	2021-07-23 14:16:57 -07:00
Ubi de Feo	c777dd1657	Fix JSON URL (#261 ) you had "esrle" instead of "earle" in the GH URL :)	2021-07-23 08:17:32 -07:00
Earle F. Philhower, III	cb9931f3e8	Set available() to 0 when Wire.requestFrom fails (#259 ) Wire::requestFrom() returns the number of bytes read from the slave. In the case of error, the slave can end up returning a very large integer for PICO_GENERIC_ERROR which would then be used as the # of bytes read causing crashes and errors. Running TalkingToMyself without connecting the I2C ports would show this behavior. Now, when PICO_GENERIC_ERROR is returned, set the read-back buffer len to 0 explicitly.	2021-07-21 18:59:24 -07:00
Giampiero Baggiani	6b6254e84a	Added missing SPI::setCS(pin) in docs (#256 )	2021-07-20 03:45:01 -07:00
Maximilian Gerhardt	61c6305aa8	Fix upload file path escaping on Windows (#254 )	2021-07-19 08:46:55 -07:00
Earle F. Philhower, III	b43056cd73	Avoid issues w/other installed Windows Pythons (#253 ) When a Python MSI/etc. is installed under Windows, it sets a global PYTHONHOME and other variables. Our shipped Python can end up using these variables and attempt to load the wrong PYC files and fail to run. Avoid by using -I isolated mode in Python calls Fixes #252	2021-07-19 08:16:22 -07:00
Earle F. Philhower, III	e4c144829c	Remove exception handling code, save RAM and FLASH (#245 ) Use a libstdc++ compiled with -fno-exceptions to avoid including the code needed to unwind C++ exceptions. Saves ~4K RAM and ~5K flash.	2021-07-17 10:55:47 -07:00
Earle F. Philhower, III	05356da2c5	Fix PWM frequency at low and high frequencies (#244 ) The PWM HW can only divide 125MHZ sysclk by 1...256. That's only down to about 500khz. If the max count of the PWM (analogWriteScale) is too low then the actual PWM period will be much less than desired (and PWM frequency of course much higher). For example, at analogWriteFreq(100); analogWriteScale(256); the true PWM period would be 125M / 256 (pwmdiv) / 256 (scale) = ~2khz. Conversely, at high frequencies and large scales it is impossible to achieve the requested frequency and a much lower one would be generated. For example: freq(60K), scale(32768). PWM period = 125M / 1 (pwmdiv) / 32768 = ~4kHz. Avoid this by adjusting the analogWrite scale in the core to either increase the PWM count for low frequencies, or decrease it for high frequencies. This is done behind the scenes and code is not required to be changed. The PWM frequency will still not be perfcetly exact due to the divider HW and clocks involved, but it will be very close across the whole range. Fixes #234	2021-07-15 08:34:53 -07:00
majbthrd	47a4d9f803	Add pico-debug support (#239 )	2021-07-07 12:55:03 -07:00
Earle F. Philhower, III	e4185ce4ce	Update toolchain, add CMSIS-DAP to OpenOCD (#241 ) Enable use of the included openocd binary with pico-debug	2021-07-05 19:29:47 -07:00
Earle F. Philhower, III	c539742e13	Disable ignored-qualifier warning in SDK (#238 ) The Pico SDK has some magic with const pointers that generates lots of "ignored qualifer" warnings on the more pedantic modes. To clean the normal builds up, disable this warning for now. At some point a PR to the PICO-SDK may be indicated.	2021-07-04 13:46:50 -07:00
Earle F. Philhower, III	ebd2289971	Add warning flags to build, catch missing return (#237 ) Fixes #236 Compiler warning flags were completely ignored/missed in platform.txt. Add them, as normal, and include -Werror=return-type because GCC will produce crashing apps when a function return value is missing.	2021-07-04 12:30:59 -07:00
Earle F. Philhower, III	d67329a2b8	Rename assembly dir to boot2, only has boot2.Ss (#230 )	2021-06-30 08:42:13 -07:00
Ha Thach	3a9703fc20	Update tinyusb 1.3.0 (#228 ) * update included tinyusb to 1.2.0 move tusb_config.h from core to library for more portability * pump tinyusb * update tinyusb to 1.3.0 * try to fix ci warning	2021-06-30 08:22:36 -07:00
Earle F. Philhower, III	856b105ab9	Clean up include paths, remove duplicates/invalids (#229 )	2021-06-30 08:13:19 -07:00
Earle F. Philhower, III	03e740a511	Add CPU cycle counter accessors (#226 ) Use the 24-bit SYSTICK peripheral, wrapped in logic to extend it to a full 32 or 64bits. W/o the wrapper, SYSTICK will wrap around in ~100ms. Adds rp2040.getCycleCount() and rp2040.getCycleCount64() Clean up the libpico build process as crt0.S from the pico-sdk should be directly used. Clean up the keywords file.	2021-06-28 20:53:40 -07:00
Earle F. Philhower, III	e628c8e211	Upgrade Newlib to include 64-bit/8-bit %llu/%hhd (#227 )	2021-06-28 20:46:08 -07:00
Ha Thach	7eca6c609f	Use correct tusb_config.h for built-in usb (pico-sdk) (#219 ) Fix issue with usbd_desc_cfg value may not be initialized as zero.	2021-06-26 09:37:41 -07:00
Earle F. Philhower, III	f299120798	Remove accidental debug message	2021-06-25 18:47:02 -07:00