Rearrange includes, add empty blocks for unsupported

Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
2026-05-15 04:06:10 +00:00 · 2024-05-22 13:59:42 -04:00
parent a1983999ce
commit c2c64aec9d
20 changed files with 816 additions and 385 deletions
--- a/src/TinyGsmClientA6.h
+++ b/src/TinyGsmClientA6.h
@@ -19,13 +19,13 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
 #include "TinyGsmTime.tpp"
+#include "TinyGsmBattery.tpp"

 enum A6RegStatus {
  REG_NO_RESULT    = -1,
@@ -228,6 +228,17 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+ protected:
+  // No functions of this type supported
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -362,7 +373,7 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
  }

  /*
-   * Messaging functions
+   * Text messaging (SMS) functions
   */
 protected:
  String sendUSSDImpl(const String& code) {
@@ -387,13 +398,32 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
    }
  }

+  /*
+   * GSM Location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported
+
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp
  // Note - the clock probably has to be set manaually first

+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
@@ -425,6 +455,11 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
    return true;
  }

+  /*
+   * Temperature functions
+   */
+  // No functions of this type supported
+
  /*
   * Client related functions
   */
--- a/src/TinyGsmClientA7672x.h
+++ b/src/TinyGsmClientA7672x.h
@@ -18,16 +18,16 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
-#include "TinyGsmSSL.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmSSL.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmTime.tpp"
 #include "TinyGsmNTP.tpp"
+#include "TinyGsmBattery.tpp"
 #include "TinyGsmTemperature.tpp"

 enum A7672xRegStatus {
@@ -238,30 +238,6 @@ class TinyGsmA7672X : public TinyGsmModem<TinyGsmA7672X>,
    return waitResponse() == 1;
  }

-  /*
-   * SIM card functions
-   */
- protected:
-  SimStatus getSimStatusImpl(uint32_t timeout_ms = 10000L) {
-    for (uint32_t start = millis(); millis() - start < timeout_ms;) {
-      sendAT(GF("+CPIN?"));
-      if (waitResponse(GF("+CPIN:")) != 1) {
-        delay(1000);
-        continue;
-      }
-      int8_t status = waitResponse(GF("READY"), GF("SIM PIN"), GF("SIM PUK"),
-                                   GF("SIM not inserted"), GF("SIM REMOVED"));
-      waitResponse();
-      switch (status) {
-        case 2:
-        case 3: return SIM_LOCKED;
-        case 1: return SIM_READY;
-        default: return SIM_ERROR;
-      }
-    }
-    return SIM_ERROR;
-  }
-
  /*
   * Power functions
   */
@@ -356,6 +332,11 @@ class TinyGsmA7672X : public TinyGsmModem<TinyGsmA7672X>,
    return waitResponse() == 1;
  }

+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -406,6 +387,26 @@ class TinyGsmA7672X : public TinyGsmModem<TinyGsmA7672X>,
   * SIM card functions
   */
 protected:
+  SimStatus getSimStatusImpl(uint32_t timeout_ms = 10000L) {
+    for (uint32_t start = millis(); millis() - start < timeout_ms;) {
+      sendAT(GF("+CPIN?"));
+      if (waitResponse(GF("+CPIN:")) != 1) {
+        delay(1000);
+        continue;
+      }
+      int8_t status = waitResponse(GF("READY"), GF("SIM PIN"), GF("SIM PUK"),
+                                   GF("SIM not inserted"), GF("SIM REMOVED"));
+      waitResponse();
+      switch (status) {
+        case 2:
+        case 3: return SIM_LOCKED;
+        case 1: return SIM_READY;
+        default: return SIM_ERROR;
+      }
+    }
+    return SIM_ERROR;
+  }
+
  String getSimCCIDImpl() {
    sendAT(GF("+CICCID"));
    if (waitResponse(GF(AT_NL "+ICCID:")) != 1) { return ""; }
@@ -425,33 +426,43 @@ class TinyGsmA7672X : public TinyGsmModem<TinyGsmA7672X>,
  }

  /*
-   * GSM Location functions //todo:
+   * Audio functions
   */
- protected:
+  // No functions of this type supported
+
  /*
-   * GPS/GNSS/GLONASS location functions //todo:
+   * Text messaging (SMS) functions
   */
- protected:
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp
+
  /*
-   * Audio functions //todo:
+   * GSM Location functions
   */
- protected:
+  // No functions of this type supported
  /*
-   * Time functions //todo:
+   * GPS/GNSS/GLONASS location functions
   */
- protected:
+  // No functions of this type supported
+
  /*
-   * NTP server functions //todo:
+   * Time functions
   */
- protected:
+  // No functions of this type supported
  /*
-   * BLE functions //todo:
+   * NTP server functions
   */
- protected:
+  // No functions of this type supported
+
  /*
-   * Battery functions //todo:
+   * BLE functions
   */
- protected:
+  // No functions of this type supported
+
+  /*
+   * Battery functions
+   */
+  // No functions of this type supported
+
  /*
   * Temperature functions
   */
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -19,17 +19,17 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGPS.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
 #include "TinyGsmSSL.tpp"
-#include "TinyGsmTemperature.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGPS.tpp"
 #include "TinyGsmTime.tpp"
 #include "TinyGsmNTP.tpp"
