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

check if async is supported

Browse Source 
Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
This commit is contained in:
Sara Damiano
2020-01-10 17:29:47 -05:00
parent bfd6055c46
commit f1dba661b6
1 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/TinyGsmClientSaraR4.h
View File

@@ -94,18 +94,21 @@ TINY_GSM_CLIENT_CONNECT_OVERLOADS()
virtual void stop(uint32_t maxWaitMs) { virtual void stop(uint32_t maxWaitMs) {
TINY_GSM_CLIENT_DUMP_MODEM_BUFFER() TINY_GSM_CLIENT_DUMP_MODEM_BUFFER()
// // synchronous close if (at->supportsAsyncSockets) {
// at->sendAT(GF("+USOCL="), mux); DBG("### Closing socket asynchronously! Socket might remain open until arrival of +UUSOCL: ", mux);
// // NOTE: can take up to 120s to get a response // faster asynchronous close
// at->waitResponse((maxWaitMs - (millis() - startMillis))); // NOT supported on SARA-R404M / SARA-R410M-01B
// sock_connected = false; at->sendAT(GF("+USOCL="), mux, GF(",1"));
// NOTE: can take up to 120s to get a response
// faster asynchronous close at->waitResponse((maxWaitMs - (millis() - startMillis)));
// NOT supported on SARA-R404M / SARA-R410M-01B sock_connected = false;
at->sendAT(GF("+USOCL="), mux, GF(",1")); } else {
// NOTE: can take up to 120s to get a response // synchronous close
at->waitResponse((maxWaitMs - (millis() - startMillis))); at->sendAT(GF("+USOCL="), mux);
sock_connected = false; // NOTE: can take up to 120s to get a response
at->waitResponse((maxWaitMs - (millis() - startMillis)));
sock_connected = false;
}
} }
virtual void stop() { stop(135000L); } virtual void stop() { stop(135000L); }
@@ -206,6 +209,12 @@ public:
} else { } else {
has2GFallback = false; has2GFallback = false;
} }
if (modemName.startsWith("u-blox SARA-R404M") ||
modemName.startsWith("u-blox SARA-R410M-01B")) {
supportsAsyncSockets = false;
} else {
supportsAsyncSockets = true;
}
int ret = getSimStatus(); int ret = getSimStatus();
// if the sim isn't ready and a pin has been provided, try to unlock the sim // if the sim isn't ready and a pin has been provided, try to unlock the sim
@@ -591,8 +600,11 @@ protected:
} }
// Enable NODELAY // Enable NODELAY
sendAT(GF("+USOSO="), *mux, GF(",6,1,1")); // AT+USOSO=<socket>,<level>,<opt_name>,<opt_val>[,<opt_val2>]
waitResponse(); // <level> - 0 for IP, 6 for TCP, 65535 for socket level options
// <opt_name> TCP/1 = no delay (do not delay send to coalesce packets)
// sendAT(GF("+USOSO="), *mux, GF(",6,1,1"));
// waitResponse();
// Enable KEEPALIVE, 30 sec // Enable KEEPALIVE, 30 sec
// sendAT(GF("+USOSO="), *mux, GF(",6,2,30000")); // sendAT(GF("+USOSO="), *mux, GF(",6,2,30000"));
@@ -606,16 +618,21 @@ protected:
// has a nasty habit of locking up when opening a socket, especially if // has a nasty habit of locking up when opening a socket, especially if
// the cellular service is poor. // the cellular service is poor.
// NOT supported on SARA-R404M / SARA-R410M-01B // NOT supported on SARA-R404M / SARA-R410M-01B
sendAT(GF("+USOCO="), *mux, ",\"", host, "\",", port, ",1"); if (supportsAsyncSockets) {
waitResponse(timeout_ms, GF(GSM_NL "+UUSOCO: ")); DBG("### Opening socket asynchronously! Socket cannot be used until "
stream.readStringUntil(',').toInt(); // skip repeated mux "arrival of +UUSOCO: ",
int connection_status = stream.readStringUntil('\n').toInt(); mux);
return (0 == connection_status); sendAT(GF("+USOCO="), *mux, ",\"", host, "\",", port, ",1");
waitResponse(timeout_ms, GF(GSM_NL "+UUSOCO: "));
// use synchronous open stream.readStringUntil(',').toInt(); // skip repeated mux
// sendAT(GF("+USOCO="), *mux, ",\"", host, "\",", port, ",0"); int connection_status = stream.readStringUntil('\n').toInt();
// int rsp = waitResponse(timeout_ms); return (0 == connection_status);
// return (1 == rsp); } else {
// use synchronous open
sendAT(GF("+USOCO="), *mux, ",\"", host, "\",", port);
int rsp = waitResponse(timeout_ms);
return (1 == rsp);
}
} }
int16_t modemSend(const void* buff, size_t len, uint8_t mux) { int16_t modemSend(const void* buff, size_t len, uint8_t mux) {
@@ -764,6 +781,13 @@ TINY_GSM_MODEM_STREAM_UTILITIES()
} }
data = ""; data = "";
DBG("### URC Sock Closed: ", mux); DBG("### URC Sock Closed: ", mux);
} else if (data.endsWith(GF("+UUSOCO:"))) {
int mux = stream.readStringUntil('\n').toInt();
if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) {
sockets[mux]->sock_connected = true;
}
data = "";
DBG("### URC Sock Opened: ", mux);
} }
} }
} while (millis() - startMillis < timeout_ms); } while (millis() - startMillis < timeout_ms);
@@ -802,6 +826,7 @@ public:
protected: protected:
GsmClient* sockets[TINY_GSM_MUX_COUNT]; GsmClient* sockets[TINY_GSM_MUX_COUNT];
bool has2GFallback; bool has2GFallback;
bool supportsAsyncSockets;
}; };
#endif #endif