JSD/TinyGSM_Senseright
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add timeout to streamSkipUntil

Browse Source
This commit is contained in:
Dawid Cieszynski
2017-11-11 21:11:07 +01:00
parent a51591ae9b
commit 2238b6a05b
5 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/TinyGsmClientA6.h
View File

@@ -644,9 +644,13 @@ public:
streamWrite(tail...); streamWrite(tail...);
} }
bool streamSkipUntil(char c) { //TODO: timeout bool streamSkipUntil(char c) {
while (true) { const unsigned long timeout = 1000L;
while (!stream.available()) { TINY_GSM_YIELD(); } unsigned long startMillis = millis();
while (millis() - startMillis < timeout) {
while (millis() - startMillis < timeout && !stream.available()) {
TINY_GSM_YIELD();
}
if (stream.read() == c) if (stream.read() == c)
return true; return true;
} }

10
src/TinyGsmClientESP8266.h
View File

@@ -412,9 +412,13 @@ public:
streamWrite(tail...); streamWrite(tail...);
} }
bool streamSkipUntil(char c) { //TODO: timeout bool streamSkipUntil(char c) {
while (true) { const unsigned long timeout = 1000L;
while (!stream.available()) { TINY_GSM_YIELD(); } unsigned long startMillis = millis();
while (millis() - startMillis < timeout) {
while (millis() - startMillis < timeout && !stream.available()) {
TINY_GSM_YIELD();
}
if (stream.read() == c) if (stream.read() == c)
return true; return true;
} }

10
src/TinyGsmClientM590.h
View File

@@ -589,9 +589,13 @@ public:
streamWrite(tail...); streamWrite(tail...);
} }
bool streamSkipUntil(char c) { //TODO: timeout bool streamSkipUntil(char c) {
while (true) { const unsigned long timeout = 1000L;
while (!stream.available()) { TINY_GSM_YIELD(); } unsigned long startMillis = millis();
while (millis() - startMillis < timeout) {
while (millis() - startMillis < timeout && !stream.available()) {
TINY_GSM_YIELD();
}
if (stream.read() == c) if (stream.read() == c)
return true; return true;
} }

10
src/TinyGsmClientSIM800.h
View File

@@ -837,9 +837,13 @@ public:
streamWrite(tail...); streamWrite(tail...);
} }
bool streamSkipUntil(char c) { //TODO: timeout bool streamSkipUntil(char c) {
while (true) { const unsigned long timeout = 1000L;
while (!stream.available()) { TINY_GSM_YIELD(); } unsigned long startMillis = millis();
while (millis() - startMillis < timeout) {
while (millis() - startMillis < timeout && !stream.available()) {
TINY_GSM_YIELD();
}
if (stream.read() == c) if (stream.read() == c)
return true; return true;
} }

10
src/TinyGsmClientU201.h
View File

@@ -606,9 +606,13 @@ public:
streamWrite(tail...); streamWrite(tail...);
} }
bool streamSkipUntil(char c) { //TODO: timeout bool streamSkipUntil(char c) {
while (true) { const unsigned long timeout = 1000L;
while (!stream.available()) { TINY_GSM_YIELD(); } unsigned long startMillis = millis();
while (millis() - startMillis < timeout) {
while (millis() - startMillis < timeout && !stream.available()) {
TINY_GSM_YIELD();
}
if (stream.read() == c) if (stream.read() == c)
return true; return true;
} }