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

Minor debugging tweaks

Browse Source
This commit is contained in:
SRGDamia1
2017-04-13 01:37:26 -04:00
parent baa9768532
commit b0827e9565
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TinyGsmClientSIM800.h
View File

@@ -618,7 +618,6 @@ public:
if (gotData) { if (gotData) {
sockets[mux]->sock_available = modemGetAvailable(mux); sockets[mux]->sock_available = modemGetAvailable(mux);
} }
data = "";
return index; return index;
} }

12
TinyGsmClientXBee.h
View File

@@ -285,7 +285,12 @@ public:
bool waitForNetwork(unsigned long timeout = 60000L) { bool waitForNetwork(unsigned long timeout = 60000L) {
for (unsigned long start = millis(); millis() - start < timeout; ) { for (unsigned long start = millis(); millis() - start < timeout; ) {
if (modemGetConnected()) { commandMode();
sendAT(GF("AI"));
waitResponse();
String res = streamReadUntil('\r');
exitCommand();
if (res == 0) {
return true; return true;
} }
delay(1000); delay(1000);
@@ -389,7 +394,7 @@ public:
streamWrite("AT", cmd..., GSM_NL); streamWrite("AT", cmd..., GSM_NL);
stream.flush(); stream.flush();
TINY_GSM_YIELD(); TINY_GSM_YIELD();
DBG("\r\n", ">>> AT:", cmd...); DBG("\r\n", ">>> AT ", cmd..., "\r\n");
} }
// TODO: Optimize this! // TODO: Optimize this!
@@ -444,13 +449,12 @@ public:
data.replace(GSM_NL GSM_NL, GSM_NL); data.replace(GSM_NL GSM_NL, GSM_NL);
data.replace(GSM_NL, "\r\n" " "); data.replace(GSM_NL, "\r\n" " ");
if (data.length()) { if (data.length()) {
DBG(GSM_NL, "<<< ", data); DBG("\r\n", "<<< ", data);
} }
} }
// if (gotData) { // if (gotData) {
// sockets[mux]->sock_available = modemGetAvailable(mux); // sockets[mux]->sock_available = modemGetAvailable(mux);
// } // }
data = "";
return index; return index;
} }