diff options
author | Fede85 <f.vanzati@gmail.com> | 2013-10-10 20:59:01 +0200 |
---|---|---|
committer | Fede85 <f.vanzati@gmail.com> | 2013-10-10 20:59:01 +0200 |
commit | 295043ddbf4db9131f541a5c4caec9f5f07a9aae (patch) | |
tree | 86badfca61eb565eb5a8094152299d461aff5b42 /cores/arduino/USBAPI.h | |
parent | 8c7c1c75fe8cc269ffa6d9cc6676b5bb33bb47d5 (diff) | |
parent | d27087455d338fcffe0719c14d87f18268a085db (diff) |
Merge remote-tracking branch 'origin/ide-1.5.x' into ide-1.5.x
Diffstat (limited to 'cores/arduino/USBAPI.h')
-rw-r--r-- | cores/arduino/USBAPI.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h index cabecf3..da2e869 100644 --- a/cores/arduino/USBAPI.h +++ b/cores/arduino/USBAPI.h @@ -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); |