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

Removed call to modemGetConnected from connect

Browse Source
This commit is contained in:
Sara Damiano
2019-01-31 18:20:28 -05:00
parent aa15daaa66
commit bdfa2ba55c
1 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/TinyGsmClientXBee.h
View File

@@ -81,37 +81,26 @@ public:
// NOTE: The XBee saves all paramter information in flash. When you turn it // NOTE: The XBee saves all paramter information in flash. When you turn it
// on it immediately begins to re-connect to whatever was last connected to. // on it immediately begins to re-connect to whatever was last connected to.
// All the modemConnect() function does is tell it the paramters to put into // All the modemConnect() function does is tell it the paramters to put into
// flash. The connection itself happens automatically after that. // flash. The connection itself is not opened until you attempt to send data.
// Because everything is saved, it is possible (or likely) that you will be // Because all settings are saved to flash, it is possible (or likely) that
// connected even if you haven't "made" any connection // you could send out data even if you haven't "made" any connection.
virtual int connect(const char *host, uint16_t port) { virtual int connect(const char *host, uint16_t port) {
at->streamClear(); // Empty anything in the buffer before starting at->streamClear(); // Empty anything in the buffer before starting
if (at->commandMode()) { // Don't try if we didn't successfully get into command mode if (at->commandMode()) { // Don't try if we didn't successfully get into command mode
at->modemConnect(host, port, mux, false); sock_connected = at->modemConnect(host, port, mux, false);
at->writeChanges(); at->writeChanges();
at->exitCommand(); at->exitCommand();
} }
// After setting connection information, wait until we're at least not defintiely disconnected
uint32_t _startMillis = millis();
while (millis() - _startMillis < 10000 && !sock_connected) {
sock_connected = at->modemGetConnected();
if (at->savedIP == IPAddress(0,0,0,0)) break; // if we never got an IP, give up
}
return sock_connected; return sock_connected;
} }
virtual int connect(IPAddress ip, uint16_t port) { virtual int connect(IPAddress ip, uint16_t port) {
at->streamClear(); // Empty anything in the buffer before starting at->streamClear(); // Empty anything in the buffer before starting
if (at->commandMode()) { // Don't try if we didn't successfully get into command mode if (at->commandMode()) { // Don't try if we didn't successfully get into command mode
at->modemConnect(ip, port, mux, false); sock_connected = at->modemConnect(ip, port, mux, false);
at->writeChanges(); at->writeChanges();
at->exitCommand(); at->exitCommand();
} }
// After setting connection information, wait until we're at least not defintiely disconnected
uint32_t _startMillis = millis();
while (millis() - _startMillis < 10000 && !sock_connected) {
sock_connected = at->modemGetConnected();
}
return sock_connected; return sock_connected;
} }
@@ -245,31 +234,20 @@ public:
virtual int connect(const char *host, uint16_t port) { virtual int connect(const char *host, uint16_t port) {
at->streamClear(); // Empty anything in the buffer before starting at->streamClear(); // Empty anything in the buffer before starting
if (at->commandMode()) { // Don't try if we didn't successfully get into command mode if (at->commandMode()) { // Don't try if we didn't successfully get into command mode
at->modemConnect(host, port, mux, true); sock_connected = at->modemConnect(host, port, mux, true);
at->writeChanges(); at->writeChanges();
at->exitCommand(); at->exitCommand();
} }
// After setting connection information, wait until we're at least not defintiely disconnected
uint32_t _startMillis = millis();
while (millis() - _startMillis < 10000 && !sock_connected) {
sock_connected = at->modemGetConnected();
if (at->savedIP == IPAddress(0,0,0,0)) break; // if we never got an IP, give up
}
return sock_connected; return sock_connected;
} }
virtual int connect(IPAddress ip, uint16_t port) { virtual int connect(IPAddress ip, uint16_t port) {
at->streamClear(); // Empty anything in the buffer before starting at->streamClear(); // Empty anything in the buffer before starting
if (at->commandMode()) { // Don't try if we didn't successfully get into command mode if (at->commandMode()) { // Don't try if we didn't successfully get into command mode
at->modemConnect(ip, port, mux, false); sock_connected = at->modemConnect(ip, port, mux, false);
at->writeChanges(); at->writeChanges();
at->exitCommand(); at->exitCommand();
} }
// After setting connection information, wait until we're at least not defintiely disconnected
uint32_t _startMillis = millis();
while (millis() - _startMillis < 10000 && !sock_connected) {
sock_connected = at->modemGetConnected();
}
return sock_connected; return sock_connected;
} }
}; };