Merge remote-tracking branch 'upstream/master'

Author: SmittyHalibut

.github/workflows/githubci.yml

@@ -48,8 +48,10 @@ jobs:
       matrix:
         arduino-platform:
            # ESP32 ci use dev json
+           - 'feather_esp32_v2'
            - 'feather_esp32s2'
            - 'feather_esp32s3'
+           - 'esp32p4'
            # nRF52
            - 'cpb'
            - 'nrf52840'

README.md

@@ -1,6 +1,8 @@
+feather_esp32_v2
 feather_esp32s2
 feather_esp32s3
 funhouse
 magtag
 metroesp32s2
+esp32p4
 pico_rp2040_tinyusb_host

examples/CDC/cdc_multi/.skip.txt

@@ -25,25 +25,27 @@
 
 #include <Adafruit_TinyUSB.h>
 
-#define LED LED_BUILTIN
-
 // Create 2nd instance of CDC Ports.
 #ifdef ARDUINO_ARCH_ESP32
-  #error "Currently multiple CDCs on ESP32-Sx is not yet supported. An PR to update core/esp32/USBCDC and/or pre-built libusb are needed."
+  #error "Currently multiple CDCs on ESP32 is not yet supported"
   // for ESP32, we need to specify instance number when declaring object
   Adafruit_USBD_CDC USBSer1(1);
 #else
   Adafruit_USBD_CDC USBSer1;
 #endif
 
 void setup() {
-  pinMode(LED, OUTPUT);
+#ifdef LED_BUILTIN
+  pinMode(LED_BUILTIN, OUTPUT);
+#endif
 
   Serial.begin(115200);
 
   // check to see if multiple CDCs are enabled
   if ( CFG_TUD_CDC < 2 ) {
-    digitalWrite(LED, HIGH); // LED on for error indicator
+    #ifdef LED_BUILTIN
+    digitalWrite(LED_BUILTIN, HIGH); // LED on for error indicator
+    #endif
 
     while(1) {
       Serial.printf("CFG_TUD_CDC must be at least 2, current value is %u\n", CFG_TUD_CDC);
@@ -96,7 +98,9 @@ void loop() {
 
   if (delay_without_delaying(500)) {
     LEDstate = !LEDstate;
-    digitalWrite(LED, LEDstate);
+    #ifdef LED_BUILTIN
+    digitalWrite(LED_BUILTIN, LEDstate);
+    #endif
   }
 }
 

examples/CDC/cdc_multi/cdc_multi.ino

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/CDC/no_serial/.pico_rp2040_tinyusb_host.test.skip

@@ -18,11 +18,7 @@
  * Note: this will cause device to loose the touch1200 and require
  * user manual interaction to put device into bootloader/DFU mode.
  */
-
-int led = LED_BUILTIN;
-
-void setup()
-{
+void setup() {
   // Manual begin() is required on core without built-in support e.g. mbed rp2040
   if (!TinyUSBDevice.isInitialized()) {
     TinyUSBDevice.begin(0);
@@ -38,11 +34,12 @@ void setup()
     TinyUSBDevice.attach();
   }
 
-  pinMode(led, OUTPUT);
+  #ifdef LED_BUILTIN
+  pinMode(LED_BUILTIN, OUTPUT);
+  #endif
 }
 
-void loop()
-{
+void loop() {
   #ifdef TINYUSB_NEED_POLLING_TASK
   // Manual call tud_task since it isn't called by Core's background
   TinyUSBDevice.task();
@@ -53,6 +50,8 @@ void loop()
   static uint8_t led_state = 0;
   if (millis() - ms > 1000) {
     ms = millis();
+    #ifdef LED_BUILTIN
     digitalWrite(LED_BUILTIN, 1-led_state);
+    #endif
   }
 }

examples/CDC/no_serial/.skip.txt

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/CDC/no_serial/no_serial.ino

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/CDC/serial_echo/.pico_rp2040_tinyusb_host.test.skip

@@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT

examples/CDC/serial_echo/.skip.txt

@@ -42,8 +42,7 @@ uint8_t const desc_hid_report[] = {
     TUD_HID_REPORT_DESC_MOUSE()
 };
 
-// USB HID object. For ESP32 these values cannot be changed after this declaration
-// desc report, desc len, protocol, interval, use out endpoint
+// USB HID object: desc report, desc len, protocol, interval, use out endpoint
 Adafruit_USBD_HID usb_hid(desc_hid_report, sizeof(desc_hid_report), HID_ITF_PROTOCOL_MOUSE, 2, false);
 
 /* Adjustable parameters for the log_filter() method.

examples/Composite/mouse_ramdisk/.pico_rp2040_tinyusb_host.test.skip

@@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT

examples/Composite/mouse_ramdisk/.skip.txt

@@ -40,8 +40,7 @@ uint8_t const desc_hid_report[] = {
     TUD_HID_REPORT_DESC_MOUSE()
 };
 
-// USB HID object. For ESP32 these values cannot be changed after this declaration
-// desc report, desc len, protocol, interval, use out endpoint
+// USB HID object: desc report, desc len, protocol, interval, use out endpoint
 Adafruit_USBD_HID usb_hid(desc_hid_report, sizeof(desc_hid_report), HID_ITF_PROTOCOL_MOUSE, 2, false);
 
 //------------- Low pass filter with Butterworth -------------//

examples/DualRole/HID/hid_mouse_log_filter/.skip.txt

@@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT

examples/DualRole/HID/hid_mouse_log_filter/hid_mouse_log_filter.ino

@@ -42,11 +42,9 @@ uint8_t const desc_hid_report[] = {
     TUD_HID_REPORT_DESC_KEYBOARD()
 };
 
-// USB HID object. For ESP32 these values cannot be changed after this declaration
-// desc report, desc len, protocol, interval, use out endpoint
+// USB HID object: desc report, desc len, protocol, interval, use out endpoint
 Adafruit_USBD_HID usb_hid(desc_hid_report, sizeof(desc_hid_report), HID_ITF_PROTOCOL_KEYBOARD, 2, false);
 
-
 void setup() {
   Serial.begin(115200);
   usb_hid.begin();

examples/DualRole/HID/hid_mouse_tremor_filter/.skip.txt

@@ -38,7 +38,7 @@
 #endif
 
 // SdFat is required for using Adafruit_USBH_MSC_SdFatDevice
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 
 // USBHost is defined in usbh_helper.h
 #include "usbh_helper.h"
@@ -73,7 +73,9 @@ void data_log(void) {
   }
 
   // Turn on LED when start writing
+  #ifdef LED_BUILTIN
   digitalWrite(LED_BUILTIN, HIGH);
+  #endif
 
   f_log = fatfs.open(LOG_FILE, O_WRITE | O_APPEND | O_CREAT);
 
@@ -112,7 +114,9 @@ void usbhost_rtos_task(void *param) {
 void setup() {
   Serial.begin(115200);
 
+  #ifdef LED_BUILTIN
   pinMode(LED_BUILTIN, OUTPUT);
+  #endif
 
 #if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
   // init host stack on controller (rhport) 1
@@ -172,10 +176,12 @@ bool write_complete_callback(uint8_t dev_addr, tuh_msc_complete_data_t const *cb
   (void) dev_addr;
   (void) cb_data;
 
+  #ifdef LED_BUILTIN
   // turn off LED after write is complete
   // Note this only marks the usb transfer is complete, device can take longer to actual
   // write data to physical flash
   digitalWrite(LED_BUILTIN, LOW);
+  #endif
 
   return true;
 }

examples/DualRole/HID/hid_mouse_tremor_filter/hid_mouse_tremor_filter.ino

@@ -27,7 +27,7 @@
  */
 
 // SdFat is required for using Adafruit_USBH_MSC_SdFatDevice
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 
 // USBHost is defined in usbh_helper.h
 #include "usbh_helper.h"

examples/DualRole/HID/hid_remapper/.skip.txt

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/DualRole/HID/hid_remapper/hid_remapper.ino

@@ -74,8 +74,10 @@ void setup() {
   }
 
   // led pin
+#ifdef LED_BUILTIN
   pinMode(LED_BUILTIN, OUTPUT);
   digitalWrite(LED_BUILTIN, LOW);
+#endif
 
   // overwrite input pin with PIN_BUTTONx
 #ifdef PIN_BUTTON1
@@ -176,6 +178,8 @@ void hid_report_callback(uint8_t report_id, hid_report_type_t report_type, uint8
   // Kana (4) | Compose (3) | ScrollLock (2) | CapsLock (1) | Numlock (0)
   uint8_t ledIndicator = buffer[0];
 
+#ifdef LED_BUILTIN
   // turn on LED if capslock is set
   digitalWrite(LED_BUILTIN, ledIndicator & KEYBOARD_LED_CAPSLOCK);
+#endif
 }

examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/DualRole/MassStorage/msc_file_explorer/msc_file_explorer.ino

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/HID/hid_boot_keyboard/.pico_rp2040_tinyusb_host.test.skip

@@ -1,2 +1,3 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT

examples/HID/hid_boot_keyboard/.skip.txt

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/HID/hid_boot_keyboard/hid_boot_keyboard.ino

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/HID/hid_boot_mouse/.pico_rp2040_tinyusb_host.test.skip

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/HID/hid_boot_mouse/.skip.txt

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/HID/hid_composite/.pico_rp2040_tinyusb_host.test.skip

@@ -20,7 +20,9 @@
 Adafruit_USBD_MIDI usb_midi(3);
 
 void setup() {
+#ifdef LED_BUILTIN
   pinMode(LED_BUILTIN, OUTPUT);
+#endif
 
   // Manual begin() is required on core without built-in support e.g. mbed rp2040
   if (!TinyUSBDevice.isInitialized()) {
@@ -52,6 +54,8 @@ void loop() {
   static uint8_t led_state = 0;
   if (millis() - ms > 1000) {
     ms = millis();
+#ifdef LED_BUILTIN
     digitalWrite(LED_BUILTIN, 1-led_state);
+#endif
   }
 }

examples/HID/hid_composite/.skip.txt

@@ -0,0 +1,2 @@
+feather_esp32_v2
+pico_rp2040_tinyusb_host

examples/HID/hid_composite_joy_featherwing/.skip.txt

@@ -44,8 +44,6 @@ void setup() {
 
   Serial.begin(115200);
 
-  pinMode(LED_BUILTIN, OUTPUT);
-
   usb_midi.setStringDescriptor("TinyUSB MIDI");
 
   // Initialize MIDI, and listen to all MIDI channels

examples/HID/hid_dual_interfaces/.pico_rp2040_tinyusb_host.test.skip

@@ -32,7 +32,7 @@
  */
 
 #include "SPI.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
 

examples/HID/hid_dual_interfaces/.skip.txt

@@ -1,3 +1,4 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
 feather_rp2040_tinyusb

examples/HID/hid_gamepad/.pico_rp2040_tinyusb_host.test.skip

@@ -23,7 +23,7 @@
  */
 
 #include "SPI.h"
-#include "SdFat.h"
+#include "SdFat_Adafruit_Fork.h"
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
 
@@ -48,9 +48,10 @@ bool fs_formatted = false;
 bool fs_changed = true;;
 
 // the setup function runs once when you press reset or power the board
-void setup()
-{
+void setup() {
+#ifdef LED_BUILTIN
   pinMode(LED_BUILTIN, OUTPUT);
+#endif
 
   Serial.begin(115200);
 
@@ -150,7 +151,9 @@ int32_t msc_read_cb (uint32_t lba, void* buffer, uint32_t bufsize) {
 // Process data in buffer to disk's storage and 
 // return number of written bytes (must be multiple of block size)
 int32_t msc_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize) {
+#ifdef LED_BUILTIN
   digitalWrite(LED_BUILTIN, HIGH);
+#endif
 
   // Note: SPIFLash Block API: readBlocks/writeBlocks/syncBlocks
   // already include 4K sector caching internally. We don't need to cache it, yahhhh!!
@@ -168,5 +171,7 @@ void msc_flush_cb (void) {
 
   fs_changed = true;
 
+#ifdef LED_BUILTIN
   digitalWrite(LED_BUILTIN, LOW);
+#endif
 }

examples/HID/hid_gamepad/.skip.txt

@@ -1,3 +1,4 @@
+feather_esp32_v2
 pico_rp2040_tinyusb_host
 CH32V20x_EVT
 feather_rp2040_tinyusb