Typo

examples/WebClient/WebClient.ino

@@ -9,7 +9,7 @@
  **************************************************************/
 
 // Select your modem:
-#define TINY_GSM_MODEMs_SIM800
+#define TINY_GSM_MODEM_SIM800
 // #define TINY_GSM_MODEM_SIM808
 // #define TINY_GSM_MODEM_SIM868
 // #define TINY_GSM_MODEM_SIM900
@@ -65,7 +65,7 @@
 
 // Your GPRS credentials
 // Leave empty, if missing user or pass
-const char apn[]  = "hologram";
+const char apn[]  = "YourAPN";
 const char gprsUser[] = "";
 const char gprsPass[] = "";
 const char wifiSSID[]  = "YourSSID";

src/TinyGsmClientSIM7000.h

@@ -145,9 +145,6 @@ public:
     TINY_GSM_YIELD();
     rx.clear();
     sock_connected = at->modemConnect(host, port, mux, true);
-    // sock_connected = at->modemConnect(host, port, &mux, true);
-    // at->sockets[mux] = this;
-    // TODO:  When is the socket attached?
     return sock_connected;
   }
 };

src/TinyGsmClientSIM800.h

@@ -146,9 +146,6 @@ public:
     TINY_GSM_YIELD();
     rx.clear();
     sock_connected = at->modemConnect(host, port, mux, true);
-    // sock_connected = at->modemConnect(host, port, &mux, true);
-    // at->sockets[mux] = this;
-    // TODO:  When is the socket attached?
     return sock_connected;
   }
 };
@@ -483,7 +480,6 @@ TINY_GSM_MODEM_WAIT_FOR_NETWORK()
     return TinyGsmIpFromString(getLocalIP());
   }
 
-
   /*
    * Phone Call functions
    */

src/TinyGsmClientSaraR4.h

@@ -163,10 +163,13 @@ public:
     stop();
     TINY_GSM_YIELD();
     rx.clear();
-    // sock_connected = at->modemConnect(host, port, mux, true);
+    uint8_t oldMux = mux;
     sock_connected = at->modemConnect(host, port, &mux, true);
+    if (mux != oldMux) {
+        DBG("WARNING:  Mux number changed from", oldMux, "to", mux);
+        at->sockets[oldMux] = NULL;
+    }
     at->sockets[mux] = this;
-    // TODO:  When is the socket attached?
     at->maintain();
     return sock_connected;
   }

src/TinyGsmClientUBLOX.h

@@ -147,10 +147,13 @@ public:
     stop();
     TINY_GSM_YIELD();
     rx.clear();
-    // sock_connected = at->modemConnect(host, port, mux, true);
+    uint8_t oldMux = mux;
     sock_connected = at->modemConnect(host, port, &mux, true);
+    if (mux != oldMux) {
+        DBG("WARNING:  Mux number changed from", oldMux, "to", mux);
+        at->sockets[oldMux] = NULL;
+    }
     at->sockets[mux] = this;
-    // TODO:  When is the socket attached?
     at->maintain();
     return sock_connected;
   }