rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-06 01:08:25 +01:00
Code Issues Releases Activity

Merge branch 'master' into ide-1.5.x

Browse Source
This commit is contained in:
Cristian Maglie 2013-09-30 16:25:10 +02:00
commit dc86455097
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,11 @@ bool WEAK CDC_Setup(Setup& setup)
int _serialPeek = -1; int _serialPeek = -1;
void Serial_::begin(uint16_t baud_count) void Serial_::begin(unsigned long baud_count)
{
}
void Serial_::begin(unsigned long baud_count, byte config)
{ {
} }

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

@ -36,7 +36,8 @@ struct ring_buffer;
class Serial_ : public Stream class Serial_ : public Stream
{ {
public: public:
void begin(uint16_t baud_count); void begin(unsigned long);
void begin(unsigned long, uint8_t);
void end(void); void end(void);
virtual int available(void); virtual int available(void);