Merge pull request adafruit#9499 from tannewt/update_tinyusb_esp_fix

Switch back to TinyUSB upstream
CytronTechnologies · Aug 9, 2024 · 5f7c42e · 5f7c42e
2 parents d7ae650 + f3d9a52
commit 5f7c42e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -68,8 +68,8 @@
 	url = https://github.com/adafruit/nrfx.git
 [submodule "lib/tinyusb"]
 	path = lib/tinyusb
-	url = https://github.com/tannewt/tinyusb.git
-	branch = esp_fix
+	url = https://github.com/hathach/tinyusb.git
+	branch = master
 	fetchRecurseSubmodules = false
 [submodule "tools/huffman"]
 	path = tools/huffman

diff --git a/lib/tinyusb b/lib/tinyusb
+25 −4		.github/actions/setup_toolchain/action.yml
+4 −4		.github/actions/setup_toolchain/espressif/action.yml
+1 −3		.github/workflows/build.yml
+3 −3		.github/workflows/build_util.yml
+11 −11		.github/workflows/ci_set_matrix.py
+6 −52		.github/workflows/hil_test.yml
+8 −7		.idea/cmake.xml
+7 −1		hw/bsp/family_support.cmake
+14 −0		hw/bsp/stm32f1/boards/stm32f103ze_iar/board.cmake
+97 −0		hw/bsp/stm32f1/boards/stm32f103ze_iar/board.h
+13 −0		hw/bsp/stm32f1/boards/stm32f103ze_iar/board.mk
+34 −1		hw/bsp/stm32f1/family.c
+17 −17		hw/bsp/stm32f1/family.mk
+0 −1		src/device/usbd.c
+254 −381		src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
+2 −16		src/portable/st/stm32_fsdev/fsdev_ch32.h
+23 −27		src/portable/st/stm32_fsdev/fsdev_stm32.h
+67 −43		src/portable/st/stm32_fsdev/fsdev_type.h
+109 −108		test/hil/hil_test.py
+7 −0		test/hil/rpi.json