1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00

Merge branch 'master' into HEAD

This commit is contained in:
Cristian Maglie
2014-05-30 10:54:14 +02:00

View File

@ -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);
}