Serial as a #define #8798
Serial as a #define #8798
Conversation
cores/esp32/HardwareSerial.cpp
Outdated
| #if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC | ||
| if(Serial0.available()) serialEvent(); | ||
| #else | ||
| // Serial is always defined as something (UART0 or USBSerial) | ||
| if(Serial.available()) serialEvent(); |
There was a problem hiding this comment.
Should be Serial0.available()
There was a problem hiding this comment.
I was thinking about it yesterday. If I use Serial.available(), it works with the CDC as well...
Serial0 will limit it to UART only.
Any opinion?
There was a problem hiding this comment.
I think it should be left as Serial0 and then have other lines that handle USB. In case of CDC, Serial0 still should be handled here :0
| // When using CDC on Boot, Arduino Serial is the USB device | ||
| #define Serial USBSerial | ||
| #endif | ||
| // USBSerial is always available to be used |
There was a problem hiding this comment.
the whole #if ARDUINO_USB_CDC_ON_BOOT block should be in HardwareSerial.h. Same goes for HWCDC.h.
#if !ARDUINO_USB_MODE // Native USB CDC selected
extern USBCDC USBSerial;
#endif
| @@ -9,13 +9,7 @@ void loop(){} | |||
| #if !ARDUINO_USB_MSC_ON_BOOT | |||
| FirmwareMSC MSC_Update; | |||
| #endif | |||
| #if ARDUINO_USB_CDC_ON_BOOT | |||
| #define HWSerial Serial0 | |||
There was a problem hiding this comment.
you no longer need this define. Change the rest of the example code to call Serial0 for UART and USBSerial for CDC. Same for the other applicable examples.
There was a problem hiding this comment.
That's something I was thinking about yesterday as well...
I left it there because the user could change it to any other Print communication channel...
What do you say? We can change it to "PrintObj" instead of "HWSerial"
There was a problem hiding this comment.
Looking at the code, I think that with those changes, it needs to just call Serial and not even check this define. If it's set to be UART, it will go there, else whatever CDC it's set to.
There was a problem hiding this comment.
Replace all HWSerial with Serial and delete references to USBSerial
cores/esp32/HWCDC.h
Outdated
| #else | ||
| extern HWCDC USBSerial; | ||
| #if ARDUINO_USB_MODE // Hardware JTAG CDC selected | ||
| #if ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC |
There was a problem hiding this comment.
See my comment about USBCDC.h
cores/esp32/HardwareSerial.h
Outdated
| #if !ARDUINO_USB_MODE | ||
| #include "USB.h" | ||
| #include "USBCDC.h" | ||
| #if !ARDUINO_USB_CDC_ON_BOOT //Serial used for USB CDC |
There was a problem hiding this comment.
here you should have the checks from both CDCs as well. One place for all :)
|
@me-no-dev - the changes shall be addressed now. I also added a way to run |
Description of Change
The PR changes
Serialto be a pre-processor symbol instead of a HardwareSerial/HWCDC/USBCDC object.Therefore, UART0 is always the
Serial0object.If the sketch doesn't use
CDC on Boot,Serialwill defined to beSerial0by default.Whenever the sketch is set to use
CDC on Boot,Serialwill defined to beUSBSerialobject, which in turn will point to a HWCDC or USBCDC object depending on how it is configured / which SoC is used.The PR will make
Serial0,Serial1andSerial2(if it exists) always available as UART0/1/2.USBSerialwill also always be available whenever the SoC has a CDC interface.If necessary the sketch can change/force the redefinition of
Serialsymbol to whatever necessary.The PR also adds a
HWCDCSerialEvent()callback that is executed afterloop()whenever there are bytes available in the HW Serial Interface.The same for
USBSerialEvent()in Native USB CDC. Those two functions can be defined in the sketch by the user and work in the same way asSerialEvent()works.Tests scenarios
Used "OnReceive_Demo.ino" to test it using ESP32/ESP32S2/ESP32C3/ESP32S3 with different configurations for USB, whenever possible.
Related links
None