Merge branch 'master' into fix-warnings

2021-10-23 21:23:56 +07:00
parent 6fcf4bee8c b541c0f5e0
commit 311c05b401
23 changed files with 289 additions and 104 deletions
--- a/examples/device/cdc_msc/src/usb_descriptors.c
+++ b/examples/device/cdc_msc/src/usb_descriptors.c
@@ -232,7 +232,7 @@ char const* string_desc_arr [] =
  (const char[]) { 0x09, 0x04 }, // 0: is supported language is English (0x0409)
  "TinyUSB",                     // 1: Manufacturer
  "TinyUSB Device",              // 2: Product
-  "123456",                      // 3: Serials, should use chip ID
+  "123456789012",                // 3: Serials, should use chip ID
  "TinyUSB CDC",                 // 4: CDC Interface
  "TinyUSB MSC",                 // 5: MSC Interface
 };