+#include "TinyGsmBattery.tpp"
+#include "TinyGsmTemperature.tpp"

 enum BG96RegStatus {
  REG_NO_RESULT    = -1,
@@ -47,9 +47,9 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
                    public TinyGsmSSL<TinyGsmBG96, TINY_GSM_MUX_COUNT>,
                    public TinyGsmCalling<TinyGsmBG96>,
                    public TinyGsmSMS<TinyGsmBG96>,
+                    public TinyGsmGPS<TinyGsmBG96>,
                    public TinyGsmTime<TinyGsmBG96>,
                    public TinyGsmNTP<TinyGsmBG96>,
-                    public TinyGsmGPS<TinyGsmBG96>,
                    public TinyGsmBattery<TinyGsmBG96>,
                    public TinyGsmTemperature<TinyGsmBG96> {
  friend class TinyGsmModem<TinyGsmBG96>;
@@ -58,9 +58,9 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
  friend class TinyGsmSSL<TinyGsmBG96, TINY_GSM_MUX_COUNT>;
  friend class TinyGsmCalling<TinyGsmBG96>;
  friend class TinyGsmSMS<TinyGsmBG96>;
+  friend class TinyGsmGPS<TinyGsmBG96>;
  friend class TinyGsmTime<TinyGsmBG96>;
  friend class TinyGsmNTP<TinyGsmBG96>;
-  friend class TinyGsmGPS<TinyGsmBG96>;
  friend class TinyGsmBattery<TinyGsmBG96>;
  friend class TinyGsmTemperature<TinyGsmBG96>;

@@ -264,9 +264,13 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
  /*
   * Secure socket layer (SSL) functions
   */
- protected:
  // Follows functions as inherited from TinyGsmSSL.tpp

+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -314,14 +318,17 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
  /*
   * Phone Call functions
   */
- protected:
  // Follows all phone call functions as inherited from TinyGsmCalling.tpp

  /*
-   * Messaging functions
+   * Audio functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp

  /*
   * GSM Location functions
@@ -555,10 +562,14 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,

  String ShowNTPErrorImpl(byte error) TINY_GSM_ATTR_NOT_IMPLEMENTED;

+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
- protected:
  // Follows all battery functions as inherited from TinyGsmBattery.tpp

  /*
--- a/src/TinyGsmClientESP8266.h
+++ b/src/TinyGsmClientESP8266.h
@@ -20,8 +20,8 @@
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

 #include "TinyGsmModem.tpp"
-#include "TinyGsmSSL.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmSSL.tpp"
 #include "TinyGsmWifi.tpp"

 static uint8_t TINY_GSM_TCP_KEEP_ALIVE = 120;
@@ -44,13 +44,13 @@ enum ESP8266RegStatus {
 };

 class TinyGsmESP8266 : public TinyGsmModem<TinyGsmESP8266>,
-                       public TinyGsmWifi<TinyGsmESP8266>,
                       public TinyGsmTCP<TinyGsmESP8266, TINY_GSM_MUX_COUNT>,
-                       public TinyGsmSSL<TinyGsmESP8266, TINY_GSM_MUX_COUNT> {
+                       public TinyGsmSSL<TinyGsmESP8266, TINY_GSM_MUX_COUNT>,
+                       public TinyGsmWifi<TinyGsmESP8266> {
  friend class TinyGsmModem<TinyGsmESP8266>;
-  friend class TinyGsmWifi<TinyGsmESP8266>;
  friend class TinyGsmTCP<TinyGsmESP8266, TINY_GSM_MUX_COUNT>;
  friend class TinyGsmSSL<TinyGsmESP8266, TINY_GSM_MUX_COUNT>;
+  friend class TinyGsmWifi<TinyGsmESP8266>;

  /*
   * Inner Client
@@ -315,6 +315,12 @@ class TinyGsmESP8266 : public TinyGsmModem<TinyGsmESP8266>,
    return res2;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // Follows functions as inherited from TinyGsmSSL.tpp
+
+
  /*
   * WiFi functions
   */
@@ -340,6 +346,62 @@ class TinyGsmESP8266 : public TinyGsmModem<TinyGsmESP8266>,
    return retVal;
  }

+
+  /*
+   * GPRS functions
+   */
+  // No functions of this type supported
+
+  /*
+   * SIM card functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GSM Location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Time functions
+   */
+  // No functions of this type supported
+
+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Battery functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Temperature functions
+   */
+  // No functions of this type supported
+
  /*
   * Client related functions
   */
--- a/src/TinyGsmClientM590.h
+++ b/src/TinyGsmClientM590.h
@@ -19,10 +19,10 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmGPRS.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmSMS.tpp"
 #include "TinyGsmTime.tpp"

 enum M590RegStatus {
@@ -102,6 +102,11 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
    String remoteIP() TINY_GSM_ATTR_NOT_IMPLEMENTED;
  };

+  /*
+   * Inner Secure Client
+   */
+  // NOT SUPPORTED
+
  /*
   * Constructor
   */
@@ -233,6 +238,16 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // No functions of this type supported
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -295,18 +310,67 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
 protected:
  // Able to follow all SIM card functions as inherited from TinyGsmGPRS.tpp

+
  /*
-   * Messaging functions
+   * Phone Call functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
   */
 protected:
  bool sendSMS_UTF16Impl(const String& number, const void* text,
                         size_t len) TINY_GSM_ATTR_NOT_AVAILABLE;

+  /*
+   * GSM Location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported
+
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp
+  /*
+   * NTP server functions
+   */
+  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Battery functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Temperature functions
+   */
+  // No functions of this type supported

  /*
   * Client related functions
--- a/src/TinyGsmClientM95.h
+++ b/src/TinyGsmClientM95.h
@@ -20,14 +20,14 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
-#include "TinyGsmTemperature.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
 #include "TinyGsmTime.tpp"
+#include "TinyGsmBattery.tpp"
+#include "TinyGsmTemperature.tpp"

 enum M95RegStatus {
  REG_NO_RESULT    = -1,
@@ -117,29 +117,7 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
  /*
   * Inner Secure Client
   */
-
-  /*
-    class GsmClientSecureM95 : public GsmClientM95
-    {
-    public:
-      GsmClientSecure() {}
-
-      GsmClientSecure(TinyGsmm95& modem, uint8_t mux = 0)
-       : GsmClient(modem, mux)
-      {}
-
-
-    public:
-      int connect(const char* host, uint16_t port, int timeout_s) override {
-        stop();
-        TINY_GSM_YIELD();
-        rx.clear();
-        sock_connected = at->modemConnect(host, port, mux, true, timeout_s);
-        return sock_connected;
-      }
-      TINY_GSM_CLIENT_CONNECT_OVERRIDES
-    };
-  */
+  // NOT SUPPORTED

  /*
   * Constructor
@@ -257,6 +235,16 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // No functions of this type supported
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -352,14 +340,17 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
  /*
   * Phone Call functions
   */
- protected:
  // Follows all phone call functions as inherited from TinyGsmCalling.tpp

+
  /*
-   * Messaging functions
+   * Audio functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp

 public:
  /** Delete all SMS */
@@ -371,12 +362,41 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
    return false;
  }

