diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 03e87da..5c6066b 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -23,7 +23,7 @@ with your board before submitting any issues. Main processor board: Modem: -TinyGSM version: +TinyGSM version: Code: ### Scenario, steps to reproduce diff --git a/library.json b/library.json index dce8d6d..fecff3d 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "TinyGSM", - "version": "0.9.12", + "version": "0.9.13", "description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports many GSM, LTE, and WiFi modules with AT command interfaces.", "keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM7000, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968, M95, MC60, MC60E, BG96, ublox, Quectel, SIMCOM, AI Thinker, LTE, LTE-M", "authors": diff --git a/library.properties b/library.properties index 7d55d26..386f113 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=TinyGSM -version=0.9.12 +version=0.9.13 author=Volodymyr Shymanskyy maintainer=Volodymyr Shymanskyy sentence=A small Arduino library for GPRS modules, that just works. diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h index 6ab855b..af3e78c 100644 --- a/src/TinyGsmClientM95.h +++ b/src/TinyGsmClientM95.h @@ -609,34 +609,33 @@ protected: return 0; } - bool allAcknowledged = false; - // bool failed = false; - while ( !allAcknowledged ) { - sendAT( GF("+QISACK")); - if (waitResponse(5000L, GF(GSM_NL "+QISACK:")) != 1) { - return -1; - } else { - streamSkipUntil(','); /** Skip total */ - streamSkipUntil(','); /** Skip acknowledged data size */ - if ( stream.readStringUntil('\n').toInt() == 0 ) { - allAcknowledged = true; - } - } - } - waitResponse(5000L); + // bool allAcknowledged = false; + // // bool failed = false; + // while ( !allAcknowledged ) { + // sendAT( GF("+QISACK")); + // if (waitResponse(5000L, GF(GSM_NL "+QISACK:")) != 1) { + // return -1; + // } else { + // streamSkipUntil(','); // Skip total length sent on connection + // streamSkipUntil(','); // Skip length already acknowledged by remote + // // Make sure the total length un-acknowledged is 0 + // if ( stream.readStringUntil('\n').toInt() == 0 ) { + // allAcknowledged = true; + // } + // } + // } + // waitResponse(5000L); - // streamSkipUntil(','); // Skip mux - // return stream.readStringUntil('\n').toInt(); return len; // TODO } size_t modemRead(size_t size, uint8_t mux) { // TODO: Does this work???? // AT+QIRD=,,, - // id = GPRS context number - 0, set in GPRS connect - // sc = roll in connection - 1, client of connection - // sid = index of connection - mux - // len = maximum length of data to send + // id = GPRS context number = 0, set in GPRS connect + // sc = role in connection = 1, client of connection + // sid = index of connection = mux + // len = maximum length of data to retrieve sendAT(GF("+QIRD=0,1,"), mux, ',', size); // sendAT(GF("+QIRD="), mux, ',', size); if (waitResponse(GF("+QIRD:")) != 1) { @@ -720,7 +719,7 @@ TINY_GSM_MODEM_STREAM_UTILITIES() } else if (r5 && data.endsWith(r5)) { index = 5; goto finish; - } else if (data.endsWith(GF(GSM_NL "+QIRD:"))) { // TODO: QIRD? or QIRDI? + } else if (data.endsWith(GF(GSM_NL "+QIRDI:"))) { streamSkipUntil(','); // Skip the context streamSkipUntil(','); // Skip the role int mux = stream.readStringUntil('\n').toInt(); diff --git a/src/TinyGsmCommon.h b/src/TinyGsmCommon.h index 81962c3..789eeae 100644 --- a/src/TinyGsmCommon.h +++ b/src/TinyGsmCommon.h @@ -10,7 +10,7 @@ #define TinyGsmCommon_h // The current library version number -#define TINYGSM_VERSION "0.9.12" +#define TINYGSM_VERSION "0.9.13" #if defined(SPARK) || defined(PARTICLE) #include "Particle.h"