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

Merge pull request #2079 from dhalbert/tinyusb-update-00c440cb

Browse Source 
update tinyusb to 00c440cb
This commit is contained in:
Scott Shawcroft 2019-08-19 20:19:22 -07:00 committed by GitHub
commit 42143ca056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tinyusb

@ -1 +1 @@
Subproject commit 96d96a94b887bc1b648a175c28b377dba76a9068 Subproject commit 00c440cb26fbea7fd367623454d8b67855f1372f

3
ports/nrf/Makefile
View File

@ -184,8 +184,7 @@ SRC_C += \
# USB source files for nrf52840 # USB source files for nrf52840
ifeq ($(MCU_SUB_VARIANT),nrf52840) ifeq ($(MCU_SUB_VARIANT),nrf52840)
SRC_C += \ SRC_C += \
lib/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c \ lib/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c
lib/tinyusb/src/portable/nordic/nrf5x/hal_nrf5x.c
endif endif
SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \ SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \