From 84811fb9d573b132cb0363b11da47d3c4b768349 Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Wed, 12 Sep 2018 17:41:16 -0400 Subject: [PATCH 1/3] Removed default stream --- src/TinyGsmClientA6.h | 4 ---- src/TinyGsmClientBG96.h | 4 ---- src/TinyGsmClientESP8266.h | 4 ---- src/TinyGsmClientM590.h | 4 ---- src/TinyGsmClientSIM800.h | 4 ---- src/TinyGsmClientUBLOX.h | 4 ---- src/TinyGsmClientXBee.h | 4 ---- 7 files changed, 28 deletions(-) diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h index d9a0cf5..e1e4b86 100644 --- a/src/TinyGsmClientA6.h +++ b/src/TinyGsmClientA6.h @@ -177,11 +177,7 @@ private: public: -#ifdef GSM_DEFAULT_STREAM - TinyGsmA6(Stream& stream = GSM_DEFAULT_STREAM) -#else TinyGsmA6(Stream& stream) -#endif : stream(stream) { memset(sockets, 0, sizeof(sockets)); diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h index 013db9d..c2fc95e 100644 --- a/src/TinyGsmClientBG96.h +++ b/src/TinyGsmClientBG96.h @@ -201,11 +201,7 @@ public: public: -#ifdef GSM_DEFAULT_STREAM - TinyGsmBG96(Stream& stream = GSM_DEFAULT_STREAM) -#else TinyGsmBG96(Stream& stream) -#endif : stream(stream) { memset(sockets, 0, sizeof(sockets)); diff --git a/src/TinyGsmClientESP8266.h b/src/TinyGsmClientESP8266.h index 56a8fc6..0561208 100644 --- a/src/TinyGsmClientESP8266.h +++ b/src/TinyGsmClientESP8266.h @@ -193,11 +193,7 @@ public: public: -#ifdef GSM_DEFAULT_STREAM - TinyGsmESP8266(Stream& stream = GSM_DEFAULT_STREAM) -#else TinyGsmESP8266(Stream& stream) -#endif : stream(stream) { memset(sockets, 0, sizeof(sockets)); diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h index 1a76ebc..55e837b 100644 --- a/src/TinyGsmClientM590.h +++ b/src/TinyGsmClientM590.h @@ -174,11 +174,7 @@ private: public: -#ifdef GSM_DEFAULT_STREAM - TinyGsmM590(Stream& stream = GSM_DEFAULT_STREAM) -#else TinyGsmM590(Stream& stream) -#endif : stream(stream) { memset(sockets, 0, sizeof(sockets)); diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h index 9e0c3b0..4da8aa9 100644 --- a/src/TinyGsmClientSIM800.h +++ b/src/TinyGsmClientSIM800.h @@ -216,11 +216,7 @@ public: public: -#ifdef GSM_DEFAULT_STREAM - TinyGsmSim800(Stream& stream = GSM_DEFAULT_STREAM) -#else TinyGsmSim800(Stream& stream) -#endif : stream(stream) { memset(sockets, 0, sizeof(sockets)); diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h index 21307f1..38fad37 100644 --- a/src/TinyGsmClientUBLOX.h +++ b/src/TinyGsmClientUBLOX.h @@ -200,11 +200,7 @@ public: public: -#ifdef GSM_DEFAULT_STREAM - TinyGsmUBLOX(Stream& stream = GSM_DEFAULT_STREAM) -#else TinyGsmUBLOX(Stream& stream) -#endif : stream(stream) { memset(sockets, 0, sizeof(sockets)); diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h index 73861d0..8c0f1b0 100644 --- a/src/TinyGsmClientXBee.h +++ b/src/TinyGsmClientXBee.h @@ -206,11 +206,7 @@ public: public: -#ifdef GSM_DEFAULT_STREAM - TinyGsmXBee(Stream& stream = GSM_DEFAULT_STREAM) -#else TinyGsmXBee(Stream& stream) -#endif : stream(stream) {} From 4ea6f872e4878231bc6f740a7c5893c2a9b0186f Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Thu, 13 Sep 2018 18:14:09 -0400 Subject: [PATCH 2/3] Fixed typos --- examples/AllFunctions/AllFunctions.ino | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/examples/AllFunctions/AllFunctions.ino b/examples/AllFunctions/AllFunctions.ino index fde9f02..82a9381 100644 --- a/examples/AllFunctions/AllFunctions.ino +++ b/examples/AllFunctions/AllFunctions.ino @@ -11,15 +11,19 @@ // Select your modem: #define TINY_GSM_MODEM_SIM800 -// #define TINY_GSM_MODEM_SIM808 // #define TINY_GSM_MODEM_SIM900 +// #define TINY_GSM_MODEM_SIM808 +// #define TINY_GSM_MODEM_SIM868 // #define TINY_GSM_MODEM_UBLOX +// #define TINY_GSM_MODEM_M95 // #define TINY_GSM_MODEM_BG96 // #define TINY_GSM_MODEM_A6 // #define TINY_GSM_MODEM_A7 // #define TINY_GSM_MODEM_M590 // #define TINY_GSM_MODEM_MC60 // #define TINY_GSM_MODEM_MC60E +// #define TINY_GSM_MODEM_ESP8266 +// #define TINY_GSM_MODEM_XBEE // Set serial for debug console (to the Serial Monitor, speed 115200) #define SerialMon Serial @@ -91,7 +95,7 @@ void loop() { // To skip it, call init() instead of restart() DBG("Initializing modem..."); if (!modem.restart()) { - DBG("Failed to restart modem, delayin 10s and retring"); + DBG("Failed to restart modem, delaying 10s and retrying"); delay(3000); // restart autobaud in case GSM just rebooted TinyGsmAutoBaud(SerialAT,GSM_AUTOBAUD_MIN,GSM_AUTOBAUD_MAX); @@ -103,7 +107,7 @@ void loop() { DBG("Modem:", modemInfo); // Unlock your SIM card with a PIN if needed - if ( GSM_PIN && modem.getSimStatus() != 3 ) { + if ( GSM_PIN && modem.getSimStatus() != 3 ) { modem.simUnlock(GSM_PIN); } @@ -123,7 +127,6 @@ void loop() { delay(10000); return; } -#endif bool res = modem.isGprsConnected(); DBG("GPRS status:", res ? "connected" : "not connected"); @@ -139,7 +142,6 @@ void loop() { IPAddress local = modem.localIP(); DBG("Local IP:", local); -#endif int csq = modem.getSignalQuality(); DBG("Signal quality:", csq); @@ -157,10 +159,10 @@ void loop() { DBG("GSM location:", gsmLoc); // This is only supported on SIMxxx series - String gsmTime = modem.getGSMDateTime(DATE_TIME); - DBG("GSM Time:", gsmTime); - String gsmDate = modem.getGSMDateTime(DATE_DATE); - DBG("GSM Date:", gsmDate); + // String gsmTime = modem.getGSMDateTime(DATE_TIME); + // DBG("GSM Time:", gsmTime); + // String gsmDate = modem.getGSMDateTime(DATE_DATE); + // DBG("GSM Date:", gsmDate); String ussd_balance = modem.sendUSSD("*111#"); DBG("Balance (USSD):", ussd_balance); @@ -219,7 +221,7 @@ void loop() { } #endif -#if TINY_GSM_POWERDOWN +#if TINY_GSM_POWERDOWN // Try to power-off (modem may decide to restart automatically) // To turn off modem completely, please use Reset/Enable pins modem.poweroff(); From c9a39f51abf429aef3a313154888a307e0291461 Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Thu, 13 Sep 2018 18:14:59 -0400 Subject: [PATCH 3/3] Updated keywords --- library.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library.json b/library.json index 3fbc503..2b37a92 100644 --- a/library.json +++ b/library.json @@ -1,8 +1,8 @@ { "name": "TinyGSM", "version": "0.3.6", - "description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports GSM modules with AT command interface: SIM800, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900, SIM900A, SIM900D, SIM908, SIM968", - "keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968", + "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", "authors": { "name": "Volodymyr Shymanskyy",