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

Author: ladyada

cores/arduino/Adafruit_TinyUSB_Core/Adafruit_USBD_Device.cpp

@@ -254,7 +254,7 @@ static int strcpy_uni16(const char *s, uint16_t *buf, int bufsize) {
   int i = 0;
   int buflen = 0;
 
-  while (i < bufsize) {
+  while (s[i] != 0 && i < bufsize) {
     int unichar;
     int utf8len = utf8_to_unichar(s + i, &unichar);
 
@@ -271,7 +271,6 @@ static int strcpy_uni16(const char *s, uint16_t *buf, int bufsize) {
       buf[buflen++] = unichar;
   }
 
-  buf[buflen] = '\0';
   return buflen;
 }
 

libraries/SPI/SPI.h

@@ -52,9 +52,11 @@
   // The datasheet specifies a typical SPI SCK period (tSCK) of 42 ns,
   // see "Table 36-48. SPI Timing Characteristics and Requirements",
   // which translates into a maximum SPI clock of 23.8 MHz.
-  // Conservatively, the divider is set for a 12 MHz maximum SPI clock.
+  // We'll permit use of 24 MHz SPI even though this is slightly out
+  // of spec. Given how clock dividers work, the next "sensible"
+  // threshold would be a substantial drop down to 12 MHz.
   #if !defined(MAX_SPI)
-    #define MAX_SPI 12000000
+    #define MAX_SPI 24000000
   #endif
   #define SPI_MIN_CLOCK_DIVIDER (uint8_t)(1 + ((F_CPU - 1) / MAX_SPI))
 #endif
@@ -81,7 +83,7 @@ class SPISettings {
 #if defined(__SAMD51__)
     this->clockFreq = clock; // Clipping handled in SERCOM.cpp
 #else
-    this->clockFreq = (clock >= (MAX_SPI * 2 / SPI_MIN_CLOCK_DIVIDER) ? MAX_SPI * 2 / SPI_MIN_CLOCK_DIVIDER : clock);
+    this->clockFreq = clock >= MAX_SPI ? MAX_SPI : clock;
 #endif
 
     this->bitOrder = (bitOrder == MSBFIRST ? MSB_FIRST : LSB_FIRST);