diff --git a/lib/tinyusb b/lib/tinyusb index 8af60fd..b9b92dd 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit 8af60fded39cf0d6a8736c8b01a8b49ca77f13cb +Subproject commit b9b92dd27b0ab09c49c781ba65671beaa3eefdd8 diff --git a/src/make_common.mk b/src/make_common.mk index 30f1ef0..951b7b4 100644 --- a/src/make_common.mk +++ b/src/make_common.mk @@ -109,8 +109,8 @@ C_SOURCE_FILES += $(SDK_PATH)/libraries/hci/hci_slip.c C_SOURCE_FILES += $(SDK_PATH)/libraries/hci/hci_transport.c C_SOURCE_FILES += $(SDK_PATH)/libraries/util/nrf_assert.c -C_SOURCE_FILES += $(SDK_PATH)/libraries/uart/app_uart.c -C_SOURCE_FILES += $(SDK_PATH)/drivers_nrf/uart/nrf_drv_uart.c +#C_SOURCE_FILES += $(SDK_PATH)/libraries/uart/app_uart.c +#C_SOURCE_FILES += $(SDK_PATH)/drivers_nrf/uart/nrf_drv_uart.c C_SOURCE_FILES += $(SDK_PATH)/drivers_nrf/common/nrf_drv_common.c @@ -122,6 +122,7 @@ C_SOURCE_FILES += $(TUSB_PATH)/portable/nordic/nrf5x/hal_nrf5x.c C_SOURCE_FILES += $(TUSB_PATH)/common/tusb_fifo.c C_SOURCE_FILES += $(TUSB_PATH)/device/usbd.c C_SOURCE_FILES += $(TUSB_PATH)/class/cdc/cdc_device.c +C_SOURCE_FILES += $(TUSB_PATH)/class/msc/msc_device.c C_SOURCE_FILES += $(TUSB_PATH)/tusb.c #****************************************************************************** @@ -371,4 +372,8 @@ flash_feather52840: feather52840 flash_metro52: BOOTLOADER_WITH_SD_NAME := metro52_bootloader_$(BOOTLOADER_SD_SUFFIX) flash_metro52: metro52 @echo Flashing: $(OUTPUT_BINARY_DIRECTORY)/$(BOOTLOADER_WITH_SD_NAME).hex - nrfjprog --program $(OUTPUT_BINARY_DIRECTORY)/$(BOOTLOADER_WITH_SD_NAME).hex -f nrf52 --chiperase --reset \ No newline at end of file + nrfjprog --program $(OUTPUT_BINARY_DIRECTORY)/$(BOOTLOADER_WITH_SD_NAME).hex -f nrf52 --chiperase --reset + +flash_sd: + @echo Flashing: $(SD_HEX) + nrfjprog --program $(SD_HEX) -f nrf52 --chiperase --reset