Merge pull request arduino#121 from adafruit/tinyusb

windows serial fix

Author: ladyada

cores/arduino/Adafruit_TinyUSB_Core/Adafruit_TinyUSB_Core.cpp

@@ -84,6 +84,8 @@ static void usb_hardware_init(void)
 
 uint8_t load_serial_number(uint16_t* serial_str)
 {
+  enum { SERIAL_BYTE_LEN = 16 };
+
 #ifdef __SAMD51__
   uint32_t* id_addresses[4] = {(uint32_t *) 0x008061FC, (uint32_t *) 0x00806010,
                                (uint32_t *) 0x00806014, (uint32_t *) 0x00806018};
@@ -93,7 +95,7 @@ uint8_t load_serial_number(uint16_t* serial_str)
 
 #endif
 
-  uint8_t raw_id[16];
+  uint8_t raw_id[SERIAL_BYTE_LEN];
 
   for (int i=0; i<4; i++) {
       for (int k=0; k<4; k++) {
@@ -111,7 +113,7 @@ uint8_t load_serial_number(uint16_t* serial_str)
     }
   }
 
-  return 16;
+  return sizeof(raw_id)*2;
 }
 
 void Adafruit_TinyUSB_Core_init(void)

cores/arduino/Adafruit_TinyUSB_Core/Adafruit_USBD_Device.cpp

@@ -164,7 +164,8 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
   return USBDevice._desc_cfg;
 }
 
-static uint16_t _desc_str[32];
+// up to 32 unicode characters (header make it 33)
+static uint16_t _desc_str[33];
 
 // Invoked when received GET STRING DESCRIPTOR request
 // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
@@ -187,7 +188,7 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index)
 
       // cap at max char
       chr_count = strlen(str);
-      if ( chr_count > 31 ) chr_count = 31;
+      if ( chr_count > 32 ) chr_count = 32;
 
       for(uint8_t i=0; i<chr_count; i++)
       {