From 683304fd3c41f129269ba850a30c9bd056bdec9e Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 19 Jun 2021 02:27:41 +0700 Subject: [PATCH 1/2] update tinyusb to fix nrf control race condition --- lib/tinyusb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tinyusb b/lib/tinyusb index ab4d30fd6b..df0cda2d7a 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit ab4d30fd6bca02c73eb9b4ff82db0b2b0f403344 +Subproject commit df0cda2d7ab7a061bcb28213273bcc3a8d8dbaec From b3a91220deea09173abeadf7a07e172dc0e425a7 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 19 Jun 2021 12:55:54 +0700 Subject: [PATCH 2/2] fix build with esp32s2 --- ports/esp32s2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile index 201989e0c9..5b49d3e887 100644 --- a/ports/esp32s2/Makefile +++ b/ports/esp32s2/Makefile @@ -190,7 +190,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 =