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

Add stop with timeout and implement where applicable

Browse Source
This commit is contained in:
Sara Damiano
2019-06-11 16:00:35 -04:00
parent 0502ee435f
commit 86356f5323
13 changed files with 76 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/TinyGsmClientSaraR4.h
View File

@@ -91,23 +91,15 @@ public:
TINY_GSM_CLIENT_CONNECT_OVERLOADS()
virtual void stop() {
TINY_GSM_YIELD();
// Read and dump anything remaining in the modem's internal buffer.
// The socket will appear open in response to connected() even after it
// closes until all data is read from the buffer.
// Doing it this way allows the external mcu to find and get all of the data
// that it wants from the socket even if it was closed externally.
rx.clear();
at->maintain();
while (sock_connected && sock_available > 0) {
at->modemRead(TinyGsmMin((uint16_t)rx.free(), sock_available), mux);
rx.clear();
at->maintain();
}
at->modemDisconnect(mux);
virtual void stop(uint32_t maxWaitMs) {
TINY_GSM_CLIENT_DUMP_MODEM_BUFFER()
at->sendAT(GF("+USOCL="), mux);
at->waitResponse((maxWaitMs - (millis() - startMillis))); // NOTE: can take up to 120s to get a response
sock_connected = false;
}
virtual void stop() { stop(135000L); }
TINY_GSM_CLIENT_WRITE()
TINY_GSM_CLIENT_AVAILABLE_WITH_BUFFER_CHECK()
@@ -569,21 +561,6 @@ protected:
return (1 == rsp);
}
bool modemDisconnect(uint8_t mux) {
TINY_GSM_YIELD();
if (!modemGetConnected(mux)) {
sockets[mux]->sock_connected = false;
return true;
}
bool success;
sendAT(GF("+USOCL="), mux);
success = 1 == waitResponse(120000L); // can take up to 120s to get a response
if (success) {
sockets[mux]->sock_connected = false;
}
return success;
}
int16_t modemSend(const void* buff, size_t len, uint8_t mux) {
sendAT(GF("+USOWR="), mux, ',', len);
if (waitResponse(GF("@")) != 1) {