djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Hosted Weblate 2021-06-21 15:39:51 +02:00
parent d283034ad2 624a53adee
commit 723266b33f
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tinyusb

@ -1 +1 @@
Subproject commit ab4d30fd6bca02c73eb9b4ff82db0b2b0f403344
Subproject commit df0cda2d7ab7a061bcb28213273bcc3a8d8dbaec

2
ports/esp32s2/Makefile
View File

@ -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 =