From 7e2d6273b5c057f066f3e52353e0a0b5c06a9e9e Mon Sep 17 00:00:00 2001 From: Martino Facchin Date: Fri, 3 Dec 2021 16:22:37 +0100 Subject: [PATCH] Make SerialCDC inherit from HardwareSerial As suggested by @thiagoralves --- cores/arduino/USB/CDC.cpp | 2 +- cores/arduino/USB/USBAPI.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp index c8314c2bb..77aa6832a 100644 --- a/cores/arduino/USB/CDC.cpp +++ b/cores/arduino/USB/CDC.cpp @@ -201,7 +201,7 @@ void Serial_::begin(uint32_t /* baud_count */) // uart config is ignored in USB-CDC } -void Serial_::begin(uint32_t /* baud_count */, uint8_t /* config */) +void Serial_::begin(uint32_t /* baud_count */, uint16_t /* config */) { // uart config is ignored in USB-CDC } diff --git a/cores/arduino/USB/USBAPI.h b/cores/arduino/USB/USBAPI.h index 07633825d..d14944a32 100644 --- a/cores/arduino/USB/USBAPI.h +++ b/cores/arduino/USB/USBAPI.h @@ -32,6 +32,7 @@ #include "Arduino.h" #include "api/Stream.h" #include "api/RingBuffer.h" +#include "api/HardwareSerial.h" #include "api/USBAPI.h" #include "CDC.h" @@ -96,12 +97,12 @@ extern USBDeviceClass USBDevice; //================================================================================ // Serial over CDC (Serial1 is the physical port) -class Serial_ : public arduino::Stream, public arduino::PluggableUSBModule +class Serial_ : public arduino::HardwareSerial, arduino::PluggableUSBModule { public: Serial_(USBDeviceClass &_usb); void begin(uint32_t baud_count); - void begin(unsigned long, uint8_t); + void begin(unsigned long, uint16_t); void end(void); virtual int available(void);