Merge pull request #578 from adafruit/update-tinyusb-core

hathach · web-flow · commit 7b57de6ae972 · 2020-09-15T23:50:39.000+07:00
update tinyusb core
diff --git a/cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore b/cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore
@@ -1 +1 @@
-Subproject commit 2afb2320e03e26c765aaeb51d430325b8adcdbf9
+Subproject commit e7b892095f2bb5d8bef6a748238369bdd268ed5e
diff --git a/cores/nRF5/TinyUSB/Adafruit_TinyUSB_nRF.cpp b/cores/nRF5/TinyUSB/Adafruit_TinyUSB_nRF.cpp
@@ -90,7 +90,8 @@ static void usb_device_task(void* param)
 {
   (void) param;
 
-  USBDevice.addInterface((Adafruit_USBD_Interface&) Serial);
+  Serial.setStringDescriptor("TinyUSB Serial");
+  USBDevice.addInterface(Serial);
   USBDevice.setID(USB_VID, USB_PID);
   USBDevice.begin();
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ static void usb_device_task(void* param)`
`90`	`90`	`{`
`91`	`91`	`(void) param;`
`92`	`92`
`93`		`- USBDevice.addInterface((Adafruit_USBD_Interface&) Serial);`
	`93`	`+ Serial.setStringDescriptor("TinyUSB Serial");`
	`94`	`+ USBDevice.addInterface(Serial);`
`94`	`95`	`USBDevice.setID(USB_VID, USB_PID);`
`95`	`96`	`USBDevice.begin();`
`96`	`97`