Merge pull request #97 from WestfW-patches/master

Allow multiple CDCs.

Author: hathach

examples/CDC/cdc_multi/cdc_multi.ino

@@ -0,0 +1,105 @@
+/*
+    This example demonstrates the use of multiple USB CDC/ACM "Virtual
+    Serial" ports, using Ha Thach's TinyUSB library, and the port of
+    that library to the Arduino environment
+
+    https://github.com/hathach/tinyusb
+    https://github.com/adafruit/Adafruit_TinyUSB_Arduino
+
+    Written by Bill Westfield (aka WestfW), June 2021.
+    Copyright 2021 by Bill Westfield
+    MIT license, check LICENSE for more information
+
+    The example creates three virtual serial ports.  Text entered on
+    any of the ports will be echoed to the all ports.
+
+    The max number of CDC ports (CFG_TUD_CDC) has to be changed to at
+    least 3, changed in the core tusb_config.h file.
+*/
+
+#include <Adafruit_TinyUSB.h>
+
+#define LED LED_BUILTIN
+
+/*
+    Create extra USB Serial Ports.  "Serial" is already created.
+*/
+Adafruit_USBD_CDC USBSer1;
+Adafruit_USBD_CDC USBSer2;
+
+void setup() {
+  pinMode(LED, OUTPUT);
+
+  // start up all of the USB Vitual ports, and wait for them to enumerate.
+  Serial.begin(115200);
+  USBSer1.begin(115200);
+  USBSer2.begin(115200);
+
+  while (!Serial || !USBSer1 || !USBSer2) {
+    if (Serial) {
+      Serial.println("Waiting for other USB ports");
+    }
+    if (USBSer1) {
+      USBSer1.println("Waiting for other USB ports");
+    }
+    if (USBSer2) {
+      USBSer2.println("Waiting for other USB ports");
+    }
+    delay(1000);
+  }
+
+  Serial.print("You are port 0\n\r\n0> ");
+  USBSer1.print("You are port 1\n\r\n1> ");
+  USBSer2.print("You are port 2\n\r\n2> ");
+}
+
+int LEDstate = 0;
+
+void loop() {
+  int ch;
+
+  ch = Serial.read();
+  if (ch > 0) {
+    printAll(ch);
+  }
+
+  ch = USBSer1.read();
+  if (ch > 0) {
+    printAll(ch);
+  }
+
+  ch = USBSer2.read();
+  if (ch > 0) {
+    printAll(ch);
+  }
+
+  if (delay_without_delaying(500)) {
+    LEDstate = !LEDstate;
+    digitalWrite(LED, LEDstate);
+  }
+}
+
+// print to all CDC ports
+void printAll(int ch) {
+  // print as it is
+  Serial.write(ch);
+
+  // always lower case
+  USBSer1.write(tolower(ch));
+
+  // always upper case
+  USBSer2.write(toupper(ch));
+}
+
+// Helper: non-blocking "delay" alternative.
+boolean delay_without_delaying(unsigned long time) {
+  // return false if we're still "delaying", true if time ms has passed.
+  // this should look a lot like "blink without delay"
+  static unsigned long previousmillis = 0;
+  unsigned long currentmillis = millis();
+  if (currentmillis - previousmillis >= time) {
+    previousmillis = currentmillis;
+    return true;
+  }
+  return false;
+}

src/arduino/Adafruit_TinyUSB_API.cpp

@@ -46,9 +46,14 @@ void TinyUSB_Device_Task(void) {
 }
 #endif
 
+// TODO should use getInstanceCount() API (when closed to BSP release cycle)
+// from Adafruit_USBD_CDC.cpp
+extern uint8_t _cdc_instance_count;
+
 void TinyUSB_Device_FlushCDC(void) {
-  // TODO multiple CDCs
-  tud_cdc_n_write_flush(0);
+  for (uint8_t instance = 0; instance < _cdc_instance_count; instance++) {
+    tud_cdc_n_write_flush(instance);
+  }
 }
 }
 

src/arduino/Adafruit_USBD_CDC.cpp

@@ -33,13 +33,12 @@
 #include "Adafruit_USBD_CDC.h"
 #include "Adafruit_USBD_Device.h"
 
-// TODO Multiple instances supports
-//	static uint8_t _itf_count;
-//	static Adafruit_USBD_CDC* _itf_arr[]
-
+// Starting endpoints; adjusted elsewhere as needed
 #define EPOUT 0x00
 #define EPIN 0x80
 
