Merge branch 'master' of https://github.com/earlephilhower/arduino-pico

Should fix #134 .  The SPI pin macros were set using the SPI1 set, not
the SPI0 set of pins it should have been using.

.gitmodules

@@ -16,3 +16,9 @@
 [submodule "pico-extras"]
 	path = pico-extras
 	url = https://github.com/raspberrypi/pico-extras.git
+[submodule "libraries/Keyboard"]
+	path = libraries/Keyboard
+	url = https://github.com/earlephilhower/Keyboard
+[submodule "libraries/Mouse"]
+	path = libraries/Mouse
+	url = https://github.com/earlephilhower/Mouse

README.md

@@ -2,14 +2,10 @@
 
 Raspberry Pi Pico Arduino core, for all RP2040 boards
 
-This is a port of the RP2040 (Raspberry Pi Pico processor) to the Arduino ecosystem.
+This is a port of the RP2040 (Raspberry Pi Pico processor) to the Arduino ecosystem. It uses the bare Raspberry Pi Pico SDK and a custom GCC 10.2/Newlib 4.0 toolchain.
 
-It uses a custom toolset with GCC 10.2 and Newlib 4.0.0, not depending on system-installed prerequisites.  https://github.com/earlephilhower/pico-quick-toolchain
-
-There is automated discovery of boards in bootloader mode, so they show up in the IDE, and the upload command works using the Microsoft UF2 tool (included).
-
-# Detailed Documentation
-Refer to the examples and https://arduino-pico.readthedocs.io/en/latest/ for more detailed usage information.
+# Documentation
+See https://arduino-pico.readthedocs.io/en/latest/ along with the examples for more detailed usage information.
 
 # Installing via Arduino Boards Manager
 **Windows Users**: Please do not use the Windows Store version of the actual Arduino application
@@ -98,6 +94,7 @@ The installed tools include a version of OpenOCD (in the pqt-openocd directory)
 
 # Status of Port
 Relatively stable and very functional, but bug reports and PRs always accepted.
+* USB Keyboard and Mouse emulation
 * Multicore support (setup1() and loop1())
 * digitalWrite/Read
 * shiftIn/Out
