improve device & cdc

Author: hathach

src/Adafruit_USBD_CDC.h

@@ -39,7 +39,7 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface
 	virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
 
 	void setPins(uint8_t pin_rx, uint8_t pin_tx) { (void) pin_rx; (void) pin_tx; }
-	void begin(uint32_t baud_count);
+	void begin(uint32_t baud);
 	void begin(uint32_t baud, uint8_t config);
 	void end(void);
 
@@ -65,6 +65,10 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface
 	virtual int availableForWrite(void);
 	using Print::write; // pull in write(str) from Print
 	operator bool();
+
+private:
+	bool    _begun;
+	uint8_t _itf;
 };
 
 extern Adafruit_USBD_CDC Serial;

src/arduino/Adafruit_USBD_CDC.cpp

@@ -25,19 +25,23 @@
 #ifdef USE_TINYUSB
 
 #include "Arduino.h"
-#include "tusb.h"
+#include "Adafruit_USBD_Device.h"
 #include "Adafruit_USBD_CDC.h"
-
 #include "arduino/ports/Adafruit_TinyUSB_Port.h"
 
+// TODO Multiple instances supports
+//	static uint8_t _itf_count;
+//	static Adafruit_USBD_CDC* _itf_arr[]
+
 #define EPOUT   0x00
 #define EPIN    0x80
 
 Adafruit_USBD_CDC Serial;
 
 Adafruit_USBD_CDC::Adafruit_USBD_CDC(void)
 {
-
+  _begun = false;
+  _itf = 0;
 }
 
 uint16_t Adafruit_USBD_CDC::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
@@ -57,12 +61,18 @@ uint16_t Adafruit_USBD_CDC::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t
 void Adafruit_USBD_CDC::begin (uint32_t baud)
 {
   (void) baud;
+
+  if (_begun) return;
+  _begun = true;
+
+  Serial.setStringDescriptor("TinyUSB Serial");
+  USBDevice.addInterface(Serial);
 }
 
 void Adafruit_USBD_CDC::begin (uint32_t baud, uint8_t config)
 {
-  (void) baud;
   (void) config;
+  this->begin(baud);
 }
 
 void Adafruit_USBD_CDC::end(void)

src/arduino/Adafruit_USBD_Device.cpp

@@ -55,6 +55,11 @@ enum
 Adafruit_USBD_Device USBDevice;
 
 Adafruit_USBD_Device::Adafruit_USBD_Device(void)
+{
+
+}
+
+void Adafruit_USBD_Device::clearConfiguration(void)
 {
   tusb_desc_device_t const desc_dev =
   {
@@ -81,21 +86,14 @@ Adafruit_USBD_Device::Adafruit_USBD_Device(void)
 
   memcpy(_desc_device, &desc_dev, sizeof(tusb_desc_device_t));
 
-  tusb_desc_configuration_t const dev_cfg =
+  uint8_t const dev_cfg [sizeof(tusb_desc_configuration_t)] =
   {
-    .bLength             = sizeof(tusb_desc_configuration_t),
-    .bDescriptorType     = TUSB_DESC_CONFIGURATION,
-
+    // Config number, interface count, string index, total length, attribute (bit 7 set to 1), power in mA
     // Total Length & Interface Number will be updated later
-    .wTotalLength        = 0,
-    .bNumInterfaces      = 0,
-    .bConfigurationValue = 1,
-    .iConfiguration      = 0x00,
-    .bmAttributes        = TU_BIT(7) | TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP,
-    .bMaxPower           = TUSB_DESC_CONFIG_POWER_MA(USB_CONFIG_POWER)
+    TUD_CONFIG_DESCRIPTOR(1, 0, 0, sizeof(tusb_desc_configuration_t), TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP | TU_BIT(7), 100),
   };
 
-  memcpy(_desc_cfg_buffer, &dev_cfg, sizeof(tusb_desc_configuration_t));
+  memcpy(_desc_cfg_buffer, dev_cfg, sizeof(tusb_desc_configuration_t));
   _desc_cfg        = _desc_cfg_buffer;
   _desc_cfg_maxlen = sizeof(_desc_cfg_buffer);
   _desc_cfg_len    = sizeof(tusb_desc_configuration_t);
@@ -166,10 +164,9 @@ bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface& itf)
   return true;
 }
 
