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