From aa577b4cdf6db57c1545c7969ba3446023c7f269 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 1 Aug 2018 10:30:36 +0700 Subject: [PATCH] fix #13 --- lib/tinyusb | 2 +- src/Makefile | 2 +- src/usb/tusb_descriptors.c | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/tinyusb b/lib/tinyusb index 191b73b..d5e58ba 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit 191b73b58c5ad6a098c652f31459ef39078a484b +Subproject commit d5e58ba02461f4563ded635ee1173cd3166e0bb1 diff --git a/src/Makefile b/src/Makefile index 80232be..ea1e555 100644 --- a/src/Makefile +++ b/src/Makefile @@ -118,7 +118,7 @@ C_SOURCE_FILES += $(TUSB_PATH)/portable/nordic/nrf5x/dcd_nrf5x.c 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)/device/usbd_desc.c +C_SOURCE_FILES += $(TUSB_PATH)/device/usbd_auto_desc.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)/class/custom/custom_device.c diff --git a/src/usb/tusb_descriptors.c b/src/usb/tusb_descriptors.c index 593e36f..302cc7b 100644 --- a/src/usb/tusb_descriptors.c +++ b/src/usb/tusb_descriptors.c @@ -75,5 +75,10 @@ tud_desc_set_t tud_desc_set = .device = NULL, .config = NULL, .string_arr = (uint8_t const **) string_desc_arr, - .hid_report = NULL + .hid_report = + { + .generic = NULL, + .boot_keyboard = NULL, + .boot_mouse = NULL + } };