Merge branch 'master' of github.com:adafruit/ArduinoCore-samd

ladyada · ladyada · commit a029d6192536 · 2020-09-19T17:22:08.000-04:00
diff --git a/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore b/cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore
@@ -1 +1 @@
-Subproject commit 238a5c0b95fcd402d24524c7bebbdd822168a51e
+Subproject commit e7b892095f2bb5d8bef6a748238369bdd268ed5e
diff --git a/cores/arduino/TinyUSB/Adafruit_TinyUSB_SAMD.cpp b/cores/arduino/TinyUSB/Adafruit_TinyUSB_SAMD.cpp
@@ -77,7 +77,8 @@ void Adafruit_TinyUSB_Core_init(void)
   serial1_printf("TinyUSB debugging with Serial1\n");
 #endif
 
-  USBDevice.addInterface( (Adafruit_USBD_Interface&) Serial);
+  Serial.setStringDescriptor("TinyUSB Serial");
+  USBDevice.addInterface(Serial);
   USBDevice.setID(USB_VID, USB_PID);
   USBDevice.begin();
 
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
@@ -260,7 +260,7 @@ void SPIClass::dmaCallback(Adafruit_ZeroDMA *dma) {
 // to the read channel to indicate end-of-transfer, and the write channel's
 // callback is assigned to this nonsense function (for reasons I'm not
 // entirely sure of, setting the callback to NULL doesn't work).
-static void dmaDoNothingCallback(Adafruit_ZeroDMA *dma) { }
+static void dmaDoNothingCallback(Adafruit_ZeroDMA *dma) { (void)dma; }
 
 // This could've gone in begin(), but for the sake of organization...
 void SPIClass::dmaAllocate(void) {
