diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-09-30 16:25:10 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-09-30 16:25:10 +0200 |
| commit | d7ed6ec3617460b5d6677581ddcc948467446f63 (patch) | |
| tree | 05e4946ee42d145a6283197d8f091d9da5e5c873 /cores/arduino/CDC.cpp | |
| parent | acc20676276dd3a59c2f71da87cc8029b9f2a241 (diff) | |
| parent | 0ade989a2d6b8408483902533270435d3cb155a4 (diff) | |
Merge branch 'master' into ide-1.5.x
Diffstat (limited to 'cores/arduino/CDC.cpp')
| -rw-r--r-- | cores/arduino/CDC.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp index fb25a96..a691306 100644 --- a/cores/arduino/CDC.cpp +++ b/cores/arduino/CDC.cpp @@ -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) { } |