diff --git a/examples/AllFunctions/AllFunctions.ino b/examples/AllFunctions/AllFunctions.ino index 8e7573a..10687ab 100644 --- a/examples/AllFunctions/AllFunctions.ino +++ b/examples/AllFunctions/AllFunctions.ino @@ -39,7 +39,7 @@ // or Software Serial on Uno, Nano //#include -//SoftwareSerial SerialAT(2, 3); // RX, TX +// SoftwareSerial SerialAT(2, 3); // RX, TX // See all AT commands, if wanted // #define DUMP_AT_COMMANDS @@ -58,9 +58,9 @@ #define TINY_GSM_TEST_WIFI false #define TINY_GSM_TEST_TCP true #define TINY_GSM_TEST_SSL true -#define TINY_GSM_TEST_CALL false -#define TINY_GSM_TEST_SMS false -#define TINY_GSM_TEST_USSD false +#define TINY_GSM_TEST_CALL true +#define TINY_GSM_TEST_SMS true +#define TINY_GSM_TEST_USSD true #define TINY_GSM_TEST_BATTERY true #define TINY_GSM_TEST_TEMPERATURE true #define TINY_GSM_TEST_GSM_LOCATION true @@ -332,19 +332,19 @@ void loop() { int sec = 0; for (int8_t i = 5; i; i--) { DBG("Waiting for GSM location"); - if (modem.getGsmLocation(&lat, &lon, &accuracy, &year, &month, &day, &hour, - &min, &sec)) { - DBG("Latitude:", String(lat, 8)); - DBG("Longitude:", String(lon, 8)); - DBG("Accuracy:", accuracy); - DBG("Year:", year); - DBG("Month:", month); - DBG("Day:", day); - DBG("Hour:", hour); - DBG("Minute:", min); - DBG("Second:", sec); + if (modem.getGsmLocation(&lat, &lon, &accuracy, &year, &month, &day, &hour, + &min, &sec)) { + DBG("Latitude:", String(lat, 8)); + DBG("Longitude:", String(lon, 8)); + DBG("Accuracy:", accuracy); + DBG("Year:", year); + DBG("Month:", month); + DBG("Day:", day); + DBG("Hour:", hour); + DBG("Minute:", min); + DBG("Second:", sec); break; - } else { + } else { DBG("Couldn't get GSM location, retrying in 10s."); delay(10000L); } @@ -372,22 +372,22 @@ void loop() { for (int8_t i = 5; i; i--) { DBG("Waiting for GPS/GNSS/GLONASS location"); if (modem.getGPS(&lat2, &lon2, &speed2, &alt2, &vsat2, &usat2, &accuracy2, - &year2, &month2, &day2, &hour2, &min2, &sec2)) { - DBG("Latitude:", String(lat2, 8)); - DBG("Longitude:", String(lon2, 8)); - DBG("Speed:", speed2); - DBG("Altitude:", alt2); - DBG("Visible Satellites:", vsat2); - DBG("Used Satellites:", usat2); - DBG("Accuracy:", accuracy2); - DBG("Year:", year2); - DBG("Month:", month2); - DBG("Day:", day2); - DBG("Hour:", hour2); - DBG("Minute:", min2); - DBG("Second:", sec2); + &year2, &month2, &day2, &hour2, &min2, &sec2)) { + DBG("Latitude:", String(lat2, 8)); + DBG("Longitude:", String(lon2, 8)); + DBG("Speed:", speed2); + DBG("Altitude:", alt2); + DBG("Visible Satellites:", vsat2); + DBG("Used Satellites:", usat2); + DBG("Accuracy:", accuracy2); + DBG("Year:", year2); + DBG("Month:", month2); + DBG("Day:", day2); + DBG("Hour:", hour2); + DBG("Minute:", min2); + DBG("Second:", sec2); break; - } else { + } else { DBG("Couldn't get GSM location, retrying in 10s."); delay(10000L); } diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h index b07142c..6c796b1 100644 --- a/src/TinyGsmClientA6.h +++ b/src/TinyGsmClientA6.h @@ -92,7 +92,7 @@ class TinyGsmA6 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { TINY_GSM_YIELD(); at->sendAT(GF("+CIPCLOSE="), mux); sock_connected = false; diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h index c41791b..4d39b22 100644 --- a/src/TinyGsmClientBG96.h +++ b/src/TinyGsmClientBG96.h @@ -92,7 +92,7 @@ class TinyGsmBG96 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { dumpModemBuffer(maxWaitMs); at->sendAT(GF("+QICLOSE="), mux); sock_connected = false; diff --git a/src/TinyGsmClientESP8266.h b/src/TinyGsmClientESP8266.h index 934e294..209f00a 100644 --- a/src/TinyGsmClientESP8266.h +++ b/src/TinyGsmClientESP8266.h @@ -81,7 +81,7 @@ class TinyGsmESP8266 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { TINY_GSM_YIELD(); at->sendAT(GF("+CIPCLOSE="), mux); sock_connected = false; diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h index 531d573..750d797 100644 --- a/src/TinyGsmClientM590.h +++ b/src/TinyGsmClientM590.h @@ -83,7 +83,7 @@ class TinyGsmM590 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { TINY_GSM_YIELD(); at->sendAT(GF("+TCPCLOSE="), mux); sock_connected = false; diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h index bf7b1bd..122771f 100644 --- a/src/TinyGsmClientM95.h +++ b/src/TinyGsmClientM95.h @@ -94,7 +94,7 @@ class TinyGsmM95 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { uint32_t startMillis = millis(); dumpModemBuffer(maxWaitMs); at->sendAT(GF("+QICLOSE="), mux); diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h index 4b0daec..78a062c 100644 --- a/src/TinyGsmClientMC60.h +++ b/src/TinyGsmClientMC60.h @@ -93,7 +93,7 @@ class TinyGsmMC60 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { uint32_t startMillis = millis(); dumpModemBuffer(maxWaitMs); at->sendAT(GF("+QICLOSE="), mux); diff --git a/src/TinyGsmClientSIM5360.h b/src/TinyGsmClientSIM5360.h index 12fb879..b0992d5 100644 --- a/src/TinyGsmClientSIM5360.h +++ b/src/TinyGsmClientSIM5360.h @@ -95,7 +95,7 @@ class TinyGsmSim5360 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { dumpModemBuffer(maxWaitMs); at->sendAT(GF("+CIPCLOSE="), mux); sock_connected = false; diff --git a/src/TinyGsmClientSIM7000.h b/src/TinyGsmClientSIM7000.h index 5c3ee2b..ee81a45 100644 --- a/src/TinyGsmClientSIM7000.h +++ b/src/TinyGsmClientSIM7000.h @@ -92,7 +92,7 @@ class TinyGsmSim7000 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { dumpModemBuffer(maxWaitMs); at->sendAT(GF("+CIPCLOSE="), mux); sock_connected = false; diff --git a/src/TinyGsmClientSIM7600.h b/src/TinyGsmClientSIM7600.h index 576f342..e6a9eed 100644 --- a/src/TinyGsmClientSIM7600.h +++ b/src/TinyGsmClientSIM7600.h @@ -98,7 +98,7 @@ class TinyGsmSim7600 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { dumpModemBuffer(maxWaitMs); at->sendAT(GF("+CIPCLOSE="), mux); sock_connected = false; diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h index a0b599f..83d19f2 100644 --- a/src/TinyGsmClientSIM800.h +++ b/src/TinyGsmClientSIM800.h @@ -98,7 +98,7 @@ class TinyGsmSim800 : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { dumpModemBuffer(maxWaitMs); at->sendAT(GF("+CIPCLOSE="), mux, GF(",1")); // Quick close sock_connected = false; diff --git a/src/TinyGsmClientSaraR4.h b/src/TinyGsmClientSaraR4.h index 9edc74c..e9b55fb 100644 --- a/src/TinyGsmClientSaraR4.h +++ b/src/TinyGsmClientSaraR4.h @@ -118,7 +118,7 @@ class TinyGsmSaraR4 : public TinyGsmModem, return connect(ip, port, 120); } - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { uint32_t startMillis = millis(); dumpModemBuffer(maxWaitMs); // We want to use an async socket close because the syncrhonous close of @@ -186,7 +186,7 @@ class TinyGsmSaraR4 : public TinyGsmModem, at->maintain(); return sock_connected; } - virtual int connect(IPAddress ip, uint16_t port, int timeout_s) { + int connect(IPAddress ip, uint16_t port, int timeout_s) override { return connect(TinyGsmStringFromIp(ip).c_str(), port, timeout_s); } int connect(const char* host, uint16_t port) override { diff --git a/src/TinyGsmClientSequansMonarch.h b/src/TinyGsmClientSequansMonarch.h index b97766a..377d8c6 100644 --- a/src/TinyGsmClientSequansMonarch.h +++ b/src/TinyGsmClientSequansMonarch.h @@ -108,7 +108,7 @@ class TinyGsmSequansMonarch } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { dumpModemBuffer(maxWaitMs); at->sendAT(GF("+SQNSH="), mux); sock_connected = false; diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h index ec94ff4..b486370 100644 --- a/src/TinyGsmClientUBLOX.h +++ b/src/TinyGsmClientUBLOX.h @@ -110,7 +110,7 @@ class TinyGsmUBLOX : public TinyGsmModem, } TINY_GSM_CLIENT_CONNECT_OVERRIDES - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { dumpModemBuffer(maxWaitMs); at->sendAT(GF("+USOCL="), mux); at->waitResponse(); // should return within 1s diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h index d45a90c..788c134 100644 --- a/src/TinyGsmClientXBee.h +++ b/src/TinyGsmClientXBee.h @@ -137,7 +137,7 @@ class TinyGsmXBee : public TinyGsmModem, return connect(ip, port, 0); } - virtual void stop(uint32_t maxWaitMs) { + void stop(uint32_t maxWaitMs) { at->streamClear(); // Empty anything in the buffer // empty the saved currently-in-use destination address at->modemStop(maxWaitMs); diff --git a/src/TinyGsmSSL.tpp b/src/TinyGsmSSL.tpp index 32bca14..d503fbc 100644 --- a/src/TinyGsmSSL.tpp +++ b/src/TinyGsmSSL.tpp @@ -51,7 +51,7 @@ class TinyGsmSSL { : GsmClientSim800(modem, mux) {} public: - int connect(const char* host, uint16_t port, int timeout_s) { + int connect(const char* host, uint16_t port, int timeout_s) overide { stop(); TINY_GSM_YIELD(); rx.clear(); diff --git a/src/TinyGsmTCP.tpp b/src/TinyGsmTCP.tpp index 4d9ab73..e2cc313 100644 --- a/src/TinyGsmTCP.tpp +++ b/src/TinyGsmTCP.tpp @@ -22,7 +22,7 @@ // Because of the ordering of resolution of overrides in templates, these need // to be written out every time. This macro is to shorten that. #define TINY_GSM_CLIENT_CONNECT_OVERRIDES \ - virtual int connect(IPAddress ip, uint16_t port, int timeout_s) { \ + int connect(IPAddress ip, uint16_t port, int timeout_s) { \ return connect(TinyGsmStringFromIp(ip).c_str(), port, timeout_s); \ } \ int connect(const char* host, uint16_t port) override { \