diff options
| author | Federico Fissore <f.fissore@arduino.cc> | 2013-05-13 16:58:10 +0200 |
|---|---|---|
| committer | Federico Fissore <f.fissore@arduino.cc> | 2013-05-13 16:58:10 +0200 |
| commit | b70954ea256f94afdd941e2c89a086887b496c13 (patch) | |
| tree | bd9fb74f61b1351a32b8b48cef8f04863d9d6df8 /cores/arduino/Stream.h | |
| parent | c48c0f9e2cebe0e3ebda7aa5c4f9096b9586ed9e (diff) | |
| parent | 7207108255a772474b322151cb0fd113e8030afe (diff) | |
Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery
Diffstat (limited to 'cores/arduino/Stream.h')
| -rw-r--r-- | cores/arduino/Stream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/Stream.h b/cores/arduino/Stream.h index 58bbf75..007b4bc 100644 --- a/cores/arduino/Stream.h +++ b/cores/arduino/Stream.h @@ -37,7 +37,7 @@ readBytesBetween( pre_string, terminator, buffer, length) class Stream : public Print { - private: + protected: unsigned long _timeout; // number of milliseconds to wait for the next char before aborting timed read unsigned long _startMillis; // used for timeout measurement int timedRead(); // private method to read stream with timeout |