Merge pull request #126 from adafruit/support-esp32-2.0

Add support for ESP32-S2 arduino core version 2.0.0

Author: hathach

.github/workflows/githubci.yml

@@ -9,6 +9,10 @@ jobs:
       fail-fast: false
       matrix:
         arduino-platform:
+           # ESP32S2
+           - 'funhouse'
+           - 'magtag'
+           - 'metroesp32s2'
            # nRF52
            - 'cpb'
            - 'nrf52840'

README.md

@@ -21,11 +21,14 @@ There are 2 type of supported cores: with and without built-in support for TinyU
 
 ### Cores with built-in support
 
-Following core has Tinyusb as either the primary usb stack or selectable via menu `Tools->USB Stack`. You only need to include `<Adafruit_TinyUSB.h>` in your sketch to use.
+Following core has TinyUSB as either the primary usb stack or selectable via menu `Tools->USB Stack`. You only need to include `<Adafruit_TinyUSB.h>` in your sketch to use.
 
-- [Adafruit_nRF52_Arduino](https://github.com/adafruit/Adafruit_nRF52_Arduino)
+- [adafruit/Adafruit_nRF52_Arduino](https://github.com/adafruit/Adafruit_nRF52_Arduino)
 - [adafruit/ArduinoCore-samd](https://github.com/adafruit/ArduinoCore-samd)
 - [earlephilhower/arduino-pico](https://github.com/earlephilhower/arduino-pico)
+- [espressif/arduino-esp32](https://github.com/espressif/arduino-esp32)
+
+  ESP32 port relies on Espressif's [esp32-hal-tinyusb.c](https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/esp32-hal-tinyusb.c) for building usb descriptors which requires all descriptors must be specified in usb objects declaration i.e constructors. Therefore all descriptor-related fields must be part of object declaration and descriptor-related API have no effect afterwards for this port. 
 
 ### Cores without built-in support
 

changelog.md

@@ -1,5 +1,12 @@
 # Adafruit TinyUSB Arduino Library Changelog
 
+## 1.5.0 - 2021.09.29
+
+- Add support for ESP32-S2 core version 2.0.0
+  - ESP32 port relies on Espressif's [esp32-hal-tinyusb.c](https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/esp32-hal-tinyusb.c) for building usb descriptors which requires all descriptors must be specified in usb objects declaration i.e constructors. Therefore all descriptor-related fields must be part of object declaration and descriptor-related API have no effect afterwards for this port.
+
+- Add new constructor for Adafruit_USBD_HID(desc_report, len, protocol, interval_ms, has_out_endpoint)
+
 ## 1.4.4 - 2021.08.18
 
 - Update tinyusb stack

examples/MassStorage/msc_sd/.metroesp32s2_tinyusb.test.skip renamed to examples/CDC/cdc_multi/.funhouse.test.skip

@@ -19,6 +19,10 @@
 #include "Adafruit_SPIFlash.h"
 #include "Adafruit_TinyUSB.h"
 
+//--------------------------------------------------------------------+
+// MSC External Flash Config
+//--------------------------------------------------------------------+
+
 // Uncomment to run example with FRAM
 // #define FRAM_CS   A5
 // #define FRAM_SPI  SPI
@@ -51,26 +55,39 @@ Adafruit_SPIFlash flash(&flashTransport);
 
 Adafruit_USBD_MSC usb_msc;
 
+//--------------------------------------------------------------------+
+// HID Config
+//--------------------------------------------------------------------+
+
 // HID report descriptor using TinyUSB's template
 // Single Report (no ID) descriptor
 uint8_t const desc_hid_report[] =
 {
   TUD_HID_REPORT_DESC_MOUSE()
 };
 
-Adafruit_USBD_HID usb_hid;
+// USB HID object. For ESP32 these values cannot be changed after this declaration
+// desc report, desc len, protocol, interval, use out endpoint
+Adafruit_USBD_HID usb_hid(desc_hid_report, sizeof(desc_hid_report), HID_ITF_PROTOCOL_NONE, 2, false);
 
-#if defined ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS
+#if defined(ARDUINO_SAMD_CIRCUITPLAYGROUND_EXPRESS) || defined(ARDUINO_NRF52840_CIRCUITPLAY)
   const int pin = 4; // Left Button
   bool activeState = true;
-#elif defined ARDUINO_NRF52840_FEATHER
-  const int pin = 7; // UserSw
+
+#elif defined(ARDUINO_FUNHOUSE_ESP32S2)
+  const int pin = BUTTON_DOWN;
+  bool activeState = true;
+
+#elif defined PIN_BUTTON1
+  const int pin = PIN_BUTTON1;
   bool activeState = false;
+
 #else
   const int pin = 12;
   bool activeState = false;
 #endif
 
+
 // the setup function runs once when you press reset or power the board
 void setup()
 {
@@ -92,11 +109,12 @@ void setup()
 
   usb_msc.begin();
 
-
   // Set up button
   pinMode(pin, activeState ? INPUT_PULLDOWN : INPUT_PULLUP);
 
-  usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
+  // Notes: following commented-out functions has no affect on ESP32
+  // usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
+
   usb_hid.begin();
 
   Serial.begin(115200);