From de4162907d008accefc8b3ef71d6238767a8eb46 Mon Sep 17 00:00:00 2001
From: Sara Damiano <sdamiano@stroudcenter.org>
Date: Thu, 16 May 2019 12:15:48 -0400
Subject: [PATCH 1/2] Added destructors

---
 src/TinyGsmClientA6.h      | 1 +
 src/TinyGsmClientBG96.h    | 1 +
 src/TinyGsmClientESP8266.h | 1 +
 src/TinyGsmClientM590.h    | 1 +
 src/TinyGsmClientM95.h     | 1 +
 src/TinyGsmClientMC60.h    | 1 +
 src/TinyGsmClientSIM7000.h | 1 +
 src/TinyGsmClientSIM800.h  | 1 +
 src/TinyGsmClientUBLOX.h   | 1 +
 src/TinyGsmClientXBee.h    | 2 ++
 src/TinyGsmCommon.h        | 3 +--
 11 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h
index b90d1c2..624b123 100644
--- a/src/TinyGsmClientA6.h
+++ b/src/TinyGsmClientA6.h
@@ -184,6 +184,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmA6() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
index 281689c..8f69d10 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -220,6 +220,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmBG96() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientESP8266.h b/src/TinyGsmClientESP8266.h
index 9f8e333..fdf7db5 100644
--- a/src/TinyGsmClientESP8266.h
+++ b/src/TinyGsmClientESP8266.h
@@ -205,6 +205,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmESP8266() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h
index c16b9c0..e2d87df 100644
--- a/src/TinyGsmClientM590.h
+++ b/src/TinyGsmClientM590.h
@@ -181,6 +181,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmM590() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h
index 9027215..e8ea4b4 100644
--- a/src/TinyGsmClientM95.h
+++ b/src/TinyGsmClientM95.h
@@ -220,6 +220,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmM95() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h
index 591355a..d4671ff 100644
--- a/src/TinyGsmClientMC60.h
+++ b/src/TinyGsmClientMC60.h
@@ -224,6 +224,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmMC60() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientSIM7000.h b/src/TinyGsmClientSIM7000.h
index fd0cbd6..2d913c0 100644
--- a/src/TinyGsmClientSIM7000.h
+++ b/src/TinyGsmClientSIM7000.h
@@ -249,6 +249,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmSim7000() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h
index e613d0d..be468da 100644
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -244,6 +244,7 @@ public:
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmSim800() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h
index c54c60c..ca84334 100644
--- a/src/TinyGsmClientUBLOX.h
+++ b/src/TinyGsmClientUBLOX.h
@@ -254,6 +254,7 @@ public:
     memset(sockets, 0, sizeof(sockets));
     isCatM = false;  // For SARA R4 and N4 series
   }
+  virtual ~TinyGsmUBLOX() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h
index 4d9efa8..c647d7a 100644
--- a/src/TinyGsmClientXBee.h
+++ b/src/TinyGsmClientXBee.h
@@ -277,6 +277,8 @@ public:
       inCommandMode = false;
       memset(sockets, 0, sizeof(sockets));
   }
+  
+  virtual ~TinyGsmXBee() {}
 
   /*
    * Basic functions
diff --git a/src/TinyGsmCommon.h b/src/TinyGsmCommon.h
index 68bf900..7ca2abd 100644
--- a/src/TinyGsmCommon.h
+++ b/src/TinyGsmCommon.h
@@ -211,6 +211,7 @@ public:
   TinyGsmModem(Stream& stream)
     : stream(stream)
   {}
+  virtual ~TinyGsmModem() {}
 
   /*
    * Basic functions
@@ -331,6 +332,4 @@ public:
 };
 
 
-
-
 #endif

From 5d9cc16e20c0b823f29f96edaf26886ae66e9eeb Mon Sep 17 00:00:00 2001
From: Sara Damiano <sdamiano@stroudcenter.org>
Date: Thu, 16 May 2019 12:16:08 -0400
Subject: [PATCH 2/2] made sequans virtual

---
 src/TinyGsmClientSequansMonarch.h | 45 ++-----------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/src/TinyGsmClientSequansMonarch.h b/src/TinyGsmClientSequansMonarch.h
index 02cd12b..c14aeb0 100644
--- a/src/TinyGsmClientSequansMonarch.h
+++ b/src/TinyGsmClientSequansMonarch.h
@@ -243,17 +243,15 @@ public:
 public:
 
   TinyGsmSequansMonarch(Stream& stream)
-    : stream(stream)
+    : TinyGsmModem(stream), stream(stream)
   {
     memset(sockets, 0, sizeof(sockets));
   }
+  virtual ~TinyGsmSequansMonarch() {}
 
   /*
    * Basic functions
    */
-  bool begin() {
-    return init();
-  }
 
   bool init() {
     DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION);
@@ -472,16 +470,6 @@ public:
     }
   }
 
-  bool waitForNetwork(unsigned long timeout = 60000L) {
-    for (unsigned long start = millis(); millis() - start < timeout; ) {
-      if (isNetworkConnected()) {
-        return true;
-      }
-      delay(250);
-    }
-    return false;
-  }
-
   /*
    * GPRS functions
    */
@@ -542,10 +530,6 @@ public:
     return res;
   }
 
-  IPAddress localIP() {
-    return TinyGsmIpFromString(getLocalIP());
-  }
-
   /*
    * Phone Call functions
    */
@@ -710,31 +694,6 @@ public:
 
   /* Utilities */
 
-  bool commandMode(int retries = 2) {
-    streamWrite(GF("+++"));  // enter command mode
-    return true;
-  }
-
-  template<typename T>
-  void streamWrite(T last) {
-    stream.print(last);
-  }
-
-  template<typename T, typename... Args>
-  void streamWrite(T head, Args... tail) {
-    stream.print(head);
-    streamWrite(tail...);
-  }
-
-  bool streamSkipUntil(char c) { //TODO: timeout
-    while (true) {
-      while (!stream.available()) { TINY_GSM_YIELD(); }
-      if (stream.read() == c)
-        return true;
-    }
-    return false;
-  }
-
   template<typename... Args>
   void sendAT(Args... cmd) {
     streamWrite("AT", cmd..., '\r');