+  /*
+   * GSM Location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported
+
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

+  /*
+   * NTP server functions
+   */
+  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
--- a/src/TinyGsmClientMC60.h
+++ b/src/TinyGsmClientMC60.h
@@ -22,13 +22,13 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
 #include "TinyGsmTime.tpp"
+#include "TinyGsmBattery.tpp"

 enum MC60RegStatus {
  REG_NO_RESULT    = -1,
@@ -116,29 +116,7 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
  /*
   * Inner Secure Client
   */
-
-  /*
-    class GsmClientSecureMC60 : public GsmClientMC60
-    {
-    public:
-      GsmClientSecure() {}
-
-      GsmClientSecure(TinyGsmMC60& modem, uint8_t mux = 0)
-       : GsmClient(modem, mux)
-      {}
-
-
-    public:
-      int connect(const char* host, uint16_t port, int timeout_s) override {
-        stop();
-        TINY_GSM_YIELD();
-        rx.clear();
-        sock_connected = at->modemConnect(host, port, mux, true, timeout_s);
-        return sock_connected;
-      }
-      TINY_GSM_CLIENT_CONNECT_OVERRIDES
-    };
- */
+  // NOT SUPPORTED

  /*
   * Constructor
@@ -243,6 +221,16 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // No functions of this type supported
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -335,14 +323,17 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
  /*
   * Phone Call functions
   */
- protected:
  // Follows all phone call functions as inherited from TinyGsmCalling.tpp

  /*
-   * Messaging functions
+   * Audio functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp

 public:
  /** Delete all SMS */
@@ -354,17 +345,51 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
    return false;
  }

+  /*
+   * GSM Location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported
+
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
  // Follows all battery functions as inherited from TinyGsmBattery.tpp

+  /*
+   * Temperature functions
+   */
+  // No functions of this type supported
+
  /*
   * Client related functions
   */
--- a/src/TinyGsmClientSIM5360.h
+++ b/src/TinyGsmClientSIM5360.h
@@ -19,16 +19,16 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGPS.tpp"
-#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
-#include "TinyGsmTemperature.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGSMLocation.tpp"
+#include "TinyGsmGPS.tpp"
 #include "TinyGsmTime.tpp"
 #include "TinyGsmNTP.tpp"
