KevinMidboe/TinyGSM
1
0
Fork 0
mirror of https://github.com/KevinMidboe/TinyGSM.git synced 2025-10-29 18:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that ALL variants of read respect timeout

Browse Source
This commit is contained in:
Sara Damiano
2019-05-20 13:12:09 -04:00
parent b96c866bad
commit 7f7a7563cf
12 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/TinyGsmClientSIM7000.h
View File

@@ -9,7 +9,7 @@
#ifndef TinyGsmClientSIM7000_h
#define TinyGsmClientSIM7000_h
#define TINY_GSM_DEBUG Serial
// #define TINY_GSM_DEBUG Serial
//#define TINY_GSM_USE_HEX
#if !defined(TINY_GSM_RX_BUFFER)
@@ -815,14 +815,15 @@ protected:
// 0 indicates that no data can be read.
for (size_t i=0; i<TinyGsmMin(len_confirmed, len_requested) ; i++) {
uint32_t startMillis = millis();
#ifdef TINY_GSM_USE_HEX
while (stream.available() < 2) { TINY_GSM_YIELD(); }
while (stream.available() < 2 && (millis() - startMillis < sockets[mux]->_timeout)) { TINY_GSM_YIELD(); }
char buf[4] = { 0, };
buf[0] = stream.read();
buf[1] = stream.read();
char c = strtol(buf, NULL, 16);
#else
while (!stream.available()) { TINY_GSM_YIELD(); }
while (!stream.available() && (millis() - startMillis < sockets[mux]->_timeout)) { TINY_GSM_YIELD(); }
char c = stream.read();
#endif
sockets[mux]->rx.put(c);