From 1162a45fa853d59e15a50f72ce58b5f4795b4e06 Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Mon, 2 Sep 2013 18:58:28 +0100 Subject: [PATCH 1/2] USB serial baud arg type Make USB Serial_::begin() function take an unsigned long argument for consistency with HardwareSerial. Signed-off-by: Paul Brook --- hardware/arduino/cores/arduino/CDC.cpp | 2 +- hardware/arduino/cores/arduino/USBAPI.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hardware/arduino/cores/arduino/CDC.cpp b/hardware/arduino/cores/arduino/CDC.cpp index 701e48398..53f86f801 100644 --- a/hardware/arduino/cores/arduino/CDC.cpp +++ b/hardware/arduino/cores/arduino/CDC.cpp @@ -130,7 +130,7 @@ bool WEAK CDC_Setup(Setup& setup) int _serialPeek = -1; -void Serial_::begin(uint16_t baud_count) +void Serial_::begin(unsigned long baud_count) { } diff --git a/hardware/arduino/cores/arduino/USBAPI.h b/hardware/arduino/cores/arduino/USBAPI.h index eb2e5937d..d138a0efd 100644 --- a/hardware/arduino/cores/arduino/USBAPI.h +++ b/hardware/arduino/cores/arduino/USBAPI.h @@ -30,7 +30,7 @@ class Serial_ : public Stream private: ring_buffer *_cdc_rx_buffer; public: - void begin(uint16_t baud_count); + void begin(unsigned long); void end(void); virtual int available(void); @@ -193,4 +193,4 @@ void USB_Flush(uint8_t ep); #endif -#endif /* if defined(USBCON) */ \ No newline at end of file +#endif /* if defined(USBCON) */ From f53fcdd25456b0a3946ab84761590b3f9a404b97 Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Mon, 2 Sep 2013 19:15:12 +0100 Subject: [PATCH 2/2] USB CDC two argument begin() Add two argument form of Serial_::begin Signed-off-by: Paul Brook --- hardware/arduino/cores/arduino/CDC.cpp | 4 ++++ hardware/arduino/cores/arduino/USBAPI.h | 1 + 2 files changed, 5 insertions(+) diff --git a/hardware/arduino/cores/arduino/CDC.cpp b/hardware/arduino/cores/arduino/CDC.cpp index 53f86f801..e1e859d18 100644 --- a/hardware/arduino/cores/arduino/CDC.cpp +++ b/hardware/arduino/cores/arduino/CDC.cpp @@ -134,6 +134,10 @@ void Serial_::begin(unsigned long baud_count) { } +void Serial_::begin(unsigned long baud_count, byte config) +{ +} + void Serial_::end(void) { } diff --git a/hardware/arduino/cores/arduino/USBAPI.h b/hardware/arduino/cores/arduino/USBAPI.h index d138a0efd..7a14285db 100644 --- a/hardware/arduino/cores/arduino/USBAPI.h +++ b/hardware/arduino/cores/arduino/USBAPI.h @@ -31,6 +31,7 @@ private: ring_buffer *_cdc_rx_buffer; public: void begin(unsigned long); + void begin(unsigned long, uint8_t); void end(void); virtual int available(void);