Merge EnviroDIY master

library.json

@@ -1,6 +1,6 @@
 {
   "name": "TinyGSM",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "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":

library.properties

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

src/TinyGsmClientA6.h

@@ -184,6 +184,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientBG96.h

@@ -220,6 +220,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientESP8266.h

@@ -201,6 +201,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientM590.h

@@ -181,6 +181,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientM95.h

@@ -220,6 +220,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientMC60.h

@@ -224,6 +224,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientSIM7000.h

@@ -246,6 +246,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientSIM800.h

@@ -241,6 +241,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }

src/TinyGsmClientUBLOX.h

@@ -251,6 +251,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
     if (!testAT()) {
       return false;
     }
@@ -275,10 +276,15 @@ public:
       DBG(GF("### SARA N2 NB-IoT modems not supported!"), name);
     }
     int ret = getSimStatus();
+    // if the sim isn't ready and a pin has been provided, try to unlock the sim
     if (ret != SIM_READY && pin != NULL && strlen(pin) > 0) {
       simUnlock(pin);
+      return (getSimStatus() == SIM_READY);
+    }
+    // if the sim is ready, or it's locked but no pin has been provided, return true
+    else {
+      return (ret == SIM_READY || ret == SIM_LOCKED);
     }
-    return (getSimStatus() == SIM_READY);
   }
 
   String getModemName() {
@@ -383,7 +389,7 @@ public:
     if (waitResponse(10000L) != 1) {
       return false;
     }
-    delay(3000);
+    delay(3000);  // TODO:  Verify delay timing here
     return init();
   }
 

src/TinyGsmClientXBee.h

@@ -281,6 +281,7 @@ public:
    */
 
   bool init(const char* pin = NULL) {
+    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
 
     if (resetPin >= 0) {
       pinMode(resetPin, OUTPUT);
@@ -457,7 +458,7 @@ public:
 
     exitCommand();
 
-    return true;
+    return init();
   }
 
   void setupPinSleep(bool maintainAssociation = false) {

src/TinyGsmCommon.h

@@ -9,6 +9,9 @@
 #ifndef TinyGsmCommon_h
 #define TinyGsmCommon_h
 
+// The current library version number
+#define TINYGSM_VERSION "0.6.1"
+
 #if defined(SPARK) || defined(PARTICLE)
   #include "Particle.h"
 #elif defined(ARDUINO)