Merge remote-tracking branch 'origin/main' into main

weblate · weblate · commit 723266b33f0a · 2021-06-21T15:39:51.000+02:00
diff --git a/lib/tinyusb b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit ab4d30fd6bca02c73eb9b4ff82db0b2b0f403344
+Subproject commit df0cda2d7ab7a061bcb28213273bcc3a8d8dbaec
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
@@ -191,7 +191,7 @@ SRC_C += \
 	peripherals/rmt.c
 
 ifneq ($(CIRCUITPY_USB),0)
-SRC_C += lib/tinyusb/src/portable/espressif/esp32s2/dcd_esp32s2.c
+SRC_C += lib/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c
 endif
 
 SRC_S =
