Explicit destructors

This commit is contained in:
Sara Damiano
2019-07-17 10:31:54 -04:00
14 changed files with 74 additions and 1 deletions

View File

@@ -57,6 +57,8 @@ public:
init(&modem); init(&modem);
} }
virtual ~GsmClient(){}
bool init(TinyGsmA6* modem) { bool init(TinyGsmA6* modem) {
this->at = modem; this->at = modem;
this->mux = -1; this->mux = -1;
@@ -120,6 +122,8 @@ public:
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmA6() {}
/* /*
* Basic functions * Basic functions

View File

@@ -57,6 +57,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmBG96* modem, uint8_t mux = 1) { bool init(TinyGsmBG96* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -124,6 +126,8 @@ private:
// : GsmClient(modem, mux) // : GsmClient(modem, mux)
// {} // {}
// //
// virtual ~GsmClientSecure(){}
//
// public: // public:
// virtual int connect(const char *host, uint16_t port, int timeout_s) { // virtual int connect(const char *host, uint16_t port, int timeout_s) {
// stop(); // stop();
@@ -142,6 +146,7 @@ public:
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmBG96() {}
/* /*
* Basic functions * Basic functions

View File

@@ -57,6 +57,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmESP8266* modem, uint8_t mux = 1) { bool init(TinyGsmESP8266* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -119,6 +121,8 @@ public:
: GsmClient(modem, mux) : GsmClient(modem, mux)
{} {}
virtual ~GsmClientSecure() {}
public: public:
virtual int connect(const char *host, uint16_t port, int timeout_s) { virtual int connect(const char *host, uint16_t port, int timeout_s) {
stop(); stop();
@@ -138,6 +142,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmESP8266() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -57,6 +57,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmM590* modem, uint8_t mux = 1) { bool init(TinyGsmM590* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -119,6 +121,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmM590() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -57,6 +57,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmM95* modem, uint8_t mux = 1) { bool init(TinyGsmM95* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -122,6 +124,8 @@ private:
// : GsmClient(modem, mux) // : GsmClient(modem, mux)
// {} // {}
// //
// virtual ~GsmClientSecure() {}
//
// public: // public:
// virtual int connect(const char *host, uint16_t port, int timeout_s) { // virtual int connect(const char *host, uint16_t port, int timeout_s) {
// stop(); // stop();
@@ -141,6 +145,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmM95() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -61,6 +61,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmMC60* modem, uint8_t mux = 1) { bool init(TinyGsmMC60* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -126,6 +128,8 @@ private:
// : GsmClient(modem, mux) // : GsmClient(modem, mux)
// {} // {}
// //
// virtual ~GsmClientSecure(){}
//
// public: // public:
// virtual int connect(const char *host, uint16_t port, int timeout_s) { // virtual int connect(const char *host, uint16_t port, int timeout_s) {
// stop(); // stop();
@@ -145,6 +149,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmMC60() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -62,6 +62,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmSim5360* modem, uint8_t mux = 1) { bool init(TinyGsmSim5360* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -128,6 +130,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmSim5360(){}
/* /*
* Basic functions * Basic functions
*/ */
@@ -220,7 +224,7 @@ TINY_GSM_MODEM_GET_INFO_ATI()
delay(3000); delay(3000);
return true; return true;
} }
bool sleepEnable(bool enable = true) { bool sleepEnable(bool enable = true) {
sendAT(GF("+CSCLK="), enable); sendAT(GF("+CSCLK="), enable);
return waitResponse() == 1; return waitResponse() == 1;

View File

@@ -62,6 +62,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmSim7000* modem, uint8_t mux = 1) { bool init(TinyGsmSim7000* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -130,6 +132,8 @@ public:
: GsmClient(modem, mux) : GsmClient(modem, mux)
{} {}
virtual ~GsmClientSecure(){}
public: public:
virtual int connect(const char *host, uint16_t port, int timeout_s) { virtual int connect(const char *host, uint16_t port, int timeout_s) {
stop(); stop();
@@ -150,6 +154,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmSim7000() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -63,6 +63,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmSim800* modem, uint8_t mux = 1) { bool init(TinyGsmSim800* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -130,6 +132,8 @@ public:
: GsmClient(modem, mux) : GsmClient(modem, mux)
{} {}
virtual ~GsmClientSecure(){}
public: public:
virtual int connect(const char *host, uint16_t port, int timeout_s) { virtual int connect(const char *host, uint16_t port, int timeout_s) {
stop(); stop();
@@ -149,6 +153,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmSim800() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -22,6 +22,8 @@ public:
: TinyGsmSim800(stream) : TinyGsmSim800(stream)
{} {}
virtual ~TinyGsmSim808(){}
/* /*
* GPS location functions * GPS location functions
*/ */

View File

@@ -58,6 +58,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmSaraR4* modem, uint8_t mux = 0) { bool init(TinyGsmSaraR4* modem, uint8_t mux = 0) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -134,6 +136,8 @@ public:
: GsmClient(modem, mux) : GsmClient(modem, mux)
{} {}
virtual ~GsmClientSecure(){}
public: public:
virtual int connect(const char *host, uint16_t port, int timeout_s) { virtual int connect(const char *host, uint16_t port, int timeout_s) {
stop(); stop();
@@ -160,6 +164,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmSaraR4(){}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -66,6 +66,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmSequansMonarch* modem, uint8_t mux = 1) { bool init(TinyGsmSequansMonarch* modem, uint8_t mux = 1) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -135,6 +137,8 @@ public:
: GsmClient(modem, mux) : GsmClient(modem, mux)
{} {}
virtual ~GsmClientSecure(){}
protected: protected:
bool strictSSL = false; bool strictSSL = false;
@@ -179,6 +183,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmSequansMonarch() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -58,6 +58,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmUBLOX* modem, uint8_t mux = 0) { bool init(TinyGsmUBLOX* modem, uint8_t mux = 0) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -134,6 +136,8 @@ public:
: GsmClient(modem, mux) : GsmClient(modem, mux)
{} {}
virtual ~GsmClientSecure(){}
public: public:
virtual int connect(const char *host, uint16_t port, int timeout_s) { virtual int connect(const char *host, uint16_t port, int timeout_s) {
stop(); stop();
@@ -160,6 +164,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmUBLOX() {}
/* /*
* Basic functions * Basic functions
*/ */

View File

@@ -80,6 +80,8 @@ public:
init(&modem, mux); init(&modem, mux);
} }
virtual ~GsmClient(){}
bool init(TinyGsmXBee* modem, uint8_t mux = 0) { bool init(TinyGsmXBee* modem, uint8_t mux = 0) {
this->at = modem; this->at = modem;
this->mux = mux; this->mux = mux;
@@ -238,6 +240,8 @@ public:
: GsmClient(modem, mux) : GsmClient(modem, mux)
{} {}
virtual ~GsmClientSecure(){}
public: public:
virtual int connect(const char *host, uint16_t port, int timeout_s) { virtual int connect(const char *host, uint16_t port, int timeout_s) {
// NOTE: Not caling stop() or yeild() here // NOTE: Not caling stop() or yeild() here
@@ -283,6 +287,8 @@ public:
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }
virtual ~TinyGsmXBee() {}
/* /*
* Basic functions * Basic functions
*/ */