define Serial as SerialTinyUSB if USE_TINYUSB is defined

adafruit · Jun 13, 2024 · f2168e4 · f2168e4
1 parent 69333be
commit f2168e4
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 9 deletions.
diff --git a/examples/CDC/cdc_multi/.feather_esp32s2.test.skip b/examples/CDC/cdc_multi/.feather_esp32s2.test.skip
diff --git a/examples/CDC/cdc_multi/.feather_esp32s3.test.skip b/examples/CDC/cdc_multi/.feather_esp32s3.test.skip
diff --git a/examples/CDC/cdc_multi/.funhouse.test.skip b/examples/CDC/cdc_multi/.funhouse.test.skip
diff --git a/examples/CDC/cdc_multi/.magtag.test.skip b/examples/CDC/cdc_multi/.magtag.test.skip
diff --git a/examples/CDC/cdc_multi/.metroesp32s2.test.skip b/examples/CDC/cdc_multi/.metroesp32s2.test.skip
diff --git a/examples/CDC/cdc_multi/.pico_rp2040_tinyusb_host.test.skip b/examples/CDC/cdc_multi/.pico_rp2040_tinyusb_host.test.skip
diff --git a/examples/CDC/cdc_multi/.skip.txt b/examples/CDC/cdc_multi/.skip.txt
@@ -0,0 +1,6 @@
+feather_esp32s2
+feather_esp32s3
+funhouse
+magtag
+metroesp32s2
+pico_rp2040_tinyusb_host
diff --git a/src/arduino/Adafruit_USBD_CDC.h b/src/arduino/Adafruit_USBD_CDC.h
@@ -93,15 +93,11 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
   bool isValid(void) { return _instance != INVALID_INSTANCE; }
 };
 
-// "Serial" is used with TinyUSB CDC
-#if defined(USE_TINYUSB)
-extern Adafruit_USBD_CDC Serial;
-#define SerialTinyUSB Serial
-#endif
-
-// Serial is probably used with HW Uart
-#ifndef SerialTinyUSB
 extern Adafruit_USBD_CDC SerialTinyUSB;
+
+// Built-in support "Serial" is used with TinyUSB CDC
+#if defined(USE_TINYUSB)
+#define Serial SerialTinyUSB
 #endif
 
 #endif // else of ESP32

diff --git a/src/arduino/ports/ch32/Adafruit_TinyUSB_ch32.cpp b/src/arduino/ports/ch32/Adafruit_TinyUSB_ch32.cpp
@@ -76,7 +76,9 @@ USBWakeUp_IRQHandler(void) {
 
 void yield(void) {
   tud_task();
-  // flush cdc
+  if (tud_cdc_connected()) {
+    tud_cdc_write_flush();
+  }
 }
 }