-void Adafruit_USBD_Device::setDescriptorBuffer(uint8_t* buf, uint32_t buflen)
+void Adafruit_USBD_Device::setConfigurationBuffer(uint8_t* buf, uint32_t buflen)
 {
-  if (buflen < _desc_cfg_maxlen)
-    return;
+  if (buflen < _desc_cfg_maxlen) return;
 
   memcpy(buf, _desc_cfg, _desc_cfg_len);
   _desc_cfg        = buf;
@@ -192,7 +189,6 @@ void Adafruit_USBD_Device::setDeviceVersion(uint16_t bcd)
   ((tusb_desc_device_t*)_desc_device)->bcdDevice = bcd;
 }
 
-
 void Adafruit_USBD_Device::setLanguageDescriptor (uint16_t language_id)
 {
   _desc_str_arr[STRID_LANGUAGE] = (const char*) ((uint32_t) language_id);
@@ -233,9 +229,11 @@ uint8_t Adafruit_USBD_Device::getSerialDescriptor(uint16_t* serial_utf16)
 
 bool Adafruit_USBD_Device::begin(uint8_t rhport)
 {
-  Serial.setStringDescriptor("TinyUSB Serial");
-  USBDevice.addInterface(Serial);
-  USBDevice.setID(USB_VID, USB_PID);
+  clearConfiguration();
+  setID(USB_VID, USB_PID);
+
+  // Serial is always added by default
+  Serial.begin(115200);
 
   TinyUSB_Port_InitDeviceController(rhport);
 

src/arduino/Adafruit_USBD_Device.h

@@ -55,36 +55,50 @@ class Adafruit_USBD_Device
   public:
     Adafruit_USBD_Device(void);
 
-    // Device descriptor
+    //------------- Device descriptor -------------//
+
+    // Set VID, PID
     void setID(uint16_t vid, uint16_t pid);
+
+    // Set bcdUSB version e.g 1.0, 2.0, 2.1
     void setVersion(uint16_t bcd);
+
+    // Set bcdDevice version
     void setDeviceVersion(uint16_t bcd);
 
-    // Configuration descriptor
+    //------------- Configuration descriptor -------------//
+
+    // Add an new interface
     bool addInterface(Adafruit_USBD_Interface& itf);
-    void setDescriptorBuffer(uint8_t* buf, uint32_t buflen);
 
-    // String descriptor
+    // Clear/Reset configuration descriptor
+    void clearConfiguration(void);
+
+    // Provide user buffer for configuration descriptor, needed if total length > 256
+    void setConfigurationBuffer(uint8_t* buf, uint32_t buflen);
+
+    //------------- String descriptor -------------//
     void setLanguageDescriptor(uint16_t language_id);
     void setManufacturerDescriptor(const char *s);
     void setProductDescriptor(const char *s);
     uint8_t getSerialDescriptor(uint16_t* serial_utf16);
 
-    // Control
+    //------------- Control -------------//
+
     bool begin(uint8_t rhport=0);
     void task(void);
 
-    // status
-    bool mounted      (void);
-    bool suspended    (void);
-    bool ready        (void);
-    bool remoteWakeup (void);
-
     // physical disable/enable pull-up
     bool detach       (void);
     bool attach       (void);
 
 
+    //------------- status -------------//
+    bool mounted      (void);
+    bool suspended    (void);
+    bool ready        (void);
+    bool remoteWakeup (void);
+
   private:
     uint16_t const* descriptor_string_cb(uint8_t index, uint16_t langid);
 

src/common/tusb_types.h

@@ -309,6 +309,8 @@ typedef struct TU_ATTR_PACKED
   uint8_t  bMaxPower           ; ///< Maximum power consumption of the USB device from the bus in this specific configuration when the device is fully operational. Expressed in 2 mA units (i.e., 50 = 100 mA).
 } tusb_desc_configuration_t;
 
+TU_VERIFY_STATIC( sizeof(tusb_desc_configuration_t) == 9, "size is not correct");
+
 /// USB Interface Descriptor
 typedef struct TU_ATTR_PACKED
 {