@@ -135,7 +132,7 @@ If you want to contribute or have bugfixes, drop me a note at <earlephilhower@ya
 * The [Arduino IDE and ArduinoCore-API](https://arduino.cc) are developed and maintained by the Arduino team. The IDE is licensed under GPL.
 * The [RP2040 GCC-based toolchain](https://github.com/earlephilhower/pico-quick-toolchain) is licensed under under the GPL.
 * The [Pico-SDK](https://github.com/raspberrypi/pico-sdk) and [Pico-Extras](https://github.com/raspberrypi/pico-extras) are by Raspberry Pi (Trading) Ltd and licensed under the BSD 3-Clause license.
-* [Arduino-Pico](https://github.com/earlephilhower/arduino-pico) core files are licenses under the LGPL.
+* [Arduino-Pico](https://github.com/earlephilhower/arduino-pico) core files are licensed under the LGPL.
 * [LittleFS](https://github.com/ARMmbed/littlefs) library written by ARM Limited and released under the [BSD 3-clause license](https://github.com/ARMmbed/littlefs/blob/master/LICENSE.md).
 * [UF2CONV.PY](https://github.com/microsoft/uf2) is by Microsoft Corporation and licensed under the MIT license.
 * Some filesystem code taken from the [ESP8266 Arduino Core](https://github.com/esp8266/Arduino) and licensed under the LGPL.

cores/rp2040/Arduino.h

@@ -24,10 +24,13 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+// Wacky deprecated AVR compatibilty functions
+#include "stdlib_noniso.h"
 
 #include "api/ArduinoAPI.h"
 #include <pins_arduino.h>
 
+
 // Required for the port*Register macros
 #include "hardware/gpio.h"
 

cores/rp2040/Printable.h

@@ -0,0 +1 @@
+#include "api/Printable.h"

cores/rp2040/RP2040USB.cpp

@@ -0,0 +1,319 @@
+/*
+ * Shared USB for the Raspberry Pi Pico RP2040
+ * Allows for multiple endpoints to share the USB controller
+ *
+ * Copyright (c) 2021 Earle F. Philhower, III <earlephilhower@yahoo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <Arduino.h>
+#include "CoreMutex.h"
+#include "RP2040USB.h"
+
+#include "tusb.h"
+#include "class/hid/hid_device.h"
+#include "class/audio/audio.h"
+#include "class/midi/midi.h"
+#include "pico/time.h"
+#include "hardware/irq.h"
+#include "pico/mutex.h"
+#include "pico/unique_id.h"
+
+// Big, global USB mutex, shared with all USB devices to make sure we don't
+// have multiple cores updating the TUSB state in parallel
+mutex_t __usb_mutex;
+
+// USB processing will be a periodic timer task
+#define USB_TASK_INTERVAL 1000
+#define USB_TASK_IRQ 31
+
+// USB VID/PID (note that PID can change depending on the add'l interfaces)
+#define USBD_VID (0x2E8A) // Raspberry Pi
+
+#ifdef SERIALUSB_PID
+    #define USBD_PID (SERIALUSB_PID)
+#else
+    #define USBD_PID (0x000a) // Raspberry Pi Pico SDK CDC
+#endif
+
+#define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
+#define USBD_MAX_POWER_MA (250)
+
+#define USBD_ITF_CDC (0) // needs 2 interfaces
+#define USBD_ITF_MAX (2)
+
+#define USBD_CDC_EP_CMD (0x81)
+#define USBD_CDC_EP_OUT (0x02)
+#define USBD_CDC_EP_IN (0x82)
+#define USBD_CDC_CMD_MAX_SIZE (8)
+#define USBD_CDC_IN_OUT_MAX_SIZE (64)
+
+#define USBD_STR_0 (0x00)
+#define USBD_STR_MANUF (0x01)
+#define USBD_STR_PRODUCT (0x02)
+#define USBD_STR_SERIAL (0x03)
+#define USBD_STR_CDC (0x04)
+
+
+#define EPNUM_HID   0x83
+
+#define EPNUM_MIDI   0x01
+
+
+const uint8_t *tud_descriptor_device_cb(void) {
+    static tusb_desc_device_t usbd_desc_device = {
+        .bLength = sizeof(tusb_desc_device_t),
+        .bDescriptorType = TUSB_DESC_DEVICE,
+        .bcdUSB = 0x0200,
+        .bDeviceClass = TUSB_CLASS_CDC,
+        .bDeviceSubClass = MISC_SUBCLASS_COMMON,
+        .bDeviceProtocol = MISC_PROTOCOL_IAD,
+        .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
+        .idVendor = USBD_VID,
+        .idProduct = USBD_PID,
+        .bcdDevice = 0x0100,
+        .iManufacturer = USBD_STR_MANUF,
+        .iProduct = USBD_STR_PRODUCT,
+        .iSerialNumber = USBD_STR_SERIAL,
+        .bNumConfigurations = 1
+    };
+    if (__USBInstallSerial && !__USBInstallKeyboard && !__USBInstallMouse && !__USBInstallMIDI) {
+        // Can use as-is, this is the default USB case
+        return (const uint8_t *)&usbd_desc_device;
+    }
+    // Need a multi-endpoint config which will require changing the PID to help Windows not barf
+    if (__USBInstallKeyboard) {
+        usbd_desc_device.idProduct |= 0x8000;
+    }
+    if (__USBInstallMouse) {
+        usbd_desc_device.idProduct |= 0x4000;
+    }
+    if (__USBInstallMIDI) {
+        usbd_desc_device.idProduct |= 0x2000;
+    }
+    // Set the device class to 0 to indicate multiple device classes
+    usbd_desc_device.bDeviceClass = 0;
+    usbd_desc_device.bDeviceSubClass = 0;
+    usbd_desc_device.bDeviceProtocol = 0;
+    return (const uint8_t *)&usbd_desc_device;
+}
+
+int __USBGetKeyboardReportID() {
+    return 1;
+}
+
+int __USBGetMouseReportID() {
+    return __USBInstallKeyboard ? 2 : 1;
+}
+
+static uint8_t *GetDescHIDReport(int *len) {
+    if (__USBInstallKeyboard && __USBInstallMouse) {
+        static 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);
+        }
+        return desc_hid_report;
+    } else if (__USBInstallKeyboard && ! __USBInstallMouse) {
+        static uint8_t desc_hid_report[] = {
+            TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(1) )
+        };
+        if (len) {
+            *len = sizeof(desc_hid_report);
+        }
+        return desc_hid_report;
+    } else { // if (!__USBInstallKeyboard && __USBInstallMouse) {
+        static uint8_t desc_hid_report[] = {
+            TUD_HID_REPORT_DESC_MOUSE( HID_REPORT_ID(1) )
+        };
+        if (len) {
+            *len = sizeof(desc_hid_report);
+        }
+        return desc_hid_report;
+    }
+}
+
+// Invoked when received GET HID REPORT DESCRIPTOR
+// Application return pointer to descriptor
+// Descriptor contents must exist long enough for transfer to complete
+uint8_t const * tud_hid_descriptor_report_cb(void)
+{
+    return GetDescHIDReport(nullptr);
+}   
+
+
+const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
+    (void)index;
+    int len = 0;
+    static uint8_t *usbd_desc_cfg;
+    
+    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] = {
+            // 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)
+        };
+
+        int hid_report_len;
+        GetDescHIDReport(&hid_report_len);
+        uint8_t hid_itf = __USBInstallSerial ? 2 : 0;
+        static 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_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] = {
+            // 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] = {
+            // 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));
+        }
+    }
+    return usbd_desc_cfg;
+}
+
+const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
+    #define DESC_STR_MAX (20)
+    static uint16_t desc_str[DESC_STR_MAX];
+
+    static char idString[PICO_UNIQUE_BOARD_ID_SIZE_BYTES * 2 + 1];
+
+    static const char *const usbd_desc_str[] = {
+        [USBD_STR_0] = "",
+        [USBD_STR_MANUF] = "Raspberry Pi",
+        [USBD_STR_PRODUCT] = "PicoArduino",
+        [USBD_STR_SERIAL] = idString,
+        [USBD_STR_CDC] = "Board CDC",
+    };
+
+    if (!idString[0]) {
+        // Get ID string into human readable serial number on the first pass
+        pico_unique_board_id_t id;
+        pico_get_unique_board_id(&id);
+        idString[0] = 0;
+        for (auto i = 0; i < PICO_UNIQUE_BOARD_ID_SIZE_BYTES; i++) {
+            char hx[3];
+            sprintf(hx, "%02X", id.id[i]);
+            strcat(idString, hx);
+        }
+    }
+
+    uint8_t len;
+    if (index == 0) {
+        desc_str[1] = 0x0409; // supported language is English
+        len = 1;
+    } else {
+        if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
+            return NULL;
+        }
+        const char *str = usbd_desc_str[index];
+        for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
+            desc_str[1 + len] = str[len];
+        }
+    }
+
+    // first byte is length (including header), second byte is string type
+    desc_str[0] = (TUSB_DESC_STRING << 8) | (2 * len + 2);
+
+    return desc_str;
+}
+
+
+static void usb_irq() {
+    // if the mutex is already owned, then we are in user code
+    // in this file which will do a tud_task itself, so we'll just do nothing
+    // until the next tick; we won't starve
+    if (mutex_try_enter(&__usb_mutex, NULL)) {
+        tud_task();
+        mutex_exit(&__usb_mutex);
+    }
+}
+
+static int64_t timer_task(__unused alarm_id_t id, __unused void *user_data) {
+    irq_set_pending(USB_TASK_IRQ);
+    return USB_TASK_INTERVAL;
+}
+
+void __USBStart() {
+    if (tusb_inited()) {
+        // Already called
+        return;
+    }
+
+    mutex_init(&__usb_mutex);
+    tusb_init();
+
+    irq_set_exclusive_handler(USB_TASK_IRQ, usb_irq);
+    irq_set_enabled(USB_TASK_IRQ, true);
+
+    add_alarm_in_us(USB_TASK_INTERVAL, timer_task, NULL, true);
+}
+
+
+// Invoked when received GET_REPORT control request
+// Application must fill buffer report's content and return its length.
+// Return zero will cause the stack to STALL request
+uint16_t tud_hid_get_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen)
+{
+  // TODO not Implemented
+  (void) report_id;
+  (void) report_type;
+  (void) buffer;
+  (void) reqlen;
+
+  return 0;
+}
+
+// Invoked when received SET_REPORT control request or
+// received data on OUT endpoint ( Report ID = 0, Type = 0 )
+void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize)
+{
+  // TODO set LED based on CAPLOCK, NUMLOCK etc...
+  (void) report_id;
+  (void) report_type;
+  (void) buffer;
+  (void) bufsize;
+}
+

cores/rp2040/RP2040USB.h

@@ -0,0 +1,39 @@
+/*
+ * Shared USB for the Raspberry Pi Pico RP2040
+ * Allows for multiple endpoints to share the USB controller
+ *
+ * Copyright (c) 2021 Earle F. Philhower, III <earlephilhower@yahoo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "pico/mutex.h"
+
+// Weak function definitions for each type of endpoint
+extern void __USBInstallSerial() __attribute__((weak));
+extern void __USBInstallKeyboard() __attribute__((weak));
+extern void __USBInstallMouse() __attribute__((weak));
+extern void __USBInstallMIDI() __attribute__((weak));
+
+// Big, global USB mutex, shared with all USB devices to make sure we don't
+// have multiple cores updating the TUSB state in parallel
+extern mutex_t __usb_mutex;
+
+// HID report ID inquiry (report ID will vary depending on the number/type of other HID)
+int __USBGetKeyboardReportID();
+int __USBGetMouseReportID();
+
+// Called by main() to init the USB HW/SW.
+void __USBStart();

cores/rp2040/SerialUSB.cpp

@@ -32,6 +32,11 @@
 #include "hardware/watchdog.h"
 #include "pico/unique_id.h"
 
+#ifndef DISABLE_USB_SERIAL
+    // Ensure we are installed in the USB chain
+    void __USBInstallSerial() { /* noop */ }
+#endif
+
 // SerialEvent functions are weak, so when the user doesn't define them,
 // the linker just sets their address to 0 (which is checked below).
 // The Serialx_available is just a wrapper around Serialx.available(),
@@ -39,121 +44,8 @@
 // HardwareSerial instance if the user doesn't also refer to it.
 extern void serialEvent() __attribute__((weak));
 
-#define PICO_STDIO_USB_TASK_INTERVAL_US 1000
-#define PICO_STDIO_USB_LOW_PRIORITY_IRQ 31
 
-#define USBD_VID (0x2E8A) // Raspberry Pi
-
-#ifdef SERIALUSB_PID
-    #define USBD_PID (SERIALUSB_PID)
-#else
-    #define USBD_PID (0x000a) // Raspberry Pi Pico SDK CDC
-#endif
-
-#define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
-#define USBD_MAX_POWER_MA (250)
-
-#define USBD_ITF_CDC (0) // needs 2 interfaces
-#define USBD_ITF_MAX (2)
-
-#define USBD_CDC_EP_CMD (0x81)
-#define USBD_CDC_EP_OUT (0x02)
-#define USBD_CDC_EP_IN (0x82)
-#define USBD_CDC_CMD_MAX_SIZE (8)
-#define USBD_CDC_IN_OUT_MAX_SIZE (64)
-
-#define USBD_STR_0 (0x00)
-#define USBD_STR_MANUF (0x01)
-#define USBD_STR_PRODUCT (0x02)
-#define USBD_STR_SERIAL (0x03)
-#define USBD_STR_CDC (0x04)
-
-// Note: descriptors returned from callbacks must exist long enough for transfer to complete
-
-static const tusb_desc_device_t usbd_desc_device = {
-    .bLength = sizeof(tusb_desc_device_t),
-    .bDescriptorType = TUSB_DESC_DEVICE,
-    .bcdUSB = 0x0200,
-    .bDeviceClass = TUSB_CLASS_CDC,
-    .bDeviceSubClass = MISC_SUBCLASS_COMMON,
-    .bDeviceProtocol = MISC_PROTOCOL_IAD,
-    .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
-    .idVendor = USBD_VID,
-    .idProduct = USBD_PID,
-    .bcdDevice = 0x0100,
-    .iManufacturer = USBD_STR_MANUF,
-    .iProduct = USBD_STR_PRODUCT,
-    .iSerialNumber = USBD_STR_SERIAL,
-    .bNumConfigurations = 1,
-};
-
-static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
-    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
-        TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
-
-    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),
-};
-
-static char _idString[PICO_UNIQUE_BOARD_ID_SIZE_BYTES * 2 + 1];
-
-static const char *const usbd_desc_str[] = {
-    [USBD_STR_0] = "",
-    [USBD_STR_MANUF] = "Raspberry Pi",
-    [USBD_STR_PRODUCT] = "PicoArduino",
-    [USBD_STR_SERIAL] = _idString,
-    [USBD_STR_CDC] = "Board CDC",
-};
-
-const uint8_t *tud_descriptor_device_cb(void) {
-    return (const uint8_t *)&usbd_desc_device;
-}
-
-const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
-    (void)index;
-    return usbd_desc_cfg;
-}
-
-const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
-    #define DESC_STR_MAX (20)
-    static uint16_t desc_str[DESC_STR_MAX];
-
-    uint8_t len;
-    if (index == 0) {
-        desc_str[1] = 0x0409; // supported language is English
-        len = 1;
-    } else {
-        if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
-            return NULL;
-        }
-        const char *str = usbd_desc_str[index];
-        for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
-            desc_str[1 + len] = str[len];
-        }
-    }
-
-    // first byte is length (including header), second byte is string type
-    desc_str[0] = (TUSB_DESC_STRING << 8) | (2 * len + 2);
-
-    return desc_str;
-}
-
-static mutex_t usb_mutex;
-
-static void low_priority_worker_irq() {
-    // if the mutex is already owned, then we are in user code
-    // in this file which will do a tud_task itself, so we'll just do nothing
-    // until the next tick; we won't starve
-    if (mutex_try_enter(&usb_mutex, NULL)) {
-        tud_task();
-        mutex_exit(&usb_mutex);
-    }
-}
-
-static int64_t timer_task(__unused alarm_id_t id, __unused void *user_data) {
-    irq_set_pending(PICO_STDIO_USB_LOW_PRIORITY_IRQ);
-    return PICO_STDIO_USB_TASK_INTERVAL_US;
-}
+extern mutex_t __usb_mutex;
 
 void SerialUSB::begin(unsigned long baud) {
     (void) baud; //ignored
@@ -162,24 +54,6 @@ void SerialUSB::begin(unsigned long baud) {
         return;
     }
 
-    // Get ID string into human readable serial number
-    pico_unique_board_id_t id;
-    pico_get_unique_board_id(&id);
-    _idString[0] = 0;
-    for (auto i = 0; i < PICO_UNIQUE_BOARD_ID_SIZE_BYTES; i++) {
-        char hx[3];
-        sprintf(hx, "%02X", id.id[i]);
-        strcat(_idString, hx);
-    }
-
-    tusb_init();
-
-    irq_set_exclusive_handler(PICO_STDIO_USB_LOW_PRIORITY_IRQ, low_priority_worker_irq);
-    irq_set_enabled(PICO_STDIO_USB_LOW_PRIORITY_IRQ, true);
-
-    mutex_init(&usb_mutex);
-    add_alarm_in_us(PICO_STDIO_USB_TASK_INTERVAL_US, timer_task, NULL, true);
-
     _running = true;
 }
 
@@ -188,7 +62,7 @@ void SerialUSB::end() {
 }
 
 int SerialUSB::peek() {
-    CoreMutex m(&usb_mutex);
+    CoreMutex m(&__usb_mutex);
     if (!_running || !m) {
         return 0;
     }
@@ -198,7 +72,7 @@ int SerialUSB::peek() {
 }
 
 int SerialUSB::read() {
-    CoreMutex m(&usb_mutex);
+    CoreMutex m(&__usb_mutex);
     if (!_running || !m) {
         return -1;
     }
@@ -210,7 +84,7 @@ int SerialUSB::read() {
 }
 
 int SerialUSB::available() {
-    CoreMutex m(&usb_mutex);
+    CoreMutex m(&__usb_mutex);
     if (!_running || !m) {
         return 0;
     }
@@ -219,7 +93,7 @@ int SerialUSB::available() {
 }
 
 int SerialUSB::availableForWrite() {
-    CoreMutex m(&usb_mutex);
+    CoreMutex m(&__usb_mutex);
     if (!_running || !m) {
         return 0;
     }
@@ -228,7 +102,7 @@ int SerialUSB::availableForWrite() {
 }
 
 void SerialUSB::flush() {
-    CoreMutex m(&usb_mutex);
+    CoreMutex m(&__usb_mutex);
     if (!_running || !m) {
         return;
     }
@@ -241,7 +115,7 @@ size_t SerialUSB::write(uint8_t c) {
 }
 
 size_t SerialUSB::write(const uint8_t *buf, size_t length) {
-    CoreMutex m(&usb_mutex);
+    CoreMutex m(&__usb_mutex);
     if (!_running || !m) {
         return 0;
     }
@@ -276,7 +150,7 @@ size_t SerialUSB::write(const uint8_t *buf, size_t length) {
 }
 
 SerialUSB::operator bool() {
-    CoreMutex m(&usb_mutex);
+    CoreMutex m(&__usb_mutex);
     if (!_running || !m) {
         return false;
     }

cores/rp2040/main.cpp

@@ -19,6 +19,7 @@
  */
 
 #include <Arduino.h>
+#include "RP2040USB.h"
 #include <pico/stdlib.h>
 #include <pico/multicore.h>
 
@@ -59,6 +60,7 @@ extern "C" int main() {
 
     mutex_init(&_pioMutex);
     initVariant();
+    __USBStart();
 
 #ifndef DISABLE_USB_SERIAL
     // Enable serial port for reset/upload always

docs/index.rst

@@ -31,11 +31,10 @@ For the latest version, always check https://github.com/earlephilhower/arduino-p
    SPI <spi>
    Wire(I2C) <wire>
    File Systems (SD, SDFS, LittleFS) <fs>
-
-   Ported/Optimized Libraries <libraries>
-
+   USB Keyboard/Mouse <usb>
    Multicore Processing <multicore>
 
+   Ported/Optimized Libraries <libraries>
    Using Pico-SDK <sdk>
 
    Licenses <license>

docs/install.rst

@@ -80,6 +80,30 @@ the ``USB Serial (CDC)`` driver.
 
    .. image:: images/install_driver_old_win.png
 
+Windows 7 Installation Problems
+-------------------------------
+
+When running MalwareBytes antivirus (or others) the scanner may lock the compiler or other toolchain executables, causing installation or build failures.  (Thanks to @Andy2No)
+
+Symptoms include:
+
+*Access denied during update in the boards manager - affects the .exe files, because MalwareBytes has locked them.
+* Access denied during compilation, to one of the .exe files - same reason.
+* Can't delete the .exe files - they're locked by MalwareBytes.
+
+A workaround is possible, involving setting the toolchain as an "excluded directory" and reinstalling.
+
+1. In MalwareBytes Settings, click the Exclusions tab. Add an exclusion for the equivalent of this folder path:
+
+``C:\Users{YOUR_USERNAME_HERE}\AppData\Local\Arduino15\packages\rp2040\tools\pqt-gcc\1.1.0-a-81a1771``
+
+2. Reboot to unlock the files.
+
+3. Do the boards manager installation / upgrade again.
+
+4. Set the board type, e.g. to Raspberry Pi Pico and check it can compile.
+
+
 Uploading Filesystem Images
 ---------------------------
 The onboard flash filesystem for the Pico, LittleFS, lets you upload a filesystem image from the sketch directory for your sketch to use.  Download the needed plugin from

docs/usb.rst

@@ -0,0 +1,11 @@
+USB Keyboard and Mouse
+======================
+
+The Arduino-Pico core includes ported versions of the standard Arduino
+``Keyboard`` and ``Mouse`` libraries.  These libraries allow you to
+emulate a keyboard or mouse with the Pico in your sketches.
+
+See the examples and Arduino Reference at
+https://www.arduino.cc/reference/en/language/functions/usb/keyboard/
+and
+https://www.arduino.cc/reference/en/language/functions/usb/mouse

lib/platform_inc.txt

@@ -0,0 +1,57 @@
+-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
+-iwithprefixbefore/pico-sdk/src/common/pico_stdlib/include
+-iwithprefixbefore/pico-sdk/src/common/pico_sync/include
+-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
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_claim/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_clocks/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_divider/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_dma/include
+-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_pio/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_pll/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_pwm/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_resets/include
+-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
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_xosc/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_bootrom/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_double/include
+-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

lib/platform_wrap.txt

@@ -0,0 +1,149 @@
+-Wl,--wrap=acos
+-Wl,--wrap=acosf
+-Wl,--wrap=acosh
+-Wl,--wrap=acoshf
+-Wl,--wrap=__aeabi_cdcmpeq
+-Wl,--wrap=__aeabi_cdcmple
+-Wl,--wrap=__aeabi_cdrcmple
+-Wl,--wrap=__aeabi_cfcmpeq
+-Wl,--wrap=__aeabi_cfcmple
+-Wl,--wrap=__aeabi_cfrcmple
+-Wl,--wrap=__aeabi_d2f
+-Wl,--wrap=__aeabi_d2iz
+-Wl,--wrap=__aeabi_d2lz
+-Wl,--wrap=__aeabi_d2uiz
+-Wl,--wrap=__aeabi_d2ulz
+-Wl,--wrap=__aeabi_dadd
+-Wl,--wrap=__aeabi_dcmpeq
+-Wl,--wrap=__aeabi_dcmpge
+-Wl,--wrap=__aeabi_dcmpgt
+-Wl,--wrap=__aeabi_dcmple
+-Wl,--wrap=__aeabi_dcmplt
+-Wl,--wrap=__aeabi_dcmpun
+-Wl,--wrap=__aeabi_ddiv
+-Wl,--wrap=__aeabi_dmul
+-Wl,--wrap=__aeabi_drsub
+-Wl,--wrap=__aeabi_dsub
+-Wl,--wrap=__aeabi_f2d
+-Wl,--wrap=__aeabi_f2iz
+-Wl,--wrap=__aeabi_f2lz
+-Wl,--wrap=__aeabi_f2uiz
+-Wl,--wrap=__aeabi_f2ulz
+-Wl,--wrap=__aeabi_fadd
+-Wl,--wrap=__aeabi_fcmpeq
+-Wl,--wrap=__aeabi_fcmpge
+-Wl,--wrap=__aeabi_fcmpgt
+-Wl,--wrap=__aeabi_fcmple
+-Wl,--wrap=__aeabi_fcmplt
+-Wl,--wrap=__aeabi_fcmpun
+-Wl,--wrap=__aeabi_fdiv
+-Wl,--wrap=__aeabi_fmul
+-Wl,--wrap=__aeabi_frsub
+-Wl,--wrap=__aeabi_fsub
+-Wl,--wrap=__aeabi_i2d
+-Wl,--wrap=__aeabi_i2f
+-Wl,--wrap=__aeabi_idiv
+-Wl,--wrap=__aeabi_idivmod
+-Wl,--wrap=__aeabi_l2d
+-Wl,--wrap=__aeabi_l2f
+-Wl,--wrap=__aeabi_ldivmod
+-Wl,--wrap=__aeabi_lmul
+-Wl,--wrap=__aeabi_memcpy
+-Wl,--wrap=__aeabi_memcpy4
+-Wl,--wrap=__aeabi_memcpy8
+-Wl,--wrap=__aeabi_memset
+-Wl,--wrap=__aeabi_memset4
+-Wl,--wrap=__aeabi_memset8
+-Wl,--wrap=__aeabi_ui2d
+-Wl,--wrap=__aeabi_ui2f
+-Wl,--wrap=__aeabi_uidiv
+-Wl,--wrap=__aeabi_uidivmod
+-Wl,--wrap=__aeabi_ul2d
+-Wl,--wrap=__aeabi_ul2f
+-Wl,--wrap=__aeabi_uldivmod
+-Wl,--wrap=asin
+-Wl,--wrap=asinf
+-Wl,--wrap=asinh
+-Wl,--wrap=asinhf
+-Wl,--wrap=atan
+-Wl,--wrap=atan2
+-Wl,--wrap=atan2f
+-Wl,--wrap=atanf
+-Wl,--wrap=atanh
+-Wl,--wrap=atanhf
+-Wl,--wrap=calloc
+-Wl,--wrap=cbrt
+-Wl,--wrap=cbrtf
+-Wl,--wrap=ceil
+-Wl,--wrap=ceilf
+-Wl,--wrap=__clz
+-Wl,--wrap=__clzdi2
+-Wl,--wrap=__clzl
+-Wl,--wrap=__clzll
+-Wl,--wrap=__clzsi2
+-Wl,--wrap=copysign
+-Wl,--wrap=copysignf
+-Wl,--wrap=cos
+-Wl,--wrap=cosf
+-Wl,--wrap=cosh
+-Wl,--wrap=coshf
+-Wl,--wrap=__ctzdi2
+-Wl,--wrap=__ctzsi2
+-Wl,--wrap=drem
+-Wl,--wrap=dremf
+-Wl,--wrap=exp
+-Wl,--wrap=exp10
+-Wl,--wrap=exp10f
+-Wl,--wrap=exp2
+-Wl,--wrap=exp2f
+-Wl,--wrap=expf
+-Wl,--wrap=expm1
+-Wl,--wrap=expm1f
+-Wl,--wrap=floor
+-Wl,--wrap=floorf
+-Wl,--wrap=fma
+-Wl,--wrap=fmaf
+-Wl,--wrap=fmod
+-Wl,--wrap=fmodf
+-Wl,--wrap=free
+-Wl,--wrap=hypot
+-Wl,--wrap=hypotf
+-Wl,--wrap=ldexp
+-Wl,--wrap=ldexpf
+-Wl,--wrap=log
+-Wl,--wrap=log10
+-Wl,--wrap=log10f
+-Wl,--wrap=log1p
+-Wl,--wrap=log1pf
+-Wl,--wrap=log2
+-Wl,--wrap=log2f
+-Wl,--wrap=logf
+-Wl,--wrap=malloc
+-Wl,--wrap=memcpy
+-Wl,--wrap=memset
+-Wl,--wrap=__popcountdi2
+-Wl,--wrap=__popcountsi2
+-Wl,--wrap=pow
+-Wl,--wrap=powf
+-Wl,--wrap=powint
+-Wl,--wrap=powintf
+-Wl,--wrap=remainder
+-Wl,--wrap=remainderf
+-Wl,--wrap=remquo
+-Wl,--wrap=remquof
+-Wl,--wrap=round
+-Wl,--wrap=roundf
+-Wl,--wrap=sin
+-Wl,--wrap=sincos
+-Wl,--wrap=sincosf
+-Wl,--wrap=sinf
+-Wl,--wrap=sinh
+-Wl,--wrap=sinhf
+-Wl,--wrap=sqrt
+-Wl,--wrap=sqrtf
+-Wl,--wrap=tan
+-Wl,--wrap=tanf
+-Wl,--wrap=tanh
+-Wl,--wrap=tanhf
+-Wl,--wrap=trunc
+-Wl,--wrap=truncf

package/package_pico_index.template.json

@@ -6,7 +6,7 @@
          "websiteURL": "https://github.com/earlephilhower/arduino-pico",
          "email": "earlephilhower@yahoo.com",
          "help": {
-            "online": "https://github.com/earlephilhower/arduino-pico"
+            "online": "https://arduino-pico.readthedocs.io/en/latest/"
          },
          "platforms": [
             {

pico-sdk-lib/boot.sh

@@ -1,18 +0,0 @@
-mkdir -p pico 
-touch pico/config.h
-
-for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
-	for div in 2 4; do
-		../../system/arm-none-eabi/bin/arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 -DNDEBUG -DPICO_FLASH_SPI_CLKDIV=$div -c ../../pico-sdk/src/rp2_common/boot_stage2/$type.S -I ../../pico-sdk/src/rp2_common/pico_platform/include/ -I ../../pico-sdk/src/rp2040/hardware_regs/include/ -I../../pico-sdk/src/rp2_common/boot_stage2/asminclude/ -I.
-
-		../../system/arm-none-eabi/bin/arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 -DNDEBUG -Wl,--build-id=none --specs=nosys.specs -nostartfiles -Wl,--script=../../pico-sdk/src/rp2_common/boot_stage2/boot_stage2.ld -Wl,-Map=$type.$div.elf.map $type.o -o $type.$div.elf 
-
-		../../system/arm-none-eabi/bin/arm-none-eabi-objdump -h $type.$div.elf >  $type.$div.dis
-		../../system/arm-none-eabi/bin/arm-none-eabi-objdump -d $type.$div.elf >> $type.$div.dis
-
-		../../system/arm-none-eabi/bin/arm-none-eabi-objcopy -Obinary $type.$div.elf $type.$div.bin
-
-		python3 ../../pico-sdk/src/rp2_common/boot_stage2/pad_checksum -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
-	done
-done
-

pico-sdk-lib/build.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-rm -rf build
-mkdir build
-cd build
-PICO_SDK_PATH=../../pico-sdk/ PATH="$(cd ../../system/arm-none-eabi/bin; pwd):$PATH" cmake ..
-make -j32
-cp libpico.a ../../lib/.
-cp generated/pico_base/pico/version.h ../../pico_base/pico/.
-cd ..
-
-rm -rf boot
-mkdir boot
-cd boot
-../boot.sh
-cp *.S ../../assembly/.
-cd ..
-

platform.txt

@@ -39,9 +39,9 @@ compiler.warning_flags.more=-Wall
 compiler.warning_flags.all=-Wall -Wextra
 
 compiler.defines={build.led}
-compiler.includes="-I{runtime.platform.path}/pico_base/" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_unique_id/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_platform/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_base/include/" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_timer/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_stdlib/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_gpio/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_i2c/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_flash/include" "-I{runtime.platform.path}/pico-sdk/src/common/pico_base/include" "-I{runtime.platform.path}/pico-examples/build/generated/pico_base" "-I{runtime.platform.path}/pico-sdk/src/boards/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_platform/include" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_base/include" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_structs/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_claim/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_sync/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_uart/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_divider/include" "-I{runtime.platform.path}/pico-sdk/src/common/pico_time/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_timer/include" "-I{runtime.platform.path}/pico-sdk/src/common/pico_sync/include" "-I{runtime.platform.path}/pico-sdk/src/common/pico_util/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_runtime/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_clocks/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_resets/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_watchdog/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_xosc/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_pll/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_vreg/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_irq/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_printf/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_bootrom/include" "-I{runtime.platform.path}/pico-sdk/src/common/pico_bit_ops/include" "-I{runtime.platform.path}/pico-sdk/src/common/pico_divider/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_double/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_int64_ops/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_float/include" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_pio/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_stdio/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_dma/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_stdio_uart/include" "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/lib/tinyusb/src/" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_stdio_usb/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_spi/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_pwm/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/hardware_adc/include" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_multicore/include" "-I{runtime.platform.path}/cores/rp2040/api/deprecated-avr-comp/" "-I{runtime.platform.path}/pico-sdk/src/rp2_common/pico_multicore/include" "-I{runtime.platform.path}/pico-extras/src/rp2_common/pico_audio_i2s/include" "-I{runtime.platform.path}/pico-extras/src/common/pico_audio/include" "-I{runtime.platform.path}/pico-extras/src/common/pico_util_buffer/include"
-compiler.flags=-Os -march=armv6-m -mcpu=cortex-m0plus -mthumb -ffunction-sections -fdata-sections
-compiler.wrap=-Wl,--wrap=acos -Wl,--wrap=acosf -Wl,--wrap=acosh -Wl,--wrap=acoshf -Wl,--wrap=__aeabi_cdcmpeq -Wl,--wrap=__aeabi_cdcmple -Wl,--wrap=__aeabi_cdrcmple -Wl,--wrap=__aeabi_cfcmpeq -Wl,--wrap=__aeabi_cfcmple -Wl,--wrap=__aeabi_cfrcmple -Wl,--wrap=__aeabi_d2f -Wl,--wrap=__aeabi_d2iz -Wl,--wrap=__aeabi_d2lz -Wl,--wrap=__aeabi_d2uiz -Wl,--wrap=__aeabi_d2ulz -Wl,--wrap=__aeabi_dadd -Wl,--wrap=__aeabi_dcmpeq -Wl,--wrap=__aeabi_dcmpge -Wl,--wrap=__aeabi_dcmpgt -Wl,--wrap=__aeabi_dcmple -Wl,--wrap=__aeabi_dcmplt -Wl,--wrap=__aeabi_dcmpun -Wl,--wrap=__aeabi_ddiv -Wl,--wrap=__aeabi_dmul -Wl,--wrap=__aeabi_drsub -Wl,--wrap=__aeabi_dsub -Wl,--wrap=__aeabi_f2d -Wl,--wrap=__aeabi_f2iz -Wl,--wrap=__aeabi_f2lz -Wl,--wrap=__aeabi_f2uiz -Wl,--wrap=__aeabi_f2ulz -Wl,--wrap=__aeabi_fadd -Wl,--wrap=__aeabi_fcmpeq -Wl,--wrap=__aeabi_fcmpge -Wl,--wrap=__aeabi_fcmpgt -Wl,--wrap=__aeabi_fcmple -Wl,--wrap=__aeabi_fcmplt -Wl,--wrap=__aeabi_fcmpun -Wl,--wrap=__aeabi_fdiv -Wl,--wrap=__aeabi_fmul -Wl,--wrap=__aeabi_frsub -Wl,--wrap=__aeabi_fsub -Wl,--wrap=__aeabi_i2d -Wl,--wrap=__aeabi_i2f -Wl,--wrap=__aeabi_idiv -Wl,--wrap=__aeabi_idivmod -Wl,--wrap=__aeabi_l2d -Wl,--wrap=__aeabi_l2f -Wl,--wrap=__aeabi_ldivmod -Wl,--wrap=__aeabi_lmul -Wl,--wrap=__aeabi_memcpy -Wl,--wrap=__aeabi_memcpy4 -Wl,--wrap=__aeabi_memcpy8 -Wl,--wrap=__aeabi_memset -Wl,--wrap=__aeabi_memset4 -Wl,--wrap=__aeabi_memset8 -Wl,--wrap=__aeabi_ui2d -Wl,--wrap=__aeabi_ui2f -Wl,--wrap=__aeabi_uidiv -Wl,--wrap=__aeabi_uidivmod -Wl,--wrap=__aeabi_ul2d -Wl,--wrap=__aeabi_ul2f -Wl,--wrap=__aeabi_uldivmod -Wl,--wrap=asin -Wl,--wrap=asinf -Wl,--wrap=asinh -Wl,--wrap=asinhf -Wl,--wrap=atan -Wl,--wrap=atan2 -Wl,--wrap=atan2f -Wl,--wrap=atanf -Wl,--wrap=atanh -Wl,--wrap=atanhf -Wl,--wrap=calloc -Wl,--wrap=cbrt -Wl,--wrap=cbrtf -Wl,--wrap=ceil -Wl,--wrap=ceilf -Wl,--wrap=__clz -Wl,--wrap=__clzdi2 -Wl,--wrap=__clzl -Wl,--wrap=__clzll -Wl,--wrap=__clzsi2 -Wl,--wrap=copysign -Wl,--wrap=copysignf -Wl,--wrap=cos -Wl,--wrap=cosf -Wl,--wrap=cosh -Wl,--wrap=coshf -Wl,--wrap=__ctzdi2 -Wl,--wrap=__ctzsi2 -Wl,--wrap=drem -Wl,--wrap=dremf -Wl,--wrap=exp -Wl,--wrap=exp10 -Wl,--wrap=exp10f -Wl,--wrap=exp2 -Wl,--wrap=exp2f -Wl,--wrap=expf -Wl,--wrap=expm1 -Wl,--wrap=expm1f -Wl,--wrap=floor -Wl,--wrap=floorf -Wl,--wrap=fma -Wl,--wrap=fmaf -Wl,--wrap=fmod -Wl,--wrap=fmodf -Wl,--wrap=free -Wl,--wrap=hypot -Wl,--wrap=hypotf -Wl,--wrap=ldexp -Wl,--wrap=ldexpf -Wl,--wrap=log -Wl,--wrap=log10 -Wl,--wrap=log10f -Wl,--wrap=log1p -Wl,--wrap=log1pf -Wl,--wrap=log2 -Wl,--wrap=log2f -Wl,--wrap=logf -Wl,--wrap=malloc -Wl,--wrap=memcpy -Wl,--wrap=memset -Wl,--wrap=__popcountdi2 -Wl,--wrap=__popcountsi2 -Wl,--wrap=pow -Wl,--wrap=powf -Wl,--wrap=powint -Wl,--wrap=powintf -Wl,--wrap=remainder -Wl,--wrap=remainderf -Wl,--wrap=remquo -Wl,--wrap=remquof -Wl,--wrap=round -Wl,--wrap=roundf -Wl,--wrap=sin -Wl,--wrap=sincos -Wl,--wrap=sincosf -Wl,--wrap=sinf -Wl,--wrap=sinh -Wl,--wrap=sinhf -Wl,--wrap=sqrt -Wl,--wrap=sqrtf -Wl,--wrap=tan -Wl,--wrap=tanf -Wl,--wrap=tanh -Wl,--wrap=tanhf -Wl,--wrap=trunc -Wl,--wrap=truncf
+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.wrap="@{runtime.platform.path}/lib/platform_wrap.txt"
 
 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-c {compiler.defines} {compiler.flags} {compiler.includes} -std=gnu17 -g
@@ -50,8 +50,7 @@ compiler.c.elf.flags={compiler.defines} {compiler.flags} -Wl,--gc-sections -u _p
 compiler.S.cmd=arm-none-eabi-gcc
 compiler.S.flags=-c -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} -std=gnu++17 -g
-
+compiler.cpp.flags=-c {compiler.defines} {compiler.flags} {compiler.includes} -fno-rtti -std=gnu++17 -g
 
 compiler.ar.cmd=arm-none-eabi-ar
 compiler.ar.flags=rcs

tools/README.md

@@ -0,0 +1,35 @@
+# Tools directory for the RP2040 Arduino-Pico
+
+## get.py
+Downloads and installs the toolchain into a GIT clone of the repo.  Run
+once after the `git clone` and any time the toolchain JSON file updates.
+The `dist` directory caches downloaded toolchain files.
+
+## discovery.py
+Run in the background by the IDE to scan for UF2 drives to show in the
+menus.  Normally not run manually by the user.
+
+## uf2conv.py
+Manages the upload of the UF2 formatted file to the board.  Called as part
+of the IDE upload process.  Will optionally send the serial reset signal
+to get the board into update mode (1200bps connection).
+
+## simplesub.py
+Very dumb `sed`-like tool used by the platform scripts to generate the
+linker `.ld` file (replacing the EEPROM location, FS sizes, etc.).
+Because we run on Windows, Mac, and Linux, need to provide this and not
+rely on existance of `sed` command.
+
+## pyserial
+`git clone` of the PySerial Python3 library to be used by the IDE.
+
+## makeboards.py
+Generates `boards.txt` programmatically.  Never edit the `boards.txt` file
+manually, use `python3 tools/makeboards.py > boards.py`.  Change the script
+as necessary to add any add'l fields or menus required.  Used because the
+`boards.txt` file is very repetitive and it's safer to generate with code
+than by hand.
+
+## libpico/make-libpico.sh
+Builds the libpico.a file as well as the bootloader stage2 binaries.
+Run whenever the pico-sdk is updated.

tools/libpico/CMakeLists.txt

@@ -18,6 +18,13 @@ target_compile_definitions(pico PUBLIC
 	PICO_FLASH_SIZE_BYTES=16777216
 )
 
+target_compile_options(pico PUBLIC
+	-fno-exceptions
+	$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+)
+
+include_directories(BEFORE ${PICO_SDK_PATH}/../tools/libpico)
+
 target_link_libraries(pico 
 	boot_stage2
 	hardware_adc
@@ -58,16 +65,16 @@ target_link_libraries(pico
 	pico_platform
 	pico_runtime
 	pico_standard_link
-	pico_stdio_usb
 	pico_stdlib
 	pico_unique_id
 	tinyusb
+        tinyusb_device_unmarked
 	pico_audio
 	pico_audio_i2s
 )
 
 add_custom_command(TARGET pico PRE_BUILD
-	COMMAND ../../system/arm-none-eabi/bin/arm-none-eabi-gcc -g -c ../../assembly/crt0.S  -I ../../pico-sdk/src/rp2040/hardware_regs/include -I ../../pico-sdk/src/common/pico_binary_info/include/
+	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

tools/libpico/make-libpico.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -e # Exit on error
+
+export PICO_SDK_PATH="$(cd ../../pico-sdk/; pwd)"
+export PATH="$(cd ../../system/arm-none-eabi/bin; pwd):$PATH"
+
+rm -rf build
+mkdir build
+cd build
+cmake ..
+make -j
+mv libpico.a ../../../lib/.
+mv generated/pico_base/pico/version.h ../../../lib/pico_base/pico/.
+
+rm -rf boot
+mkdir boot
+cd boot
+mkdir -p pico 
+touch pico/config.h
+for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
+    for div in 2 4; do
+        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
+                         -DNDEBUG -DPICO_FLASH_SPI_CLKDIV=$div \
+                         -c "$PICO_SDK_PATH/src/rp2_common/boot_stage2/$type.S" \
+                         -I "$PICO_SDK_PATH/src/rp2040/hardware_regs/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform/include/" \
+                         -I "$PICO_SDK_PATH/src/rp2_common/boot_stage2/asminclude/" \
+                         -I .
+
+        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
+                          -DNDEBUG -Wl,--build-id=none --specs=nosys.specs -nostartfiles \
+                          -Wl,--script="$PICO_SDK_PATH/src/rp2_common/boot_stage2/boot_stage2.ld" \
+                          -Wl,-Map=$type.$div.elf.map $type.o -o $type.$div.elf 
+
+        arm-none-eabi-objdump -h $type.$div.elf >  $type.$div.dis
+        arm-none-eabi-objdump -d $type.$div.elf >> $type.$div.dis
+
+        arm-none-eabi-objcopy -Obinary $type.$div.elf $type.$div.bin
+
+        python3 "$PICO_SDK_PATH/src/rp2_common/boot_stage2/pad_checksum" \
+                   -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
+    done
+done
+mv *.S ../../../../assembly/.

tools/libpico/tusb_config.h

@@ -0,0 +1,116 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org)
+ *
+ * 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
+//--------------------------------------------------------------------
+
+// defined by board.mk
+#ifndef CFG_TUSB_MCU
+  #error CFG_TUSB_MCU must be defined
+#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
+
+// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
+// #define CFG_TUSB_DEBUG           0
+
+/* 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
+ * into those specific section.
+ * e.g
+ * - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
+ * - CFG_TUSB_MEM_ALIGN   : __attribute__ ((aligned(4)))
+ */
+#ifndef CFG_TUSB_MEM_SECTION
+#define CFG_TUSB_MEM_SECTION
+#endif
+
+#ifndef CFG_TUSB_MEM_ALIGN
+#define CFG_TUSB_MEM_ALIGN          __attribute__ ((aligned(4)))
+#endif
+
+//--------------------------------------------------------------------
+// DEVICE CONFIGURATION
+//--------------------------------------------------------------------
+
+#ifndef CFG_TUD_ENDPOINT0_SIZE
+#define CFG_TUD_ENDPOINT0_SIZE    64
+#endif
+
+//------------- CLASS -------------//
+#define CFG_TUD_HID              (2)
+#define CFG_TUD_CDC              (1)
+#define CFG_TUD_MSC              (0)
+#define CFG_TUD_MIDI             (1)
+#define CFG_TUD_VENDOR           (0)
+
+#define CFG_TUD_CDC_RX_BUFSIZE  (256)
+#define CFG_TUD_CDC_TX_BUFSIZE  (256)
+
+#define CFG_TUD_MIDI_RX_BUFSIZE (64)
+#define CFG_TUD_MIDI_TX_BUFSIZE (64)
+
+// HID buffer size Should be sufficient to hold ID (if any) + Data
+#define CFG_TUD_HID_EP_BUFSIZE  (64)
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_CONFIG_H_ */

variants/generic/common.h

@@ -44,7 +44,7 @@ static const uint8_t A1 = (27u);
 static const uint8_t A2 = (28u);
 static const uint8_t A3 = (29u);
 
-static const uint8_t SS = PIN_SPI1_SS;
-static const uint8_t MOSI = PIN_SPI1_MOSI;
-static const uint8_t MISO = PIN_SPI1_MISO;
-static const uint8_t SCK = PIN_SPI1_SCK;
+static const uint8_t SS = PIN_SPI0_SS;
+static const uint8_t MOSI = PIN_SPI0_MOSI;
+static const uint8_t MISO = PIN_SPI0_MISO;
+static const uint8_t SCK = PIN_SPI0_SCK;