aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/CDC.cpp
diff options
context:
space:
mode:
authorFede85 <f.vanzati@gmail.com>2013-10-10 20:59:01 +0200
committerFede85 <f.vanzati@gmail.com>2013-10-10 20:59:01 +0200
commit295043ddbf4db9131f541a5c4caec9f5f07a9aae (patch)
tree86badfca61eb565eb5a8094152299d461aff5b42 /cores/arduino/CDC.cpp
parent8c7c1c75fe8cc269ffa6d9cc6676b5bb33bb47d5 (diff)
parentd27087455d338fcffe0719c14d87f18268a085db (diff)
Merge remote-tracking branch 'origin/ide-1.5.x' into ide-1.5.x
Diffstat (limited to 'cores/arduino/CDC.cpp')
-rw-r--r--cores/arduino/CDC.cpp6
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)
{
}