arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Do not call yield() from timedRead() or timedPeek() when _timeout is set to 0. (#6242)

Browse Source
This commit is contained in:
M Hightower 2019-07-05 04:36:46 -07:00 committed by david gauchard
parent 4bfa2ae889
commit ad2b51e36f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cores/esp8266/Stream.cpp
View File

@ -33,6 +33,8 @@ int Stream::timedRead() {
c = read(); c = read();
if(c >= 0) if(c >= 0)
return c; return c;
if(_timeout == 0)
return -1;
yield(); yield();
} while(millis() - _startMillis < _timeout); } while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout return -1; // -1 indicates timeout
@ -46,6 +48,8 @@ int Stream::timedPeek() {
c = peek(); c = peek();
if(c >= 0) if(c >= 0)
return c; return c;
if(_timeout == 0)
return -1;
yield(); yield();
} while(millis() - _startMillis < _timeout); } while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout return -1; // -1 indicates timeout
@ -254,4 +258,3 @@ String Stream::readStringUntil(char terminator) {
} }
return ret; return ret;
} }