diff options
author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-16 10:27:11 -0400 |
---|---|---|
committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-09-16 10:27:11 -0400 |
commit | 983cfc058ed33d8d5182ecaba78fb99ed49a4d71 (patch) | |
tree | 11b5d12215a201b2a25705d2d531e8b8a9d5a065 /cores/arduino/Stream.h | |
parent | d0b0f3e45d5c4cf3a7fbcf5832c5e6cc764016e0 (diff) | |
parent | 023ea285e151a41725b5c072dbf1d7afd09ce966 (diff) |
Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
Diffstat (limited to 'cores/arduino/Stream.h')
-rw-r--r-- | cores/arduino/Stream.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cores/arduino/Stream.h b/cores/arduino/Stream.h index 1633f15..3c6d025 100644 --- a/cores/arduino/Stream.h +++ b/cores/arduino/Stream.h @@ -41,7 +41,8 @@ class Stream : public Print long _timeout; // number of milliseconds to wait for the next char before aborting timed read long _startMillis; // used for timeout measurement int timedRead(); // private method to read stream with timeout - int getNextDigit(); // returns the next numeric digit in the stream or -1 if timeout + int timedPeek(); // private method to peek stream with timeout + int peekNextDigit(); // returns the next numeric digit in the stream or -1 if timeout public: virtual int available() = 0; |