aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2014-06-19 16:52:48 +0200
committerCristian Maglie <c.maglie@bug.st>2014-06-19 16:52:48 +0200
commitf599d519967a938a407ad0daa6c39182f389ef91 (patch)
treee967951304164bffb990555d72ce437d137f1feb /cores/arduino
parent12219b37d5f4569649cd4dac247fbfcee5dfb79b (diff)
Fixed regression in USBAPI and CDC (xaljox)
See: https://github.com/arduino/Arduino/commit/9ac7e30252fce5b9dafde3288519b020b73c37bd#commitcomment-6718676
Diffstat (limited to 'cores/arduino')
-rw-r--r--cores/arduino/CDC.cpp2
-rw-r--r--cores/arduino/USBAPI.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
index 3cfd1b7..aae91c2 100644
--- a/cores/arduino/CDC.cpp
+++ b/cores/arduino/CDC.cpp
@@ -116,10 +116,12 @@ bool WEAK CDC_Setup(Setup& setup)
void Serial_::begin(unsigned long baud_count)
{
+ peek_buffer = -1;
}
void Serial_::begin(unsigned long baud_count, byte config)
{
+ peek_buffer = -1;
}
void Serial_::end(void)
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h
index 753bc6b..4846fc2 100644
--- a/cores/arduino/USBAPI.h
+++ b/cores/arduino/USBAPI.h
@@ -28,8 +28,9 @@ extern USBDevice_ USBDevice;
class Serial_ : public Stream
{
private:
- int peek_buffer = -1;
+ int peek_buffer;
public:
+ Serial_() { peek_buffer = -1; };
void begin(unsigned long);
void begin(unsigned long, uint8_t);
void end(void);