adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable USB Serial only if selected (#9294)

Browse source 
* Enable USB Serial only if selected

* fix examples

---------

Co-authored-by: Rodrigo Garcia <rodrigo.garcia@espressif.com>
This commit is contained in:
Me No Dev 2024-02-27 17:32:19 +02:00 committed by GitHub
parent e3748c1dca
commit 22d7fc91eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cores/esp32/HWCDC.cpp
View file

@ -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 // USBSerial is always available to be used
HWCDC HWCDCSerial; HWCDC HWCDCSerial;
#endif #endif

2
cores/esp32/HWCDC.h
View file

@ -102,7 +102,7 @@ public:
uint32_t baudRate(){return 115200;} 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 #ifndef HWCDC_SERIAL_IS_DEFINED
#define HWCDC_SERIAL_IS_DEFINED 1 #define HWCDC_SERIAL_IS_DEFINED 1
#endif #endif

2
cores/esp32/USBCDC.cpp
View file

@ -455,7 +455,7 @@ USBCDC::operator bool() const
return connected; 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 // USBSerial is always available to be used
USBCDC USBSerial(0); USBCDC USBSerial(0);
#endif #endif

2
cores/esp32/USBCDC.h
View file

@ -141,7 +141,7 @@ protected:
}; };
#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 #ifndef USB_SERIAL_IS_DEFINED
#define USB_SERIAL_IS_DEFINED 1 #define USB_SERIAL_IS_DEFINED 1
#endif #endif

4
libraries/USB/examples/CompositeDevice/CompositeDevice.ino
View file

@ -18,6 +18,10 @@ void loop(){}
FirmwareMSC MSC_Update; FirmwareMSC MSC_Update;
#endif #endif
#if !ARDUINO_USB_CDC_ON_BOOT
USBCDC USBSerial;
#endif
USBHID HID; USBHID HID;
USBHIDKeyboard Keyboard; USBHIDKeyboard Keyboard;
USBHIDMouse Mouse; USBHIDMouse Mouse;

1
libraries/USB/examples/FirmwareMSC/FirmwareMSC.ino
View file

@ -65,7 +65,6 @@ void setup() {
USB.onEvent(usbEventCallback); USB.onEvent(usbEventCallback);
MSC_Update.onEvent(usbEventCallback); MSC_Update.onEvent(usbEventCallback);
MSC_Update.begin(); MSC_Update.begin();
USBSerial.begin();
USB.begin(); USB.begin();
} }

1
libraries/USB/examples/USBMSC/USBMSC.ino
View file

@ -182,7 +182,6 @@ void setup() {
MSC.onWrite(onWrite); MSC.onWrite(onWrite);
MSC.mediaPresent(true); MSC.mediaPresent(true);
MSC.begin(DISK_SECTOR_COUNT, DISK_SECTOR_SIZE); MSC.begin(DISK_SECTOR_COUNT, DISK_SECTOR_SIZE);
USBSerial.begin();
USB.begin(); USB.begin();
} }

4
libraries/USB/examples/USBSerial/USBSerial.ino
View file

@ -7,6 +7,10 @@ void loop(){}
#else #else
#include "USB.h" #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){ static void usbEventCallback(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data){
if(event_base == ARDUINO_USB_EVENTS){ if(event_base == ARDUINO_USB_EVENTS){
arduino_usb_event_data_t * data = (arduino_usb_event_data_t*)event_data; arduino_usb_event_data_t * data = (arduino_usb_event_data_t*)event_data;