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

Merge branch 'master' into v_master

Browse Source
This commit is contained in:
Sara Damiano
2020-03-02 16:49:48 -05:00
parent 3bd1ae8181 0efe729666
commit d28e654dfd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/TinyGsmClientBG96.h
View File

@@ -103,10 +103,11 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
TINY_GSM_CLIENT_CONNECT_OVERRIDES TINY_GSM_CLIENT_CONNECT_OVERRIDES
void stop(uint32_t maxWaitMs) { void stop(uint32_t maxWaitMs) {
uint32_t startMillis = millis();
dumpModemBuffer(maxWaitMs); dumpModemBuffer(maxWaitMs);
at->sendAT(GF("+QICLOSE="), mux); at->sendAT(GF("+QICLOSE="), mux);
sock_connected = false; sock_connected = false;
at->waitResponse(); at->waitResponse((maxWaitMs - (millis() - startMillis)));
} }
void stop() override { void stop() override {
stop(15000L); stop(15000L);

1
src/TinyGsmModem.tpp
View File

@@ -291,7 +291,6 @@ class TinyGsmModem {
inline float streamGetFloatLength(int8_t numChars) { inline float streamGetFloatLength(int8_t numChars) {
char buf[16]; char buf[16];
size_t bytesRead = thisModem().stream.readBytes(buf, numChars); size_t bytesRead = thisModem().stream.readBytes(buf, numChars);
DBG("### bytesRead:", bytesRead);
if (bytesRead) { if (bytesRead) {
buf[numChars] = '\0'; buf[numChars] = '\0';
int16_t res = atof(buf); int16_t res = atof(buf);