Merge branch 'master' into v_master

.github/ISSUE_TEMPLATE.md

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

library.json

@@ -1,6 +1,6 @@
 {
   "name": "TinyGSM",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "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.10.2
+version=0.10.3
 author=Volodymyr Shymanskyy
 maintainer=Volodymyr Shymanskyy
 sentence=A small Arduino library for GPRS modules, that just works.

src/TinyGsmClientSIM800.h

@@ -392,7 +392,19 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
    * SIM card functions
    */
  protected:
-  // Able to follow all SIM card functions as inherited from the template
+  // May not return the "+CCID" before the number
+  String getSimCCIDImpl() {
+    sendAT(GF("+CCID"));
+    if (waitResponse(GF(GSM_NL)) != 1) {
+      return "";
+    }
+    String res = stream.readStringUntil('\n');
+    waitResponse();
+    // Trim out the CCID header in case it is there
+    res.replace("CCID:", "");
+    res.trim();
+    return res;
+  }
 
   /*
    * Phone Call functions

src/TinyGsmClientSequansMonarch.h

@@ -601,20 +601,20 @@ class TinyGsmSequansMonarch
     return sockets[mux % TINY_GSM_MUX_COUNT]->sock_connected;
   }
 
-    /*
-     * Utilities
-     */
-   public:
-    // TODO(vshymanskyy): Optimize this!
-    int8_t waitResponse(uint32_t timeout_ms, String & data,
-                        GsmConstStr r1 = GFP(GSM_OK),
-                        GsmConstStr r2 = GFP(GSM_ERROR),
+  /*
+   * Utilities
+   */
+ public:
+  // TODO(vshymanskyy): Optimize this!
+  int8_t waitResponse(uint32_t timeout_ms, String& data,
+                      GsmConstStr r1 = GFP(GSM_OK),
+                      GsmConstStr r2 = GFP(GSM_ERROR),
 #if defined TINY_GSM_DEBUG
-                        GsmConstStr r3 = GFP(GSM_CME_ERROR),
+                      GsmConstStr r3 = GFP(GSM_CME_ERROR),
 #else
-                        GsmConstStr r3 = NULL,
+                      GsmConstStr r3 = NULL,
 #endif
-                        GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) {
+                      GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) {
     /*String r1s(r1); r1s.trim();
     String r2s(r2); r2s.trim();
     String r3s(r3); r3s.trim();
@@ -622,7 +622,7 @@ class TinyGsmSequansMonarch
     String r5s(r5); r5s.trim();
     DBG("### ..:", r1s, ",", r2s, ",", r3s, ",", r4s, ",", r5s);*/
     data.reserve(64);
-    uint8_t  index       = 0;
+    uint8_t index = 0;
     uint32_t startMillis = millis();
     do {
       TINY_GSM_YIELD();
@@ -652,11 +652,11 @@ class TinyGsmSequansMonarch
           index = 5;
           goto finish;
         } else if (data.endsWith(GF(GSM_NL "+SQNSRING:"))) {
-          int8_t  mux = streamGetIntBefore(',');
+          int8_t mux = streamGetIntBefore(',');
           int16_t len = streamGetIntBefore('\n');
           if (mux >= 0 && mux < TINY_GSM_MUX_COUNT &&
               sockets[mux % TINY_GSM_MUX_COUNT]) {
-            sockets[mux % TINY_GSM_MUX_COUNT]->got_data       = true;
+            sockets[mux % TINY_GSM_MUX_COUNT]->got_data = true;
             sockets[mux % TINY_GSM_MUX_COUNT]->sock_available = len;
           }
           data = "";
@@ -675,7 +675,9 @@ class TinyGsmSequansMonarch
   finish:
     if (!index) {
       data.trim();
-      if (data.length()) { DBG("### Unhandled:", data); }
+      if (data.length()) {
+        DBG("### Unhandled:", data);
+      }
       data = "";
     }
     // data.replace(GSM_NL, "/");
@@ -707,10 +709,11 @@ class TinyGsmSequansMonarch
   }
 
  public:
-  Stream&                  stream;
+  Stream& stream;
+
  protected:
   GsmClientSequansMonarch* sockets[TINY_GSM_MUX_COUNT];
-  const char*              gsmNL = GSM_NL;
-  };
+  const char* gsmNL = GSM_NL;
+};
 
 #endif  // SRC_TINYGSMCLIENTSEQUANSMONARCH_H_

src/TinyGsmCommon.h

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