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

Merge pull request #2 from EnviroDIY/UDP2

Browse Source 
Cleaned up debugging
This commit is contained in:
Sara Damiano
2017-05-04 16:08:34 -04:00
committed by GitHub
parent f84789a49b d06031a89c
commit 9cab85e167
3 changed files with 76 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
TinyGsmClientA6.h
View File

@@ -441,6 +441,9 @@ public:
String r5s(r5); r5s.trim(); String r5s(r5); r5s.trim();
DBG("### ..:", r1s, ",", r2s, ",", r3s, ",", r4s, ",", r5s);*/ DBG("### ..:", r1s, ",", r2s, ",", r3s, ",", r4s, ",", r5s);*/
data.reserve(64); data.reserve(64);
bool gotData = false;
int mux = -1;
int len = 0;
int index = 0; int index = 0;
unsigned long startMillis = millis(); unsigned long startMillis = millis();
do { do {
@@ -465,24 +468,24 @@ public:
index = 5; index = 5;
goto finish; goto finish;
} else if (data.endsWith(GF("+CIPRCV:"))) { } else if (data.endsWith(GF("+CIPRCV:"))) {
int mux = streamReadUntil(',').toInt(); mux = stream.readStringUntil(',').toInt();
int len = streamReadUntil(',').toInt(); data += mux;
if (len > sockets[mux]->rx.free()) { data += (',');
DBG("### Buffer overflow: ", len, "->", sockets[mux]->rx.free()); len = stream.readStringUntil(',').toInt();
} else { data += len;
DBG("### Got: ", len, "->", sockets[mux]->rx.free()); data += (',');
} gotData = true;
while (len--) { index = 6;
while (!stream.available()) {} goto finish;
sockets[mux]->rx.put(stream.read());
}
data = "";
return index;
} else if (data.endsWith(GF("+TCPCLOSED:"))) { } else if (data.endsWith(GF("+TCPCLOSED:"))) {
int mux = streamReadUntil(',').toInt(); mux = stream.readStringUntil(',').toInt();
streamReadUntil('\n'); data += mux;
data += (',');
String concl = stream.readStringUntil('\n');
data += concl;
sockets[mux]->sock_connected = false; sockets[mux]->sock_connected = false;
data = ""; index = 7;
goto finish;
} }
} }
} while (millis() - startMillis < timeout); } while (millis() - startMillis < timeout);
@@ -492,7 +495,6 @@ public:
if (data.length()) { if (data.length()) {
DBG("### Unhandled:", data); DBG("### Unhandled:", data);
} }
data = "";
} }
else { else {
data.trim(); data.trim();
@@ -501,7 +503,23 @@ public:
if (data.length()) { if (data.length()) {
DBG(GSM_NL, "<<< ", data); DBG(GSM_NL, "<<< ", data);
} }
data = ""; }
if (gotData) {
int len_orig = len;
if (len > sockets[mux]->rx.free()) {
DBG(GSM_NL, "### Buffer overflow: ", len, "->", sockets[mux]->rx.free());
} else {
DBG(GSM_NL, "### Got: ", len, "->", sockets[mux]->rx.free());
}
while (len--) {
char c[2] = {0};
stream.readBytes(c, 1); // readBytes includes a timeout
if(c[0]) sockets[mux]->rx.put(c[0]);
// DBG(GSM_NL, c[0], " ", len, " ", stream.available(), " ", sockets[mux]->available());
}
if (len_orig > sockets[mux]->available()) {
DBG(GSM_NL, "### Fewer characters received than expected: ", len_orig, "->", sockets[mux]->available());
}
} }
return index; return index;
} }

54
TinyGsmClientM590.h
View File

