Skip to content

Commit 8ef3020

Browse files
authored
Merge pull request #498 from adafruit/update-tinyusb-1cfc88dbcb8cff6f926aef02c5609880169ec94c
Update tinyusb to commit 334ac8072650e3b18278042c2c2b402db73c7359
2 parents c92b7fd + 3918606 commit 8ef3020

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+6268
-3971
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ Following core has TinyUSB as either the primary usb stack or selectable via men
3838
- [adafruit/Adafruit_nRF52_Arduino](https://github.com/adafruit/Adafruit_nRF52_Arduino)
3939
- [adafruit/ArduinoCore-samd](https://github.com/adafruit/ArduinoCore-samd)
4040
- [earlephilhower/arduino-pico](https://github.com/earlephilhower/arduino-pico)
41-
- [espressif/arduino-esp32](https://github.com/espressif/arduino-esp32)
41+
- [espressif/arduino-esp32](https://github.com/espressif/arduino-esp32) additional Tools menu is needed
42+
- `USB Mode=USB-OTG (TinyUSB)` for S3 and P4
43+
- `USB CDC On Boot=Enabled`, `USB Firmware MSC On Boot=Disabled`, `USB DFU On Boot=Disabled`
4244
- [openwch/arduino_core_ch32](https://github.com/openwch/arduino_core_ch32)
4345

4446
Note: For ESP32 port, version before v3.0 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. This limitation is not the case for version from v3.0.

examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#endif
3939

4040
// SdFat is required for using Adafruit_USBH_MSC_SdFatDevice
41-
#include "SdFat.h"
41+
#include "SdFat_Adafruit_Fork.h"
4242

4343
// USBHost is defined in usbh_helper.h
4444
#include "usbh_helper.h"

examples/DualRole/MassStorage/msc_file_explorer/msc_file_explorer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828

2929
// SdFat is required for using Adafruit_USBH_MSC_SdFatDevice
30-
#include "SdFat.h"
30+
#include "SdFat_Adafruit_Fork.h"
3131

3232
// USBHost is defined in usbh_helper.h
3333
#include "usbh_helper.h"

examples/MassStorage/msc_esp32_file_browser/msc_esp32_file_browser.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*/
3333

3434
#include "SPI.h"
35-
#include "SdFat.h"
35+
#include "SdFat_Adafruit_Fork.h"
3636
#include "Adafruit_SPIFlash.h"
3737
#include "Adafruit_TinyUSB.h"
3838

examples/MassStorage/msc_external_flash/msc_external_flash.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
#include "SPI.h"
26-
#include "SdFat.h"
26+
#include "SdFat_Adafruit_Fork.h"
2727
#include "Adafruit_SPIFlash.h"
2828
#include "Adafruit_TinyUSB.h"
2929

examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
#include "SPI.h"
26-
#include "SdFat.h"
26+
#include "SdFat_Adafruit_Fork.h"
2727
#include "Adafruit_SPIFlash.h"
2828
#include "Adafruit_TinyUSB.h"
2929

examples/MassStorage/msc_internal_flash_samd/msc_internal_flash_samd.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*********************************************************************/
1111

1212
#include "SPI.h"
13-
#include "SdFat.h"
13+
#include "SdFat_Adafruit_Fork.h"
1414
#include "Adafruit_InternalFlash.h"
1515
#include "Adafruit_TinyUSB.h"
1616

examples/MassStorage/msc_sdfat/msc_sdfat.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
#include "SPI.h"
17-
#include "SdFat.h"
17+
#include "SdFat_Adafruit_Fork.h"
1818
#include "Adafruit_TinyUSB.h"
1919

2020
const int chipSelect = 10;

src/Adafruit_TinyUSB.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525
#ifndef ADAFRUIT_TINYUSB_H_
2626
#define ADAFRUIT_TINYUSB_H_
2727

28-
// ESP32 out-of-sync
29-
#ifdef ARDUINO_ARCH_ESP32
30-
#include "arduino/ports/esp32/tusb_config_esp32.h"
31-
#endif
32-
3328
#include "tusb_option.h"
3429

3530
// Device

src/arduino/Adafruit_TinyUSB_API.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
extern "C" {
3333

34+
uint32_t tusb_time_millis_api(void) { return millis(); }
35+
3436
//--------------------------------------------------------------------+
3537
// Device
3638
//--------------------------------------------------------------------+

0 commit comments

Comments
 (0)