Skip to content

Commit dc99cd2

Browse files
authored
Merge pull request #657 from facchinm/serial_cdc_inherit_hardwarserial
Make SerialCDC inherit from HardwareSerial
2 parents 86d2463 + 7e2d627 commit dc99cd2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cores/arduino/USB/CDC.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void Serial_::begin(uint32_t /* baud_count */)
201201
// uart config is ignored in USB-CDC
202202
}
203203

204-
void Serial_::begin(uint32_t /* baud_count */, uint8_t /* config */)
204+
void Serial_::begin(uint32_t /* baud_count */, uint16_t /* config */)
205205
{
206206
// uart config is ignored in USB-CDC
207207
}

cores/arduino/USB/USBAPI.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "Arduino.h"
3333
#include "api/Stream.h"
3434
#include "api/RingBuffer.h"
35+
#include "api/HardwareSerial.h"
3536
#include "api/USBAPI.h"
3637
#include "CDC.h"
3738

@@ -96,12 +97,12 @@ extern USBDeviceClass USBDevice;
9697
//================================================================================
9798
// Serial over CDC (Serial1 is the physical port)
9899

99-
class Serial_ : public arduino::Stream, public arduino::PluggableUSBModule
100+
class Serial_ : public arduino::HardwareSerial, arduino::PluggableUSBModule
100101
{
101102
public:
102103
Serial_(USBDeviceClass &_usb);
103104
void begin(uint32_t baud_count);
104-
void begin(unsigned long, uint8_t);
105+
void begin(unsigned long, uint16_t);
105106
void end(void);
106107

107108
virtual int available(void);

0 commit comments

Comments
 (0)