+uint8_t _cdc_instance_count = 0;
+
 Adafruit_USBD_CDC Serial;
 
 Adafruit_USBD_CDC::Adafruit_USBD_CDC(void) {
@@ -70,10 +69,15 @@ void Adafruit_USBD_CDC::begin(uint32_t baud) {
     return;
   }
 
-  _begun = true;
+  // too many instances
+  if (!(_cdc_instance_count < CFG_TUD_CDC)) {
+    return;
+  }
 
-  Serial.setStringDescriptor("TinyUSB Serial");
-  USBDevice.addInterface(Serial);
+  _begun = true;
+  _itf = _cdc_instance_count++;
+  this->setStringDescriptor("TinyUSB Serial");
+  USBDevice.addInterface(*this);
 }
 
 void Adafruit_USBD_CDC::begin(uint32_t baud, uint8_t config) {
@@ -84,40 +88,67 @@ void Adafruit_USBD_CDC::begin(uint32_t baud, uint8_t config) {
 void Adafruit_USBD_CDC::end(void) {
   // Resset configuration descriptor without Serial as CDC
   USBDevice.clearConfiguration();
+  _cdc_instance_count = 0;
 }
 
 uint32_t Adafruit_USBD_CDC::baud(void) {
+  if (!_begun) {
+    return 0;
+  }
+
   cdc_line_coding_t coding;
-  tud_cdc_get_line_coding(&coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.bit_rate;
 }
 
 uint8_t Adafruit_USBD_CDC::stopbits(void) {
+  if (!_begun) {
+    return 0;
+  }
+
   cdc_line_coding_t coding;
-  tud_cdc_get_line_coding(&coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.stop_bits;
 }
 
 uint8_t Adafruit_USBD_CDC::paritytype(void) {
+  if (!_begun) {
+    return 0;
+  }
+
   cdc_line_coding_t coding;
-  tud_cdc_get_line_coding(&coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.parity;
 }
 
 uint8_t Adafruit_USBD_CDC::numbits(void) {
+  if (!_begun) {
+    return 0;
+  }
+
   cdc_line_coding_t coding;
-  tud_cdc_get_line_coding(&coding);
+  tud_cdc_n_get_line_coding(_itf, &coding);
 
   return coding.data_bits;
 }
 
-int Adafruit_USBD_CDC::dtr(void) { return tud_cdc_connected(); }
+int Adafruit_USBD_CDC::dtr(void) {
+  if (!_begun) {
+    return 0;
+  }
+
+  return tud_cdc_n_connected(_itf);
+}
 
 Adafruit_USBD_CDC::operator bool() {
-  bool ret = tud_cdc_connected();
+  if (!_begun) {
+    return false;
+  }
+
+  bool ret = tud_cdc_n_connected(_itf);
 
   // Add an yield to run usb background in case sketch block wait as follows
   // while( !Serial ) {}
@@ -128,7 +159,11 @@ Adafruit_USBD_CDC::operator bool() {
 }
 
 int Adafruit_USBD_CDC::available(void) {
-  uint32_t count = tud_cdc_available();
+  if (!_begun) {
+    return 0;
+  }
+
+  uint32_t count = tud_cdc_n_available(_itf);
 
   // Add an yield to run usb background in case sketch block wait as follows
   // while( !Serial.available() ) {}
@@ -140,20 +175,39 @@ int Adafruit_USBD_CDC::available(void) {
 }
 
 int Adafruit_USBD_CDC::peek(void) {
+  if (!_begun) {
+    return -1;
+  }
+
   uint8_t ch;
-  return tud_cdc_peek(&ch) ? (int)ch : -1;
+  return tud_cdc_n_peek(_itf, &ch) ? (int)ch : -1;
+}
+
+int Adafruit_USBD_CDC::read(void) {
+  if (!_begun) {
+    return -1;
+  }
+  return (int)tud_cdc_n_read_char(_itf);
 }
 
-int Adafruit_USBD_CDC::read(void) { return (int)tud_cdc_read_char(); }
+void Adafruit_USBD_CDC::flush(void) {
+  if (!_begun) {
+    return;
+  }
 
-void Adafruit_USBD_CDC::flush(void) { tud_cdc_write_flush(); }
+  tud_cdc_n_write_flush(_itf);
+}
 
 size_t Adafruit_USBD_CDC::write(uint8_t ch) { return write(&ch, 1); }
 
 size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size) {
+  if (!_begun) {
+    return 0;
+  }
+
   size_t remain = size;
-  while (remain && tud_cdc_connected()) {
-    size_t wrcount = tud_cdc_write(buffer, remain);
+  while (remain && tud_cdc_n_connected(_itf)) {
+    size_t wrcount = tud_cdc_n_write(_itf, buffer, remain);
     remain -= wrcount;
     buffer += wrcount;
 
@@ -167,20 +221,23 @@ size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size) {
 }
 
 int Adafruit_USBD_CDC::availableForWrite(void) {
-  return tud_cdc_write_available();
+  if (!_begun) {
+    return 0;
+  }
+  return tud_cdc_n_write_available(_itf);
 }
 
 extern "C" {
 
 // Invoked when cdc when line state changed e.g connected/disconnected
 // Use to reset to DFU when disconnect with 1200 bps
-void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
+void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {
   (void)rts;
 
   // DTR = false is counted as disconnected
   if (!dtr) {
     // touch1200 only with first CDC instance (Serial)
-    if (itf == 0) {
+    if (instance == 0) {
       cdc_line_coding_t coding;
       tud_cdc_get_line_coding(&coding);
 

src/arduino/Adafruit_USBD_CDC.h

@@ -74,6 +74,13 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
 private:
   bool _begun;
   uint8_t _itf;
+
+  /* TODO when closed to BSP release cycle (SAMD, nRF, rp2040)
+   * rename _itf to _instance, _begun can be removed
+   *
+   * static uint8_t getInstanceCount(void);
+   * static uint8_t _instance_count;
+   */
 };
 
 extern Adafruit_USBD_CDC Serial;