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

Merge branch 'master' into HEAD

This commit is contained in:
Cristian Maglie 2014-05-30 10:54:14 +02:00
parent 36331fa1c9 6914af0d63
commit 82fe44d76d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/cores/arduino/CDC.cpp
View File

@ -129,7 +129,7 @@ void Serial_::end(void)
int Serial_::available(void) int Serial_::available(void)
{ {
if (peek_buffer >= 0) { if (peek_buffer >= 0) {
return 1; return 1 + USB_Available(CDC_RX);
} }
return USB_Available(CDC_RX); return USB_Available(CDC_RX);
} }