noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ide-1.5.x

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

6
cores/arduino/CDC.cpp
View File

@ -115,7 +115,11 @@ bool WEAK CDC_Setup(Setup& setup)
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
cores/arduino/USBAPI.h
View File

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