+#include "TinyGsmBattery.tpp"
+#include "TinyGsmTemperature.tpp"

 enum SIM5360RegStatus {
  REG_NO_RESULT    = -1,
@@ -44,20 +44,20 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
                       public TinyGsmGPRS<TinyGsmSim5360>,
                       public TinyGsmTCP<TinyGsmSim5360, TINY_GSM_MUX_COUNT>,
                       public TinyGsmSMS<TinyGsmSim5360>,
-                       public TinyGsmTime<TinyGsmSim5360>,
-                       public TinyGsmNTP<TinyGsmSim5360>,
                       public TinyGsmGSMLocation<TinyGsmSim5360>,
                       public TinyGsmGPS<TinyGsmSim5360>,
+                       public TinyGsmTime<TinyGsmSim5360>,
+                       public TinyGsmNTP<TinyGsmSim5360>,
                       public TinyGsmBattery<TinyGsmSim5360>,
                       public TinyGsmTemperature<TinyGsmSim5360> {
  friend class TinyGsmModem<TinyGsmSim5360>;
  friend class TinyGsmGPRS<TinyGsmSim5360>;
  friend class TinyGsmTCP<TinyGsmSim5360, TINY_GSM_MUX_COUNT>;
  friend class TinyGsmSMS<TinyGsmSim5360>;
-  friend class TinyGsmTime<TinyGsmSim5360>;
-  friend class TinyGsmNTP<TinyGsmSim5360>;
  friend class TinyGsmGSMLocation<TinyGsmSim5360>;
  friend class TinyGsmGPS<TinyGsmSim5360>;
+  friend class TinyGsmTime<TinyGsmSim5360>;
+  friend class TinyGsmNTP<TinyGsmSim5360>;
  friend class TinyGsmBattery<TinyGsmSim5360>;
  friend class TinyGsmTemperature<TinyGsmSim5360>;

@@ -122,27 +122,7 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
  /*
   * Inner Secure Client
   */
-
-  // TODO(?): Add SSL support
-  /*
-  class GsmClientSecureSim5360 : public GsmClientSim5360 {
-   public:
-    GsmClientSecureSim5360() {}
-
-    explicit GsmClientSecureSim5360(TinyGsmSim5360& modem, uint8_t mux = 0)
-      : GsmClientSim5360(modem, mux) {}
-
-   public:
-    int connect(const char* host, uint16_t port, int timeout_s) override {
-      stop();
-      TINY_GSM_YIELD();
-      rx.clear();
-      sock_connected = at->modemConnect(host, port, mux, true, timeout_s);
-      return sock_connected;
-    }
-    TINY_GSM_CLIENT_CONNECT_OVERRIDES
-  };
-  */
+  // NOT SUPPORTED

  /*
   * Constructor
@@ -296,6 +276,16 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // No functions of this type supported
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -410,7 +400,42 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
  }

  /*
-   * GPS location functions
+   * SIM card functions
+   */
+ protected:
+  // Gets the CCID of a sim card via AT+CCID
+  String getSimCCIDImpl() {
+    sendAT(GF("+CICCID"));
+    if (waitResponse(GF(AT_NL "+ICCID:")) != 1) { return ""; }
+    String res = stream.readStringUntil('\n');
+    waitResponse();
+    res.trim();
+    return res;
+  }
+
+  /*
+   * Phone Call functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp
+
+  /*
+   * GSM Location functions
+   */
+  // SIM5360 and SIM7100 can return a GSM-based location from CLBS as per the
+  // template; SIM5320 doesn't not appear to be able to
+
+  /*
+   * GPS/GNSS/GLONASS location functions
   */
 protected:
  // enable GPS
@@ -507,37 +532,9 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
    return false;
  }

-  /*
-   * SIM card functions
-   */
- protected:
-  // Gets the CCID of a sim card via AT+CCID
-  String getSimCCIDImpl() {
-    sendAT(GF("+CICCID"));
-    if (waitResponse(GF(AT_NL "+ICCID:")) != 1) { return ""; }
-    String res = stream.readStringUntil('\n');
-    waitResponse();
-    res.trim();
-    return res;
-  }
-
-  /*
-   * Messaging functions
-   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
-
-  /*
-   * GSM Location functions
-   */
- protected:
-  // SIM5360 and SIM7100 can return a GSM-based location from CLBS as per the
-  // template; SIM5320 doesn't not appear to be able to
-
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

  /*
@@ -545,6 +542,11 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
   */
  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp

+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
--- a/src/TinyGsmClientSIM7000.h
+++ b/src/TinyGsmClientSIM7000.h
@@ -158,7 +158,6 @@ class TinyGsmSim7000 : public TinyGsmSim70xx<TinyGsmSim7000>,
  /*
   * Power functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
@@ -175,6 +174,16 @@ class TinyGsmSim7000 : public TinyGsmSim70xx<TinyGsmSim7000>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // NOTE:  Use modem TinyGsmSim7000SSL for a secure client!
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -266,19 +275,32 @@ class TinyGsmSim7000 : public TinyGsmSim70xx<TinyGsmSim7000>,
  /*
   * SIM card functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
-   * Messaging functions
+   * Phone Call functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp
+
+  /*
+   * GSM Location functions
+   */
+  // Follows all GSM-based location functions as inherited from
+  // TinyGsmGSMLocation.tpp

  /*
   * GPS/GNSS/GLONASS location functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
@@ -291,12 +313,21 @@ class TinyGsmSim7000 : public TinyGsmSim70xx<TinyGsmSim7000>,
   */
  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp

+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
- protected:
  // Follows all battery functions as inherited from TinyGsmBattery.tpp

+  /*
+   * Temperature functions
+   */
+  // No functions of this type supported
+
  /*
   * Client related functions
   */
--- a/src/TinyGsmClientSIM7000SSL.h
+++ b/src/TinyGsmClientSIM7000SSL.h
@@ -106,7 +106,7 @@ class TinyGsmSim7000SSL
  /*
   * Inner Secure Client
   */
-
+ public:
  class GsmClientSecureSIM7000SSL : public GsmClientSim7000SSL {
   public:
    GsmClientSecureSIM7000SSL() {}
@@ -115,7 +115,6 @@ class TinyGsmSim7000SSL
                                       uint8_t            mux = 0)
        : GsmClientSim7000SSL(modem, mux) {}

-   public:
    bool setCertificate(const String& certificateName) {
      return at->setCertificate(certificateName, mux);
    }
@@ -202,7 +201,6 @@ class TinyGsmSim7000SSL
  /*
   * Power functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
@@ -221,9 +219,13 @@ class TinyGsmSim7000SSL
  /*
   * Secure socket layer (SSL) functions
   */
- protected:
  // Follows functions as inherited from TinyGsmSSL.tpp

+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -302,19 +304,31 @@ class TinyGsmSim7000SSL
  /*
   * SIM card functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
-   * Messaging functions
+   * Phone Call functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp
+  /*
+   * GSM Location functions
+   */
+  // Follows all GSM-based location functions as inherited from
+  // TinyGsmGSMLocation.tpp

  /*
   * GPS/GNSS/GLONASS location functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
@@ -327,12 +341,21 @@ class TinyGsmSim7000SSL
   */
  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp

+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
- protected:
  // Follows all battery functions as inherited from TinyGsmBattery.tpp

+  /*
+   * Temperature functions
+   */
+  // No functions of this type supported
+
  /*
   * Client related functions
   */
--- a/src/TinyGsmClientSIM7080.h
+++ b/src/TinyGsmClientSIM7080.h
@@ -105,7 +105,7 @@ class TinyGsmSim7080 : public TinyGsmSim70xx<TinyGsmSim7080>,
  /*
   * Inner Secure Client
   */
-
+ public:
  class GsmClientSecureSIM7080 : public GsmClientSim7080 {
   public:
    GsmClientSecureSIM7080() {}
@@ -113,13 +113,11 @@ class TinyGsmSim7080 : public TinyGsmSim70xx<TinyGsmSim7080>,
    explicit GsmClientSecureSIM7080(TinyGsmSim7080& modem, uint8_t mux = 0)
        : GsmClientSim7080(modem, mux) {}

-   public:
    bool setCertificate(const String& certificateName) {
      return at->setCertificate(certificateName, mux);
    }

-    virtual int connect(const char* host, uint16_t port,
-                        int timeout_s) override {
+    int connect(const char* host, uint16_t port, int timeout_s) override {
      stop();
      TINY_GSM_YIELD();
      rx.clear();
@@ -134,8 +132,7 @@ class TinyGsmSim7080 : public TinyGsmSim70xx<TinyGsmSim7080>,
   */
 public:
  explicit TinyGsmSim7080(Stream& stream)
-      : TinyGsmSim70xx<TinyGsmSim7080>(stream),
-        certificates() {
+      : TinyGsmSim70xx<TinyGsmSim7080>(stream) {
    memset(sockets, 0, sizeof(sockets));
  }

@@ -242,9 +239,13 @@ class TinyGsmSim7080 : public TinyGsmSim70xx<TinyGsmSim7080>,
  /*
   * Secure socket layer (SSL) functions
   */
- protected:
  // Follows functions as inherited from TinyGsmSSL.tpp

+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -330,19 +331,32 @@ class TinyGsmSim7080 : public TinyGsmSim70xx<TinyGsmSim7080>,
  /*
   * SIM card functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
-   * Messaging functions
+   * Phone Call functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp
+
+  /*
+   * GSM Location functions
+   */
+  // Follows all GSM-based location functions as inherited from
+  // TinyGsmGSMLocation.tpp

  /*
   * GPS/GNSS/GLONASS location functions
   */
- protected:
  // Follows functions as inherited from TinyGsmClientSIM70xx.h

  /*
@@ -353,7 +367,7 @@ class TinyGsmSim7080 : public TinyGsmSim70xx<TinyGsmSim7080>,
  /*
   * NTP server functions
   */
-
+ protected:
  byte NTPServerSyncImpl(String server = "pool.ntp.org", int TimeZone = 0) {
    // Set GPRS bearer profile to associate with NTP sync
    // this may fail, it's not supported by all modules
@@ -393,12 +407,21 @@ class TinyGsmSim7080 : public TinyGsmSim70xx<TinyGsmSim7080>,
    }
  }

+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
- protected:
  // Follows all battery functions as inherited from TinyGsmBattery.tpp

+  /*
+   * Temperature functions
+   */
+  // No functions of this type supported
+
  /*
   * Client related functions
   */
--- a/src/TinyGsmClientSIM70xx.h
+++ b/src/TinyGsmClientSIM70xx.h
@@ -16,10 +16,9 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
+#include "TinyGsmModem.tpp"
 #include "TinyGsmGPRS.tpp"
 #include "TinyGsmGPS.tpp"
-#include "TinyGsmModem.tpp"

 enum SIM70xxRegStatus {
  REG_NO_RESULT    = -1,
@@ -235,12 +234,6 @@ class TinyGsmSim70xx : public TinyGsmModem<SIM70xxType>,
    return res;
  }

-  /*
-   * Messaging functions
-   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
-
  /*
   * GPS/GNSS/GLONASS location functions
   */
@@ -352,27 +345,6 @@ class TinyGsmSim70xx : public TinyGsmModem<SIM70xxType>,
    thisModem().waitResponse();
    return false;
  }
-
-  /*
-   * Time functions
-   */
-  // Follows all clock functions as inherited from TinyGsmTime.tpp
-
-  /*
-   * NTP server functions
-   */
-  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp
-
-  /*
-   * Battery functions
-   */
- protected:
-  // Follows all battery functions as inherited from TinyGsmBattery.tpp
-
-  /*
-   * Client related functions
-   */
-  // should implement in sub-classes
  bool handleURCs(String& data) {
    return thisModem().handleURCs(data);
  }
--- a/src/TinyGsmClientSIM7600.h
+++ b/src/TinyGsmClientSIM7600.h
@@ -19,17 +19,17 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGPS.tpp"
-#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
 #include "TinyGsmTCP.tpp"
-#include "TinyGsmTemperature.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGSMLocation.tpp"
+#include "TinyGsmGPS.tpp"
 #include "TinyGsmTime.tpp"
 #include "TinyGsmNTP.tpp"
+#include "TinyGsmBattery.tpp"
+#include "TinyGsmTemperature.tpp"


 enum SIM7600RegStatus {
@@ -126,28 +126,7 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
  /*
   * Inner Secure Client
   */
-
-  /*TODO(?))
-  class GsmClientSecureSIM7600 : public GsmClientSim7600
-  {
-  public:
-    GsmClientSecure() {}
-
-    GsmClientSecure(TinyGsmSim7600& modem, uint8_t mux = 0)
-     : public GsmClient(modem, mux)
-    {}
-
-  public:
-    int connect(const char* host, uint16_t port, int timeout_s) override {
-      stop();
-      TINY_GSM_YIELD();
-      rx.clear();
-      sock_connected = at->modemConnect(host, port, mux, true, timeout_s);
-      return sock_connected;
-    }
-    TINY_GSM_CLIENT_CONNECT_OVERRIDES
-  };
-  */
+  // NOT SUPPORTED

  /*
   * Constructor
@@ -310,6 +289,16 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // No functions of this type supported
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -424,15 +413,18 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
  }

  /*
-   * Messaging functions
+   * Audio functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  //  No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp

  /*
   * GSM Location functions
   */
- protected:
  // Follows all GSM-based location functions as inherited from
  // TinyGsmGSMLocation.tpp

@@ -547,7 +539,6 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
    return false;
  }

-
  /**
   *  CGNSSMODE: <gnss_mode>,<dpo_mode>
   *  This command is used to configure GPS, GLONASS, BEIDOU and QZSS support
@@ -573,7 +564,6 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

  /*
@@ -581,6 +571,11 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
   */
  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp

+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -20,16 +20,16 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
-#include "TinyGsmSSL.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmSSL.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmTime.tpp"
 #include "TinyGsmNTP.tpp"
+#include "TinyGsmBattery.tpp"

 enum SIM800RegStatus {
  REG_NO_RESULT    = -1,
@@ -130,7 +130,6 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
    explicit GsmClientSecureSim800(TinyGsmSim800& modem, uint8_t mux = 0)
        : GsmClientSim800(modem, mux) {}

-   public:
    int connect(const char* host, uint16_t port, int timeout_s) override {
      stop();
      TINY_GSM_YIELD();
@@ -306,6 +305,16 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // Follows functions as inherited from TinyGsmSSL.tpp
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -421,26 +430,6 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
    return waitResponse() == 1;
  }

-  /*
-   * Messaging functions
-   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
-
-  /*
-   * GSM Location functions
-   */
- protected:
-  // Depending on the exacty model and firmware revision, should return a
-  // GSM-based location from CLBS as as inherited from TinyGsmGSMLocation.tpp
-  // TODO(?):  Check number of digits in year (2 or 4)
-
-  /*
-   * GPS/GNSS/GLONASS location functions
-   */
- protected:
-  // No functions of this type supported
-
  /*
   * Audio functions
   */
@@ -480,10 +469,26 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
    return waitResponse();
  }

+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp
+
+  /*
+   * GSM Location functions
+   */
+  // Depending on the exacty model and firmware revision, should return a
+  // GSM-based location from CLBS as as inherited from TinyGsmGSMLocation.tpp
+  // TODO(?):  Check number of digits in year (2 or 4)
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported
+
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

  /*
@@ -491,16 +496,20 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
   */
  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp

+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
- protected:
  // Follows all battery functions as inherited from TinyGsmBattery.tpp

  /*
-   * NTP server functions
+   * Temperature functions
   */
-  // Follows all NTP server functions as inherited from TinyGsmNTP.tpp
+  // No functions of this type supported

  /*
   * Client related functions
--- a/src/TinyGsmClientSaraR4.h
+++ b/src/TinyGsmClientSaraR4.h
@@ -19,16 +19,16 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGPS.tpp"
-#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
-#include "TinyGsmSSL.tpp"
 #include "TinyGsmTCP.tpp"
-#include "TinyGsmTemperature.tpp"
+#include "TinyGsmSSL.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGSMLocation.tpp"
+#include "TinyGsmGPS.tpp"
 #include "TinyGsmTime.tpp"
+#include "TinyGsmBattery.tpp"
+#include "TinyGsmTemperature.tpp"

 enum SaraR4RegStatus {
  REG_NO_RESULT    = -1,
@@ -44,22 +44,22 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
                      public TinyGsmGPRS<TinyGsmSaraR4>,
                      public TinyGsmTCP<TinyGsmSaraR4, TINY_GSM_MUX_COUNT>,
                      public TinyGsmSSL<TinyGsmSaraR4, TINY_GSM_MUX_COUNT>,
-                      public TinyGsmBattery<TinyGsmSaraR4>,
+                      public TinyGsmSMS<TinyGsmSaraR4>,
                      public TinyGsmGSMLocation<TinyGsmSaraR4>,
                      public TinyGsmGPS<TinyGsmSaraR4>,
-                      public TinyGsmSMS<TinyGsmSaraR4>,
-                      public TinyGsmTemperature<TinyGsmSaraR4>,
-                      public TinyGsmTime<TinyGsmSaraR4> {
+                      public TinyGsmTime<TinyGsmSaraR4>,
+                      public TinyGsmBattery<TinyGsmSaraR4>,
+                      public TinyGsmTemperature<TinyGsmSaraR4> {
  friend class TinyGsmModem<TinyGsmSaraR4>;
  friend class TinyGsmGPRS<TinyGsmSaraR4>;
  friend class TinyGsmTCP<TinyGsmSaraR4, TINY_GSM_MUX_COUNT>;
  friend class TinyGsmSSL<TinyGsmSaraR4, TINY_GSM_MUX_COUNT>;
-  friend class TinyGsmBattery<TinyGsmSaraR4>;
+  friend class TinyGsmSMS<TinyGsmSaraR4>;
  friend class TinyGsmGSMLocation<TinyGsmSaraR4>;
  friend class TinyGsmGPS<TinyGsmSaraR4>;
-  friend class TinyGsmSMS<TinyGsmSaraR4>;
-  friend class TinyGsmTemperature<TinyGsmSaraR4>;
  friend class TinyGsmTime<TinyGsmSaraR4>;
+  friend class TinyGsmTemperature<TinyGsmSaraR4>;
+  friend class TinyGsmBattery<TinyGsmSaraR4>;

  /*
   * Inner Client
@@ -349,6 +349,16 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
    return restart();
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // Follows functions as inherited from TinyGsmSSL.tpp
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -415,7 +425,17 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
  }

  /*
-   * Messaging functions
+   * Phone Call functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
   */
 protected:
  String sendUSSDImpl(const String& code) TINY_GSM_ATTR_NOT_IMPLEMENTED;
@@ -583,9 +603,28 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
--- a/src/TinyGsmClientSaraR5.h
+++ b/src/TinyGsmClientSaraR5.h
@@ -19,16 +19,16 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGPS.tpp"
-#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
-#include "TinyGsmSSL.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmSSL.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGSMLocation.tpp"
+#include "TinyGsmGPS.tpp"
 #include "TinyGsmTime.tpp"
+#include "TinyGsmBattery.tpp"

 #include <string.h>

@@ -460,14 +460,12 @@ class TinyGsmSaraR5 : public TinyGsmModem<TinyGsmSaraR5>,
  /*
   * Phone Call functions
   */
- protected:
  // Follows all phone call functions as inherited from TinyGsmCalling.tpp

  /*
-   * Messaging functions
+   * Text messaging (SMS) functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp

  /*
   * GSM/GPS/GNSS/GLONASS Location functions
@@ -621,7 +619,6 @@ class TinyGsmSaraR5 : public TinyGsmModem<TinyGsmSaraR5>,
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

  /*
--- a/src/TinyGsmClientSequansMonarch.h
+++ b/src/TinyGsmClientSequansMonarch.h
@@ -18,14 +18,14 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
-#include "TinyGsmSSL.tpp"
 #include "TinyGsmTCP.tpp"
-#include "TinyGsmTemperature.tpp"
+#include "TinyGsmSSL.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
 #include "TinyGsmTime.tpp"
+#include "TinyGsmTemperature.tpp"

 enum MonarchRegStatus {
  REG_NO_RESULT    = -1,
@@ -336,6 +336,16 @@ class TinyGsmSequansMonarch
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // Follows functions as inherited from TinyGsmSSL.tpp
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -397,18 +407,56 @@ class TinyGsmSequansMonarch
  bool dtmfSendImpl(char cmd,
                    int  duration_ms = 100) TINY_GSM_ATTR_NOT_AVAILABLE;

+
  /*
-   * Messaging functions
+   * Audio functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp
+
+  /*
+   * GSM Location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported

  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Battery functions
+   */
+  // No functions of this type supportedp
+
  /*
   * Temperature functions
   */
@@ -424,6 +472,9 @@ class TinyGsmSequansMonarch
    return res.toFloat();
  }

+  /*
+   * Client related functions
+   */
 protected:
  bool modemConnect(const char* host, uint16_t port, uint8_t mux,
                    bool ssl = false, int timeout_s = 75) {
--- a/src/TinyGsmClientUBLOX.h
+++ b/src/TinyGsmClientUBLOX.h
@@ -19,16 +19,16 @@
 #endif
 #define AT_NL "\r\n"  // NOTE:  define before including TinyGsmModem!

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmCalling.tpp"
-#include "TinyGsmGPRS.tpp"
-#include "TinyGsmGPS.tpp"
-#include "TinyGsmGSMLocation.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
-#include "TinyGsmSSL.tpp"
 #include "TinyGsmTCP.tpp"
+#include "TinyGsmSSL.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmCalling.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmGSMLocation.tpp"
+#include "TinyGsmGPS.tpp"
 #include "TinyGsmTime.tpp"
+#include "TinyGsmBattery.tpp"

 enum UBLOXRegStatus {
  REG_NO_RESULT    = -1,
@@ -139,7 +139,6 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
    explicit GsmClientSecureUBLOX(TinyGsmUBLOX& modem, uint8_t mux = 0)
        : GsmClientUBLOX(modem, mux) {}

-   public:
    int connect(const char* host, uint16_t port, int timeout_s) override {
      // stop();  // DON'T stop!
      TINY_GSM_YIELD();
@@ -311,6 +310,16 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
    return res;
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // Follows functions as inherited from TinyGsmSSL.tpp
+
+  /*
+   * WiFi functions
+   */
+  // No functions of this type supported
+
  /*
   * GPRS functions
   */
@@ -412,14 +421,17 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
  /*
   * Phone Call functions
   */
- protected:
  // Follows all phone call functions as inherited from TinyGsmCalling.tpp

  /*
-   * Messaging functions
+   * Audio functions
   */
- protected:
-  // Follows all messaging functions as inherited from TinyGsmSMS.tpp
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
+   */
+  // Follows all text messaging (SMS) functions as inherited from TinyGsmSMS.tpp

  /*
   * GSM/GPS/GNSS/GLONASS Location functions
@@ -582,9 +594,18 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
  /*
   * Time functions
   */
- protected:
  // Follows all clock functions as inherited from TinyGsmTime.tpp

+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
@@ -615,7 +636,6 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
  /*
   * Temperature functions
   */
-
  // This would only available for a small number of modules in this group
  // (TOBY-L)
  float getTemperatureImpl() TINY_GSM_ATTR_NOT_IMPLEMENTED;
--- a/src/TinyGsmClientXBee.h
+++ b/src/TinyGsmClientXBee.h
@@ -26,14 +26,14 @@
 #endif
 #define AT_NL "\r"

-#include "TinyGsmBattery.tpp"
-#include "TinyGsmGPRS.tpp"
 #include "TinyGsmModem.tpp"
-#include "TinyGsmSMS.tpp"
-#include "TinyGsmSSL.tpp"
-#include "TinyGsmTCP.tpp"
-#include "TinyGsmTemperature.tpp"
 #include "TinyGsmWifi.tpp"
+#include "TinyGsmGPRS.tpp"
+#include "TinyGsmTCP.tpp"
+#include "TinyGsmSSL.tpp"
+#include "TinyGsmSMS.tpp"
+#include "TinyGsmTemperature.tpp"
+#include "TinyGsmBattery.tpp"

 // Use this to avoid too many entrances and exits from command mode.
 // The cellular Bee's often freeze up and won't respond when attempting
@@ -320,10 +320,11 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
    // Start with the default guard time of 1 second
    memset(sockets, 0, sizeof(sockets));
  }
+
  /*
   * Basic functions
   */
-
+ protected:
  bool initImpl(const char* pin = nullptr) {
    DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
    DBG(GF("### TinyGSM Compiled Module:  TinyGsmClientXBee"));
@@ -824,6 +825,11 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
    return TinyGsmIpFromString(getDNS());
  }

+  /*
+   * Secure socket layer (SSL) functions
+   */
+  // Follows functions as inherited from TinyGsmSSL.tpp
+
  /*
   * WiFi functions
   */
@@ -962,7 +968,17 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
  }

  /*
-   * Messaging functions
+   * Phone Call functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Audio functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Text messaging (SMS) functions
   */
 protected:
  String sendUSSDImpl(const String& code) TINY_GSM_ATTR_NOT_AVAILABLE;
@@ -1015,6 +1031,31 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
    return true;
  }

+  /*
+   * GSM Location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * GPS/GNSS/GLONASS location functions
+   */
+  // No functions of this type supported
+
+  /*
+   * Time functions
+   */
+  // No functions of this type supported
+
+  /*
+   * NTP server functions
+   */
+  // No functions of this type supported
+
+  /*
+   * BLE functions
+   */
+  // No functions of this type supported
+
  /*
   * Battery functions
   */
@@ -1046,7 +1087,7 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
  /*
   * Temperature functions
   */
-
+ protected:
  float getTemperatureImpl() {
    XBEE_COMMAND_START_DECORATOR(5, static_cast<float>(-9999))
    String res = sendATGetString(GF("TP"));
--- a/src/TinyGsmSMS.tpp
+++ b/src/TinyGsmSMS.tpp
@@ -22,7 +22,7 @@ class TinyGsmSMS {
   */
 public:
  /*
-   * Messaging functions
+   * Text messaging (SMS) functions
   */
  String sendUSSD(const String& code) {
    return thisModem().sendUSSDImpl(code);
@@ -124,7 +124,7 @@ class TinyGsmSMS {
   */

  /*
-   * Messaging functions
+   * Text messaging (SMS) functions
   */

  String sendUSSDImpl(const String& code) {