diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2014-05-30 10:54:14 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2014-05-30 10:54:14 +0200 |
| commit | 8bef5cdf0392f6a3a13e0f8ead92efeebfcf5aac (patch) | |
| tree | d6f97f073165b37d40d932f76535717824eb9878 | |
| parent | 2fd1c5b42898b8844a4e6ccea1be9f758e956bc7 (diff) | |
| parent | 29b0b63d1c7d90e9c2559d110993c825ec1f5fa4 (diff) | |
Merge branch 'master' into HEAD
| -rw-r--r-- | cores/arduino/CDC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp index 9999ca8..1797ed6 100644 --- a/cores/arduino/CDC.cpp +++ b/cores/arduino/CDC.cpp @@ -129,7 +129,7 @@ void Serial_::end(void) int Serial_::available(void) { if (peek_buffer >= 0) { - return 1; + return 1 + USB_Available(CDC_RX); } return USB_Available(CDC_RX); } |