Removed un-necessary sock check, shortened SIM800 ping

This commit is contained in:
Sara Damiano
2018-10-08 18:03:52 -04:00
9 changed files with 12 additions and 12 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "TinyGSM", "name": "TinyGSM",
"version": "0.4.4", "version": "0.4.5",
"description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports many GSM 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 and wifi modules with AT command interfaces.",
"keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968, M95, MC60, MC60E, BG96, ublox", "keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968, M95, MC60, MC60E, BG96, ublox",
"authors": "authors":

View File

@@ -1,5 +1,5 @@
name=TinyGSM name=TinyGSM
version=0.4.4 version=0.4.5
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.

View File

@@ -112,7 +112,7 @@ public:
virtual int available() { virtual int available() {
TINY_GSM_YIELD(); TINY_GSM_YIELD();
if (!rx.size() && sock_connected) { if (!rx.size()) {
at->maintain(); at->maintain();
} }
return rx.size(); return rx.size();
@@ -191,7 +191,7 @@ public:
if (waitResponse() != 1) { if (waitResponse() != 1) {
return false; return false;
} }
sendAT(GF("+CMEE=0")); // Turn of verbose errors sendAT(GF("+CMEE=0")); // Turn off verbose errors
waitResponse(); waitResponse();
sendAT(GF("+CMER=3,0,0,2")); // Set unsolicited result code output destination sendAT(GF("+CMER=3,0,0,2")); // Set unsolicited result code output destination
waitResponse(); waitResponse();

View File

@@ -112,7 +112,7 @@ public:
virtual int available() { virtual int available() {
TINY_GSM_YIELD(); TINY_GSM_YIELD();
if (!rx.size() && sock_connected) { if (!rx.size()) {
at->maintain(); at->maintain();
} }
return rx.size() + sock_available; return rx.size() + sock_available;

View File

@@ -109,7 +109,7 @@ public:
virtual int available() { virtual int available() {
TINY_GSM_YIELD(); TINY_GSM_YIELD();
if (!rx.size() && sock_connected) { if (!rx.size()) {
at->maintain(); at->maintain();
} }
return rx.size(); return rx.size();

View File

@@ -112,7 +112,7 @@ public:
virtual int available() { virtual int available() {
TINY_GSM_YIELD(); TINY_GSM_YIELD();
if (!rx.size() && sock_connected) { if (!rx.size()) {
at->maintain(); at->maintain();
} }
return rx.size() + sock_available; return rx.size() + sock_available;

View File

@@ -116,7 +116,7 @@ public:
virtual int available() { virtual int available() {
TINY_GSM_YIELD(); TINY_GSM_YIELD();
if (!rx.size() && sock_connected) { if (!rx.size()) {
at->maintain(); at->maintain();
} }
return rx.size() + sock_available; return rx.size() + sock_available;

View File

@@ -118,11 +118,11 @@ public:
virtual int available() { virtual int available() {
TINY_GSM_YIELD(); TINY_GSM_YIELD();
if (!rx.size() && sock_connected) { if (!rx.size()) {
// Workaround: sometimes SIM800 forgets to notify about data arrival. // Workaround: sometimes SIM800 forgets to notify about data arrival.
// TODO: Currently we ping the module periodically, // TODO: Currently we ping the module periodically,
// but maybe there's a better indicator that we need to poll // but maybe there's a better indicator that we need to poll
if (millis() - prev_check > 500) { if (millis() - prev_check > 250) {
got_data = true; got_data = true;
prev_check = millis(); prev_check = millis();
} }
@@ -147,7 +147,7 @@ public:
// Workaround: sometimes SIM800 forgets to notify about data arrival. // Workaround: sometimes SIM800 forgets to notify about data arrival.
// TODO: Currently we ping the module periodically, // TODO: Currently we ping the module periodically,
// but maybe there's a better indicator that we need to poll // but maybe there's a better indicator that we need to poll
if (millis() - prev_check > 500) { if (millis() - prev_check > 250) {
got_data = true; got_data = true;
prev_check = millis(); prev_check = millis();
} }

View File

@@ -110,7 +110,7 @@ public:
virtual int available() { virtual int available() {
TINY_GSM_YIELD(); TINY_GSM_YIELD();
if (!rx.size() && sock_connected) { if (!rx.size()) {
at->maintain(); at->maintain();
} }
return rx.size() + sock_available; return rx.size() + sock_available;