mirror of https://github.com/noisymime/Arduino.git
Merge branch 'master' into ide-1.5.x
This commit is contained in:
commit
1a305cdc45
|
@ -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)
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue