mgillespie/TinyGSM_EC25
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement connect with timeout, XBee improvements

Browse Source
This commit is contained in:
Sara Damiano
2019-05-20 09:21:08 -04:00
parent 96c1fed3ef
commit 4ba8306880
14 changed files with 275 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/TinyGsmClientSIM7000.h
View File

@@ -76,15 +76,15 @@ public:
}
public:
virtual int connect(const char *host, uint16_t port) {
virtual int connect(const char *host, uint16_t port, int timeout) {
stop();
TINY_GSM_YIELD();
rx.clear();
sock_connected = at->modemConnect(host, port, mux);
sock_connected = at->modemConnect(host, port, mux, timeout);
return sock_connected;
}
TINY_GSM_CLIENT_CONNECT_TO_IP()
TINY_GSM_CLIENT_CONNECT_OVERLOADS()
virtual void stop() {
TINY_GSM_YIELD();
@@ -140,11 +140,11 @@ public:
{}
public:
virtual int connect(const char *host, uint16_t port) {
virtual int connect(const char *host, uint16_t port, int timeout) {
stop();
TINY_GSM_YIELD();
rx.clear();
sock_connected = at->modemConnect(host, port, mux, true);
sock_connected = at->modemConnect(host, port, mux, true, timeout);
return sock_connected;
}
};
@@ -760,10 +760,12 @@ TINY_GSM_MODEM_WAIT_FOR_NETWORK()
protected:
bool modemConnect(const char* host, uint16_t port, uint8_t mux, bool ssl = false) {
bool modemConnect(const char* host, uint16_t port, uint8_t mux,
bool ssl = false, int timeout = 75000L)
{
int rsp;
sendAT(GF("+CIPSTART="), mux, ',', GF("\"TCP"), GF("\",\""), host, GF("\","), port);
rsp = waitResponse(75000L,
rsp = waitResponse(timeout,
GF("CONNECT OK" GSM_NL),
GF("CONNECT FAIL" GSM_NL),
GF("ALREADY CONNECT" GSM_NL),