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

Some improvements to sim7000

Browse Source
This commit is contained in:
Francesco Stefanni
2021-03-17 14:27:43 +01:00
parent 57895868f2
commit b8a54d37e0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/TinyGsmClientSIM7000.h
View File

@@ -101,7 +101,7 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
dumpModemBuffer(maxWaitMs); dumpModemBuffer(maxWaitMs);
at->sendAT(GF("+CACLOSE="), mux); at->sendAT(GF("+CACLOSE="), mux);
sock_connected = false; sock_connected = false;
at->waitResponse(); at->waitResponse(3000);
} }
void stop() override { void stop() override {
stop(15000L); stop(15000L);
@@ -614,7 +614,14 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
sockets[mux]->sock_available = 0; sockets[mux]->sock_available = 0;
return 0; return 0;
} }
/*
stream.read();
if (stream.peek() == '0') {
waitResponse();
sockets[mux]->sock_available = 0;
return 0;
}
*/
const int16_t len_confirmed = streamGetIntBefore(','); const int16_t len_confirmed = streamGetIntBefore(',');
if (len_confirmed <= 0) { if (len_confirmed <= 0) {
sockets[mux]->sock_available = 0; sockets[mux]->sock_available = 0;
@@ -669,7 +676,9 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
sendAT(GF("+CASTATE?")); sendAT(GF("+CASTATE?"));
int8_t readMux = -1; int8_t readMux = -1;
while (readMux != mux) { while (readMux != mux) {
if (waitResponse(GF("+CASTATE:")) != 1) return 0; if (waitResponse(GF("+CASTATE:"),GF(GSM_OK)) != 1) {
return 0;
}
readMux = streamGetIntBefore(','); readMux = streamGetIntBefore(',');
} }
int8_t res = streamGetIntBefore('\n'); int8_t res = streamGetIntBefore('\n');