Merge branch 'develop'

This commit is contained in:
Sara Damiano
2020-03-02 16:47:22 -05:00
2 changed files with 2 additions and 2 deletions

View File

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

View File

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