Skip to content

From Stream do not call yield() when _timeout is 0. #6242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 5, 2019
Merged

From Stream do not call yield() when _timeout is 0. #6242

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
298de83
Do not call yield() from timedRead() or timedPeek() when _timeout is …
mhightower83 Jun 28, 2019
675c58a
Merge branch 'master' into pr2
devyte Jul 5, 2019
4ab0260
Merge branch 'master' into pr2
d-a-v Jul 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cores/esp8266/Stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ int Stream::timedRead() {
c = read();
if(c >= 0)
return c;
if(_timeout == 0)
return -1;
yield();
} while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout
Expand All @@ -46,6 +48,8 @@ int Stream::timedPeek() {
c = peek();
if(c >= 0)
return c;
if(_timeout == 0)
return -1;
yield();
} while(millis() - _startMillis < _timeout);
return -1; // -1 indicates timeout
Expand Down Expand Up @@ -254,4 +258,3 @@ String Stream::readStringUntil(char terminator) {
}
return ret;
}