JSD/TinyGSM
3
0
Fork 1
mirror of https://github.com/vshymanskyy/TinyGSM.git synced 2026-05-15 04:06:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Esp fix, deep debug

Browse Source 
Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
This commit is contained in:
Sara Damiano
2024-05-15 11:07:38 -04:00
parent bc1e2b2b3e
commit 1c097cbdef
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -48,3 +48,4 @@ filters/*
platformio_extra_envs.ini
*.tar.gz
pioScripts/generate_compile_commands.py
compile_commands.json

1
src/TinyGsmClientESP8266.h
View File

@@ -422,6 +422,7 @@ class TinyGsmESP8266 : public TinyGsmModem<TinyGsmESP8266>,
if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) {
sockets[mux]->sock_connected = false;
}
streamSkipUntil('\n'); // throw away the new line
data = "";
DBG("### Closed: ", mux);
return true;

29
src/TinyGsmModem.tpp
View File

@@ -183,10 +183,13 @@ class TinyGsmModem {
GsmConstStr r5 = nullptr, GsmConstStr r6 = nullptr,
GsmConstStr r7 = nullptr) {
data.reserve(64);
// DBG(GF("r1 <"), r1 ? r1 : GF("NULL"), GF("> r2 <"), r2 ? r2 : GF("NULL"),
// GF("> r3 <"), r3 ? r3 : GF("NULL"), GF("> r4 <"), r4 ? r4 :
// GF("NULL"), GF("> r5 <"), r5 ? r5 : GF("NULL"), GF("> r6 <"), r6 ? r6
// : GF("NULL"), GF("> r7 <"), r7 ? r7 : GF("NULL"), '>');
#ifdef TINY_GSM_DEBUG_DEEP
DBG(GF("r1 <"), r1 ? r1 : GF("NULL"), GF("> r2 <"), r2 ? r2 : GF("NULL"),
GF("> r3 <"), r3 ? r3 : GF("NULL"), GF("> r4 <"), r4 ? r4 : GF("NULL"),
GF("> r5 <"), r5 ? r5 : GF("NULL"), GF("> r6 <"), r6 ? r6 : GF("NULL"),
GF("> r7 <"), r7 ? r7 : GF("NULL"), '>');
#endif
uint8_t index = 0;
uint32_t startMillis = millis();
do {
@@ -221,12 +224,16 @@ class TinyGsmModem {
#if defined TINY_GSM_DEBUG
else if (data.endsWith(GFP(GSM_VERBOSE)) ||
data.endsWith(GFP(GSM_VERBOSE_2))) {
// DBG(GF("Verbose details <<<"));
#ifdef TINY_GSM_DEBUG_DEEP
DBG(GF("Verbose details <<<"));
#endif
// Read out the verbose message, until whichever type of new line
// comes first
thisModem().stream.findUntil(const_cast<char*>("\r"),
const_cast<char*>("\n"));
// DBG(GF(">>>"));
#ifdef TINY_GSM_DEBUG_DEEP
DBG(GF(">>>"));
#endif
data = "";
}
#endif
@@ -236,14 +243,18 @@ class TinyGsmModem {
}
} while (millis() - startMillis < timeout_ms);
finish:
// data.replace("\r", "←");
// data.replace("\n", "↓");
#ifdef TINY_GSM_DEBUG_DEEP
data.replace("\r", "←");
data.replace("\n", "↓");
#endif
if (!index) {
data.trim();
if (data.length()) { DBG("### Unhandled:", data); }
data = "";
} else {
// DBG('<', index, '>', data);
#ifdef TINY_GSM_DEBUG_DEEP
DBG('<', index, '>', data);
#endif
}
return index;
}