Merge pull request #67 from adafruit/use-string-descriptor

hathach · web-flow · commit 7a50a49848bc · 2020-09-16T23:52:48.000+07:00
use setStringDescriptor() in example
diff --git a/examples/Composite/mouse_external_flash/mouse_external_flash.ino b/examples/Composite/mouse_external_flash/mouse_external_flash.ino
@@ -67,7 +67,7 @@ void setup()
   usb_msc.setReadWriteCallback(msc_read_cb, msc_write_cb, msc_flush_cb);
 
   // Set disk size, block size should be 512 regardless of spi flash page size
-  usb_msc.setCapacity(flash.pageSize()*flash.numPages()/512, 512);
+  usb_msc.setCapacity(flash.size()/512, 512);
 
   // MSC is ready for read/write
   usb_msc.setUnitReady(true);
@@ -142,4 +142,5 @@ int32_t msc_write_cb (uint32_t lba, uint8_t* buffer, uint32_t bufsize)
 void msc_flush_cb (void)
 {
   flash.syncBlocks();
-}
+}
+
diff --git a/examples/HID/hid_composite/hid_composite.ino b/examples/HID/hid_composite/hid_composite.ino
@@ -55,6 +55,7 @@ void setup()
 {
   usb_hid.setPollInterval(2);
   usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
+  //usb_hid.setStringDescriptor("TinyUSB HID Composite");
 
   usb_hid.begin();
 
diff --git a/examples/HID/hid_generic_inout/hid_generic_inout.ino b/examples/HID/hid_generic_inout/hid_generic_inout.ino
@@ -45,6 +45,7 @@ void setup()
   usb_hid.setPollInterval(2);
   usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
   usb_hid.setReportCallback(get_report_callback, set_report_callback);
+  //usb_hid.setStringDescriptor("TinyUSB HID Generic");
 
   usb_hid.begin();
 
diff --git a/examples/HID/hid_keyboard/hid_keyboard.ino b/examples/HID/hid_keyboard/hid_keyboard.ino
@@ -38,6 +38,7 @@ void setup()
   usb_hid.setPollInterval(2);
   usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
   usb_hid.setReportCallback(NULL, hid_report_callback);
+  //usb_hid.setStringDescriptor("TinyUSB Keyboard");
 
   usb_hid.begin();
 
diff --git a/examples/HID/hid_mouse/hid_mouse.ino b/examples/HID/hid_mouse/hid_mouse.ino
@@ -48,6 +48,7 @@ void setup()
 
   usb_hid.setPollInterval(2);
   usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
+  //usb_hid.setStringDescriptor("TinyUSB Mouse");
 
   usb_hid.begin();
 
diff --git a/examples/MIDI/midi_test/midi_test.ino b/examples/MIDI/midi_test/midi_test.ino
@@ -40,6 +40,8 @@ void setup()
 {
   pinMode(LED_BUILTIN, OUTPUT);
   
+  //usb_midi.setStringDescriptor("TinyUSB MIDI");
+
   // Initialize MIDI, and listen to all MIDI channels
   // This will also call usb_midi's begin()
   MIDI.begin(MIDI_CHANNEL_OMNI);
diff --git a/examples/MassStorage/msc_external_flash/msc_external_flash.ino b/examples/MassStorage/msc_external_flash/msc_external_flash.ino
@@ -75,7 +75,7 @@ void setup()
   usb_msc.setReadWriteCallback(msc_read_cb, msc_write_cb, msc_flush_cb);
 
   // Set disk size, block size should be 512 regardless of spi flash page size
-  usb_msc.setCapacity(flash.pageSize()*flash.numPages()/512, 512);
+  usb_msc.setCapacity(flash.size()/512, 512);
 
   // MSC is ready for read/write
   usb_msc.setUnitReady(true);
diff --git a/examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino b/examples/MassStorage/msc_external_flash_sdcard/msc_external_flash_sdcard.ino
@@ -86,7 +86,7 @@ void setup()
   flash.begin();
   fatfs.begin(&flash);
 
-  usb_msc.setCapacity(0, flash.pageSize()*flash.numPages()/512, 512);
+  usb_msc.setCapacity(0, flash.size()/512, 512);
   usb_msc.setReadWriteCallback(0, external_flash_read_cb, external_flash_write_cb, external_flash_flush_cb);
   usb_msc.setUnitReady(0, true);
 
diff --git a/examples/WebUSB/webusb_rgb/webusb_rgb.ino b/examples/WebUSB/webusb_rgb/webusb_rgb.ino
@@ -54,9 +54,10 @@ WEBUSB_URL_DEF(landingPage, 1 /*https*/, "adafruit.github.io/Adafruit_TinyUSB_Ar
 // the setup function runs once when you press reset or power the board
 void setup()
 {
-  usb_web.begin();
+  //usb_web.setStringDescriptor("TinyUSB WebUSB");
   usb_web.setLandingPage(&landingPage);
   usb_web.setLineStateCallback(line_state_callback);
+  usb_web.begin();
 
   Serial.begin(115200);
 
diff --git a/examples/WebUSB/webusb_serial/webusb_serial.ino b/examples/WebUSB/webusb_serial/webusb_serial.ino
@@ -41,9 +41,10 @@ void setup()
   pinMode(led_pin, OUTPUT);
   digitalWrite(led_pin, LOW);
   
-  usb_web.begin();
   usb_web.setLandingPage(&landingPage);
   usb_web.setLineStateCallback(line_state_callback);
+  //usb_web.setStringDescriptor("TinyUSB WebUSB");
+  usb_web.begin();
 
   Serial.begin(115200);
 
diff --git a/src/Adafruit_USBD_HID.cpp b/src/Adafruit_USBD_HID.cpp
@@ -75,31 +75,31 @@ uint16_t Adafruit_USBD_HID::getDescriptor(uint8_t itfnum, uint8_t *buf,
   if (!_desc_report_len)
     return 0;
 
-  if (_out_endpoint) {
-    // usb core will automatically update endpoint number
-    uint8_t desc[] = {
-        TUD_HID_INOUT_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPOUT,
-                                 EPIN, CFG_TUD_HID_BUFSIZE, _interval_ms)};
-    uint16_t const len = sizeof(desc);
+  // usb core will automatically update endpoint number
+  uint8_t const desc_inout[] = {
+      TUD_HID_INOUT_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPIN,
+                               EPOUT, CFG_TUD_HID_BUFSIZE, _interval_ms)};
+  uint8_t const desc_in_only[] = {
+      TUD_HID_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPIN,
+                         CFG_TUD_HID_BUFSIZE, _interval_ms)};
 
-    if (bufsize < len)
-      return 0;
-    memcpy(buf, desc, len);
+  uint8_t const *desc;
+  uint16_t len;
 
-    return len;
+  if (_out_endpoint) {
+    desc = desc_inout;
+    len = sizeof(desc_inout);
   } else {
-    // usb core will automatically update endpoint number
-    uint8_t desc[] = {TUD_HID_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len,
-                                         EPIN, CFG_TUD_HID_BUFSIZE,
-                                         _interval_ms)};
-    uint16_t const len = sizeof(desc);
-
-    if (bufsize < len)
-      return 0;
-    memcpy(buf, desc, len);
+    desc = desc_in_only;
+    len = sizeof(desc_in_only);
+  }
 
-    return len;
+  if (bufsize < len) {
+    return 0;
   }
+
+  memcpy(buf, desc, len);
+  return len;
 }
 
 bool Adafruit_USBD_HID::begin(void) {
diff --git a/src/Adafruit_USBD_HID.h b/src/Adafruit_USBD_HID.h
@@ -27,7 +27,7 @@
 
 #include "Adafruit_TinyUSB_Core.h"
 
-class Adafruit_USBD_HID : Adafruit_USBD_Interface {
+class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
 public:
   typedef uint16_t (*get_report_callback_t)(uint8_t report_id,
                                             hid_report_type_t report_type,
diff --git a/src/Adafruit_USBD_MIDI.h b/src/Adafruit_USBD_MIDI.h
@@ -27,7 +27,7 @@
 
 #include "Adafruit_TinyUSB_Core.h"
 
-class Adafruit_USBD_MIDI : public Stream, Adafruit_USBD_Interface {
+class Adafruit_USBD_MIDI : public Stream, public Adafruit_USBD_Interface {
 public:
   Adafruit_USBD_MIDI(void);
 
diff --git a/src/Adafruit_USBD_MSC.h b/src/Adafruit_USBD_MSC.h
@@ -27,7 +27,7 @@
 
 #include "Adafruit_TinyUSB_Core.h"
 
-class Adafruit_USBD_MSC : Adafruit_USBD_Interface {
+class Adafruit_USBD_MSC : public Adafruit_USBD_Interface {
 public:
   typedef int32_t (*read_callback_t)(uint32_t lba, void *buffer,
                                      uint32_t bufsize);
diff --git a/src/Adafruit_USBD_WebUSB.h b/src/Adafruit_USBD_WebUSB.h
@@ -35,7 +35,7 @@
     char url[3 + sizeof(_url)];                                                \
   } const _name = {3 + sizeof(_url) - 1, 3, _scheme, _url}
 
-class Adafruit_USBD_WebUSB : public Stream, Adafruit_USBD_Interface {
+class Adafruit_USBD_WebUSB : public Stream, public Adafruit_USBD_Interface {
 public:
   typedef void (*linestate_callback_t)(bool connected);
   Adafruit_USBD_WebUSB(void);

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ void setup()`
`55`	`55`	`{`
`56`	`56`	`usb_hid.setPollInterval(2);`
`57`	`57`	`usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));`
	`58`	`+ //usb_hid.setStringDescriptor("TinyUSB HID Composite");`
`58`	`59`
`59`	`60`	`usb_hid.begin();`
`60`	`61`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ void setup()`
`40`	`40`	`{`
`41`	`41`	`pinMode(LED_BUILTIN, OUTPUT);`
`42`	`42`
	`43`	`+ //usb_midi.setStringDescriptor("TinyUSB MIDI");`
	`44`	`+`
`43`	`45`	`// Initialize MIDI, and listen to all MIDI channels`
`44`	`46`	`// This will also call usb_midi's begin()`
`45`	`47`	`MIDI.begin(MIDI_CHANNEL_OMNI);`