Enable USB Serial only if selected (#9294)

* Enable USB Serial only if selected * fix examples --------- Co-authored-by: Rodrigo Garcia <[email protected]>
espressif · Feb 27, 2024 · 22d7fc9 · 22d7fc9
1 parent e3748c1
commit 22d7fc9
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/cores/esp32/HWCDC.cpp b/cores/esp32/HWCDC.cpp
@@ -436,7 +436,7 @@ void HWCDC::setDebugOutput(bool en)
     }
 }
 
-#if ARDUINO_USB_MODE  // Hardware JTAG CDC selected
+#if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT  // Hardware JTAG CDC selected
 // USBSerial is always available to be used
 HWCDC HWCDCSerial;
 #endif

diff --git a/cores/esp32/HWCDC.h b/cores/esp32/HWCDC.h
@@ -102,7 +102,7 @@ class HWCDC: public Stream
     uint32_t baudRate(){return 115200;}
 
 };
-#if ARDUINO_USB_MODE  // Hardware JTAG CDC selected
+#if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT  // Hardware JTAG CDC selected
 #ifndef HWCDC_SERIAL_IS_DEFINED
 #define HWCDC_SERIAL_IS_DEFINED 1
 #endif

diff --git a/cores/esp32/USBCDC.cpp b/cores/esp32/USBCDC.cpp
@@ -455,7 +455,7 @@ USBCDC::operator bool() const
     return connected;
 }
 
-#if !ARDUINO_USB_MODE         // Native USB CDC selected
+#if !ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT         // Native USB CDC selected
 // USBSerial is always available to be used
 USBCDC USBSerial(0);
 #endif

diff --git a/cores/esp32/USBCDC.h b/cores/esp32/USBCDC.h
@@ -141,7 +141,7 @@ class USBCDC: public Stream
 
 };
 
-#if !ARDUINO_USB_MODE        // Native USB CDC selected
+#if !ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT        // Native USB CDC selected
 #ifndef USB_SERIAL_IS_DEFINED
 #define USB_SERIAL_IS_DEFINED 1
 #endif 

diff --git a/libraries/USB/examples/CompositeDevice/CompositeDevice.ino b/libraries/USB/examples/CompositeDevice/CompositeDevice.ino
@@ -18,6 +18,10 @@ void loop(){}
 FirmwareMSC MSC_Update;
 #endif
 
+#if !ARDUINO_USB_CDC_ON_BOOT
+USBCDC USBSerial;
+#endif
+
 USBHID HID;
 USBHIDKeyboard Keyboard;
 USBHIDMouse Mouse;

diff --git a/libraries/USB/examples/FirmwareMSC/FirmwareMSC.ino b/libraries/USB/examples/FirmwareMSC/FirmwareMSC.ino
@@ -65,7 +65,6 @@ void setup() {
   USB.onEvent(usbEventCallback);
   MSC_Update.onEvent(usbEventCallback);
   MSC_Update.begin();
-  USBSerial.begin();
   USB.begin();
 }
 

diff --git a/libraries/USB/examples/USBMSC/USBMSC.ino b/libraries/USB/examples/USBMSC/USBMSC.ino
@@ -182,7 +182,6 @@ void setup() {
   MSC.onWrite(onWrite);
   MSC.mediaPresent(true);
   MSC.begin(DISK_SECTOR_COUNT, DISK_SECTOR_SIZE);
-  USBSerial.begin();
   USB.begin();
 }
 

diff --git a/libraries/USB/examples/USBSerial/USBSerial.ino b/libraries/USB/examples/USBSerial/USBSerial.ino
@@ -7,6 +7,10 @@ void loop(){}
 #else
 #include "USB.h"
 
+#if !ARDUINO_USB_CDC_ON_BOOT
+USBCDC USBSerial;
+#endif
+
 static void usbEventCallback(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data){
   if(event_base == ARDUINO_USB_EVENTS){
     arduino_usb_event_data_t * data = (arduino_usb_event_data_t*)event_data;