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

Don't check QISACK

Browse Source
This commit is contained in:
Sara Damiano
2019-09-04 11:22:12 -04:00
parent 58ff6b42dd
commit 070d6123da
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE.md vendored
View File

@@ -23,7 +23,7 @@ with your board before submitting any issues.
Main processor board: <!-- Uno, Zero, ESP32, Particle, etc --> Main processor board: <!-- Uno, Zero, ESP32, Particle, etc -->
Modem: <!-- Brand, model, variant, firmware version --> Modem: <!-- Brand, model, variant, firmware version -->
TinyGSM version: <!-- always try to use the latest (0.9.12) --> TinyGSM version: <!-- always try to use the latest (0.9.13) -->
Code: <!-- Example name or paste in your code --> Code: <!-- Example name or paste in your code -->
### Scenario, steps to reproduce ### Scenario, steps to reproduce

2
library.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "TinyGSM", "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.", "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", "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": "authors":

2
library.properties
View File

@@ -1,5 +1,5 @@
name=TinyGSM name=TinyGSM
version=0.9.12 version=0.9.13
author=Volodymyr Shymanskyy author=Volodymyr Shymanskyy
maintainer=Volodymyr Shymanskyy maintainer=Volodymyr Shymanskyy
sentence=A small Arduino library for GPRS modules, that just works. sentence=A small Arduino library for GPRS modules, that just works.

43
src/TinyGsmClientM95.h
View File

@@ -609,34 +609,33 @@ protected:
return 0; return 0;
} }
bool allAcknowledged = false; // bool allAcknowledged = false;
// bool failed = false; // // bool failed = false;
while ( !allAcknowledged ) { // while ( !allAcknowledged ) {
sendAT( GF("+QISACK")); // sendAT( GF("+QISACK"));
if (waitResponse(5000L, GF(GSM_NL "+QISACK:")) != 1) { // if (waitResponse(5000L, GF(GSM_NL "+QISACK:")) != 1) {
return -1; // return -1;
} else { // } else {
streamSkipUntil(','); /** Skip total */ // streamSkipUntil(','); // Skip total length sent on connection
streamSkipUntil(','); /** Skip acknowledged data size */ // streamSkipUntil(','); // Skip length already acknowledged by remote
if ( stream.readStringUntil('\n').toInt() == 0 ) { // // Make sure the total length un-acknowledged is 0
allAcknowledged = true; // if ( stream.readStringUntil('\n').toInt() == 0 ) {
} // allAcknowledged = true;
} // }
} // }
waitResponse(5000L); // }
// waitResponse(5000L);
// streamSkipUntil(','); // Skip mux
// return stream.readStringUntil('\n').toInt();
return len; // TODO return len; // TODO
} }
size_t modemRead(size_t size, uint8_t mux) { size_t modemRead(size_t size, uint8_t mux) {
// TODO: Does this work???? // TODO: Does this work????
// AT+QIRD=<id>,<sc>,<sid>,<len> // AT+QIRD=<id>,<sc>,<sid>,<len>
// id = GPRS context number - 0, set in GPRS connect // id = GPRS context number = 0, set in GPRS connect
// sc = roll in connection - 1, client of connection // sc = role in connection = 1, client of connection
// sid = index of connection - mux // sid = index of connection = mux
// len = maximum length of data to send // len = maximum length of data to retrieve
sendAT(GF("+QIRD=0,1,"), mux, ',', size); sendAT(GF("+QIRD=0,1,"), mux, ',', size);
// sendAT(GF("+QIRD="), mux, ',', size); // sendAT(GF("+QIRD="), mux, ',', size);
if (waitResponse(GF("+QIRD:")) != 1) { if (waitResponse(GF("+QIRD:")) != 1) {
@@ -720,7 +719,7 @@ TINY_GSM_MODEM_STREAM_UTILITIES()
} else if (r5 && data.endsWith(r5)) { } else if (r5 && data.endsWith(r5)) {
index = 5; index = 5;
goto finish; 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 context
streamSkipUntil(','); // Skip the role streamSkipUntil(','); // Skip the role
int mux = stream.readStringUntil('\n').toInt(); int mux = stream.readStringUntil('\n').toInt();

2
src/TinyGsmCommon.h
View File

@@ -10,7 +10,7 @@
#define TinyGsmCommon_h #define TinyGsmCommon_h
// The current library version number // The current library version number
#define TINYGSM_VERSION "0.9.12" #define TINYGSM_VERSION "0.9.13"
#if defined(SPARK) || defined(PARTICLE) #if defined(SPARK) || defined(PARTICLE)
#include "Particle.h" #include "Particle.h"