@@ -448,6 +448,9 @@ public:
String r5s(r5); r5s.trim(); String r5s(r5); r5s.trim();
DBG("### ..:", r1s, ",", r2s, ",", r3s, ",", r4s, ",", r5s);*/ DBG("### ..:", r1s, ",", r2s, ",", r3s, ",", r4s, ",", r5s);*/
data.reserve(64); data.reserve(64);
bool gotData = false;
int mux = -1;
int len = 0;
int index = 0; int index = 0;
unsigned long startMillis = millis(); unsigned long startMillis = millis();
do { do {
@@ -472,24 +475,24 @@ public:
index = 5; index = 5;
goto finish; goto finish;
} else if (data.endsWith(GF("+TCPRECV:"))) { } else if (data.endsWith(GF("+TCPRECV:"))) {
int mux = streamReadUntil(',').toInt(); mux = stream.readStringUntil(',').toInt();
int len = streamReadUntil(',').toInt(); data += mux;
if (len > sockets[mux]->rx.free()) { data += (',');
DBG("### Buffer overflow: ", len, "->", sockets[mux]->rx.free()); len = stream.readStringUntil(',').toInt();
} else { data += len;
DBG("### Got: ", len, "->", sockets[mux]->rx.free()); data += (',');
} gotData = true;
while (len--) { index = 6;
while (!stream.available()) {} goto finish;
sockets[mux]->rx.put(stream.read());
}
data = "";
return index;
} else if (data.endsWith(GF("+TCPCLOSE:"))) { } else if (data.endsWith(GF("+TCPCLOSE:"))) {
int mux = streamReadUntil(',').toInt(); mux = stream.readStringUntil(',').toInt();
streamReadUntil('\n'); data += mux;
data += (',');
String concl = stream.readStringUntil('\n');
data += concl;
sockets[mux]->sock_connected = false; sockets[mux]->sock_connected = false;
data = ""; index = 7;
goto finish;
} }
} }
} while (millis() - startMillis < timeout); } while (millis() - startMillis < timeout);
@@ -499,7 +502,6 @@ public:
if (data.length()) { if (data.length()) {
DBG("### Unhandled:", data); DBG("### Unhandled:", data);
} }
data = "";
} }
else { else {
data.trim(); data.trim();
@@ -508,7 +510,23 @@ public:
if (data.length()) { if (data.length()) {
DBG(GSM_NL, "<<< ", data); DBG(GSM_NL, "<<< ", data);
} }
data = ""; }
if (gotData) {
int len_orig = len;
if (len > sockets[mux]->rx.free()) {
DBG(GSM_NL, "### Buffer overflow: ", len, "->", sockets[mux]->rx.free());
} else {
DBG(GSM_NL, "### Got: ", len, "->", sockets[mux]->rx.free());
}
while (len--) {
char c[2] = {0};
stream.readBytes(c, 1); // readBytes includes a timeout
if(c[0]) sockets[mux]->rx.put(c[0]);
// DBG(GSM_NL, c[0], " ", len, " ", stream.available(), " ", sockets[mux]->available());
}
if (len_orig > sockets[mux]->available()) {
DBG(GSM_NL, "### Fewer characters received than expected: ", len_orig, "->", sockets[mux]->available());
}
} }
return index; return index;
} }

16
TinyGsmClientXBee.h
View File

@@ -312,10 +312,6 @@ public:
commandMode(); commandMode();
sendAT(GF("AP"), 0); // Put in transparent mode
waitResponse();
sendAT(GF("IP"), 1); // Put in TCP mode
waitResponse();
sendAT(GF("EE"), 2); // Set security to WPA2 sendAT(GF("EE"), 2); // Set security to WPA2
waitResponse(); waitResponse();
@@ -348,10 +344,6 @@ public:
*/ */
bool gprsConnect(const char* apn, const char* user = "", const char* pw = "") { bool gprsConnect(const char* apn, const char* user = "", const char* pw = "") {
commandMode(); commandMode();
sendAT(GF("AP"), 0); // Put in transparent mode
waitResponse();
sendAT(GF("IP"), 1); // Put in TCP mode
waitResponse();
sendAT(GF("AN"), apn); // Set the APN sendAT(GF("AN"), apn); // Set the APN
waitResponse(); waitResponse();
writeChanges(); writeChanges();
@@ -375,8 +367,6 @@ public:
bool sendSMS(const String& number, const String& text) { bool sendSMS(const String& number, const String& text) {
commandMode(); commandMode();
sendAT(GF("AP"), 0); // Put in transparent mode
waitResponse();
sendAT(GF("IP"), 2); // Put in text messaging mode sendAT(GF("IP"), 2); // Put in text messaging mode
waitResponse(); waitResponse();
sendAT(GF("PH"), number); // Set the phone number sendAT(GF("PH"), number); // Set the phone number
@@ -493,9 +483,11 @@ private:
host += ip[2]; host += ip[2];
host += "."; host += ".";
host += ip[3]; host += ip[3];
sendAT(GF("DL"), host); sendAT(GF("IP"), 1); // Put in TCP mode
waitResponse(); waitResponse();
sendAT(GF("DE"), String(port, HEX)); sendAT(GF("DL"), host); // Set the "Destination Address Low"
waitResponse();
sendAT(GF("DE"), String(port, HEX)); // Set the destination port
int rsp = waitResponse(); int rsp = waitResponse();
return rsp; return rsp;
} }