rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Merge branch 'master' into ide-1.5.x

Browse Source
This commit is contained in:
Cristian Maglie 2014-06-19 17:01:53 +02:00
commit 1a305cdc45
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/cores/arduino/CDC.cpp
View File

@ -116,10 +116,12 @@ bool WEAK CDC_Setup(Setup& setup)
void Serial_::begin(unsigned long /* baud_count */) void Serial_::begin(unsigned long /* baud_count */)
{ {
peek_buffer = -1;
} }
void Serial_::begin(unsigned long /* baud_count */, byte /* config */) void Serial_::begin(unsigned long /* baud_count */, byte /* config */)
{ {
peek_buffer = -1;
} }
void Serial_::end(void) void Serial_::end(void)

3
hardware/arduino/avr/cores/arduino/USBAPI.h
View File

@ -36,8 +36,9 @@ struct ring_buffer;
class Serial_ : public Stream class Serial_ : public Stream
{ {
private: private:
int peek_buffer = -1; int peek_buffer;
public: public:
Serial_() { peek_buffer = -1; };
void begin(unsigned long); void begin(unsigned long);
void begin(unsigned long, uint8_t); void begin(unsigned long, uint8_t);
void end(void); void end(void);