Restructuring member variables

Author: aentinger

src/Arduino_NBConnectionHandler.cpp

@@ -41,22 +41,28 @@ static const unsigned long NETWORK_CONNECTION_INTERVAL = 30000;
 /******************************************************************************
    CTOR/DTOR
  ******************************************************************************/
-NBConnectionHandler::NBConnectionHandler(const char *pin, bool _keepAlive) :
-  NBConnectionHandler(pin, "", _keepAlive) {
+NBConnectionHandler::NBConnectionHandler(char const * pin, bool const keep_alive)
+: NBConnectionHandler(pin, "", keep_alive)
+{
+
 }
 
-NBConnectionHandler::NBConnectionHandler(const char *pin, const char *apn, bool _keepAlive) :
-  NBConnectionHandler(pin, apn, "", "", _keepAlive) {
+NBConnectionHandler::NBConnectionHandler(char const * pin, char const * apn, bool const keep_alive)
+: NBConnectionHandler(pin, apn, "", "", keep_alive)
+{
+
 }
 
-NBConnectionHandler::NBConnectionHandler(const char *pin, const char *apn, const char *login, const char *pass, bool _keepAlive) :
-  pin(pin),
-  apn(apn),
-  login(login),
-  pass(pass),
-  lastConnectionTickTime(millis()),
-  connectionTickTimeInterval(CHECK_INTERVAL_IDLE),
-  keepAlive(_keepAlive) {
+NBConnectionHandler::NBConnectionHandler(char const * pin, char const * apn, char const * login, char const * pass, bool const keep_alive)
+: _pin(pin)
+, _apn(apn)
+, _login(login)
+, _pass(pass)
+, lastConnectionTickTime(millis())
+, connectionTickTimeInterval(CHECK_INTERVAL_IDLE)
+, _keep_alive(keep_alive)
+{
+
 }
 
 /******************************************************************************
@@ -65,22 +71,22 @@ NBConnectionHandler::NBConnectionHandler(const char *pin, const char *apn, const
 
 void NBConnectionHandler::init() {
   char msgBuffer[120];
-  if (nbAccess.begin(pin, apn, login, pass) == NB_READY) {
+  if (_nb.begin(_pin, _apn, _login, _pass) == NB_READY) {
     Debug.print(DBG_INFO, "SIM card ok");
-    nbAccess.setTimeout(CHECK_INTERVAL_RETRYING);
+    _nb.setTimeout(CHECK_INTERVAL_RETRYING);
     changeConnectionState(NetworkConnectionState::CONNECTING);
   } else {
     Debug.print(DBG_ERROR, "SIM not present or wrong PIN");
   }
 }
 
 unsigned long NBConnectionHandler::getTime() {
-  return nbAccess.getTime();
+  return _nb.getTime();
 }
 
 NetworkConnectionState NBConnectionHandler::check() {
   unsigned long const now = millis();
-  int nbAccessAlive;
+  int _nbAlive;
   if (now - lastConnectionTickTime > connectionTickTimeInterval) {
     switch (_netConnectionState) {
       case NetworkConnectionState::INIT: {
@@ -91,7 +97,7 @@ NetworkConnectionState NBConnectionHandler::check() {
       case NetworkConnectionState::CONNECTING: {
           // NOTE: Blocking Call when 4th parameter == true
           NB_NetworkStatus_t networkStatus;
-          networkStatus = _gprs.attachGPRS(true);
+          networkStatus = _nb_gprs.attachGPRS(true);
           Debug.print(DBG_DEBUG, "GPRS.attachGPRS(): %d", networkStatus);
           if (networkStatus == NB_NetworkStatus_t::ERROR) {
             // NO FURTHER ACTION WILL FOLLOW THIS
@@ -100,7 +106,7 @@ NetworkConnectionState NBConnectionHandler::check() {
           }
           Debug.print(DBG_INFO, "Sending PING to outer space...");
           int pingResult;
-          // pingResult = _gprs.ping("time.arduino.cc");
+          // pingResult = _nb_gprs.ping("time.arduino.cc");
           // Debug.print(DBG_INFO, "NB.ping(): %d", pingResult);
           // if (pingResult < 0) {
           if (pingResult < 0) {
@@ -115,18 +121,18 @@ NetworkConnectionState NBConnectionHandler::check() {
         }
         break;
       case NetworkConnectionState::CONNECTED: {
-          nbAccessAlive = nbAccess.isAccessAlive();
-          Debug.print(DBG_VERBOSE, "GPRS.isAccessAlive(): %d", nbAccessAlive);
-          if (nbAccessAlive != 1) {
+          _nbAlive = _nb.isAccessAlive();
+          Debug.print(DBG_VERBOSE, "GPRS.isAccessAlive(): %d", _nbAlive);
+          if (_nbAlive != 1) {
             changeConnectionState(NetworkConnectionState::DISCONNECTED);
             return _netConnectionState;
           }
           Debug.print(DBG_VERBOSE, "Connected to Cellular Network");
         }
         break;
       case NetworkConnectionState::DISCONNECTED: {
-          //_gprs.detachGPRS();
-          if (keepAlive) {
+          //_nb_gprs.detachGPRS();
+          if (_keep_alive) {
             Debug.print(DBG_VERBOSE, "keep alive > INIT");
             changeConnectionState(NetworkConnectionState::INIT);
           } else {
@@ -168,14 +174,14 @@ void NBConnectionHandler::changeConnectionState(NetworkConnectionState _newState
       break;
     case NetworkConnectionState::DISCONNECTING: {
         Debug.print(DBG_VERBOSE, "Disconnecting from Cellular Network");
-        nbAccess.shutdown();
+        _nb.shutdown();
       }
     case NetworkConnectionState::DISCONNECTED: {
         if (_netConnectionState == NetworkConnectionState::CONNECTED) {
           execCallback(NetworkConnectionEvent::DISCONNECTED);
           Debug.print(DBG_ERROR, "Disconnected from Cellular Network");
           Debug.print(DBG_ERROR, "Attempting reconnection");
-          if (keepAlive) {
+          if (_keep_alive) {
             Debug.print(DBG_ERROR, "Attempting reconnection");
           }
         }
@@ -198,15 +204,15 @@ void NBConnectionHandler::connect() {
   if (_netConnectionState == NetworkConnectionState::INIT || _netConnectionState == NetworkConnectionState::CONNECTING) {
     return;
   }
-  keepAlive = true;
+  _keep_alive = true;
   changeConnectionState(NetworkConnectionState::INIT);
 
 }
 void NBConnectionHandler::disconnect() {
   //WiFi.end();
 
   changeConnectionState(NetworkConnectionState::DISCONNECTING);
-  keepAlive = false;
+  _keep_alive = false;
 }
 
 #endif /* #ifdef BOARD_HAS_NB  */

src/Arduino_NBConnectionHandler.h

@@ -32,25 +32,15 @@
 
 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);
+    NBConnectionHandler(char const * pin, bool const keep_alive = true);
+    NBConnectionHandler(char const * pin, char const * apn, bool const keep_alive = true);
+    NBConnectionHandler(char const * pin, char const * apn, char const * login, char const * pass, bool const keep_alive = true);
 
     virtual void init();
     virtual unsigned long getTime();
     virtual NetworkConnectionState check();
-    virtual Client &getClient() {
-      return _gsm_client;
-    };
-    virtual UDP &getUDP() {
-      return udp;
-    };
-
-    NBClient _gsm_client;
-    NB  nbAccess;
-    GPRS _gprs;
-    NBUDP udp;
-
+    virtual Client & getClient() { return _nb_client; };
+    virtual UDP & getUDP() { return _nb_udp; };
     virtual void disconnect();
     virtual void connect();
 
@@ -66,13 +56,18 @@ class NBConnectionHandler : public ConnectionHandler {
     const int CHECK_INTERVAL_DISCONNECTED = 1000;
     const int CHECK_INTERVAL_ERROR = 500;
 
-    const char *pin, *apn, *login, *pass;
+    char const * _pin;
+    char const * _apn;
+    char const * _login;
+    char const * _pass;
     unsigned long lastConnectionTickTime;
     int connectionTickTimeInterval;
+    bool _keep_alive;
 
-
-    bool keepAlive;
-
+    NB _nb;
+    GPRS _nb_gprs;
+    NBUDP _nb_udp;
+    NBClient _nb_client;
 };
 
 #endif /* #ifdef BOARD_HAS_NB  */