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

Must writeChanges or the XBee can't connect!

Browse Source
This commit is contained in:
Sara Damiano
2019-05-30 16:48:01 -04:00
parent 9fd4a52bc3
commit e7fc1b44eb
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/TinyGsmClientXBee.h
View File

@@ -864,32 +864,37 @@ protected:
bool modemConnect(IPAddress ip, uint16_t port, uint8_t mux = 0, bool ssl = false, int timeout_s = 75) {
savedIP = ip; // Set the newly requested IP address
bool success = true;
uint32_t timeout_ms = ((uint32_t)timeout_s)*1000;
XBEE_COMMAND_START_DECORATOR(5, false)
String host; host.reserve(16);
host += ip[0];
host += ".";
host += ip[1];
host += ".";
host += ip[2];
host += ".";
host += ip[3];
if (ssl) {
sendAT(GF("IP"), 4); // Put in SSL over TCP communication mode
if (ip != savedIP) { // Can skip almost everything if there's no change in the IP address
savedIP = ip; // Set the newly requested IP address
String host; host.reserve(16);
host += ip[0];
host += ".";
host += ip[1];
host += ".";
host += ip[2];
host += ".";
host += ip[3];
if (ssl) {
sendAT(GF("IP"), 4); // Put in SSL over TCP communication mode
success &= (1 == waitResponse());
} else {
sendAT(GF("IP"), 1); // Put in TCP mode
success &= (1 == waitResponse());
}
sendAT(GF("DL"), host); // Set the "Destination Address Low"
success &= (1 == waitResponse());
} else {
sendAT(GF("IP"), 1); // Put in TCP mode
sendAT(GF("DE"), String(port, HEX)); // Set the destination port
success &= (1 == waitResponse());
success &= writeChanges();
}
sendAT(GF("DL"), host); // Set the "Destination Address Low"
success &= (1 == waitResponse());
sendAT(GF("DE"), String(port, HEX)); // Set the destination port
success &= (1 == waitResponse());
for (unsigned long start = millis(); millis() - start < timeout_ms; ) {
if (modemGetConnected()) {
sockets[mux]->sock_connected = true;

2
src/TinyGsmCommon.h
View File

@@ -10,7 +10,7 @@
#define TinyGsmCommon_h
// The current library version number
#define TINYGSM_VERSION "0.7.9"
#define TINYGSM_VERSION "0.7.10"
#if defined(SPARK) || defined(PARTICLE)
#include "Particle.h"