From 8501341062aff40753ead5afaa636ac20a7164eb Mon Sep 17 00:00:00 2001 From: Alberto Iannaccone Date: Mon, 23 Dec 2019 16:36:29 +0100 Subject: [PATCH] add overloaded constructors for optional apn, login and pass in NBConnectionHandler --- src/Arduino_NBConnectionHandler.cpp | 14 ++++++++++++-- src/Arduino_NBConnectionHandler.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Arduino_NBConnectionHandler.cpp b/src/Arduino_NBConnectionHandler.cpp index 8e90d464..03ee911e 100644 --- a/src/Arduino_NBConnectionHandler.cpp +++ b/src/Arduino_NBConnectionHandler.cpp @@ -41,6 +41,16 @@ static const unsigned long NETWORK_CONNECTION_INTERVAL = 30000; /****************************************************************************** CTOR/DTOR ******************************************************************************/ +NBConnectionHandler::NBConnectionHandler(const char *pin, const char *apn, const char *login, const char *pass, bool _keepAlive) : + login(login), + pass(pass) { + NBConnectionHandler(pin, apn, _keepAlive); +} + +NBConnectionHandler::NBConnectionHandler(const char *pin, const char *apn, bool _keepAlive) : + apn(apn) { + NBConnectionHandler(pin, _keepAlive); +} NBConnectionHandler::NBConnectionHandler(const char *pin, bool _keepAlive) : pin(pin), @@ -58,7 +68,7 @@ NBConnectionHandler::NBConnectionHandler(const char *pin, bool _keepAlive) : void NBConnectionHandler::init() { char msgBuffer[120]; - if (nbAccess.begin(pin) == NB_READY) { + if (nbAccess.begin(pin, apn, login, pass) == NB_READY) { Debug.print(DBG_INFO, "SIM card ok"); nbAccess.setTimeout(CHECK_INTERVAL_RETRYING); changeConnectionState(NetworkConnectionState::CONNECTING); @@ -113,7 +123,7 @@ void NBConnectionHandler::update() { case NetworkConnectionState::CONNECTING: { // NOTE: Blocking Call when 4th parameter == true NB_NetworkStatus_t networkStatus; - networkStatus = gprs.attachGPRS(); + networkStatus = gprs.attachGPRS(true); Debug.print(DBG_DEBUG, "GPRS.attachGPRS(): %d", networkStatus); if (networkStatus == NB_NetworkStatus_t::ERROR) { // NO FURTHER ACTION WILL FOLLOW THIS diff --git a/src/Arduino_NBConnectionHandler.h b/src/Arduino_NBConnectionHandler.h index 806d0ad0..02a733d3 100644 --- a/src/Arduino_NBConnectionHandler.h +++ b/src/Arduino_NBConnectionHandler.h @@ -33,6 +33,8 @@ class NBConnectionHandler : public ConnectionHandler { public: NBConnectionHandler(const char *pin, const bool keepAlive = true); + NBConnectionHandler(const char *pin, const char *apn, const bool keepAlive = true); + NBConnectionHandler(const char *pin, const char *apn, const char *login, const char *pass, const bool keepAlive = true); virtual void init(); virtual unsigned long getTime();