Managed NBConnectionHandler in the TcpIpConnectionHandlers

Author: mirkokurt

src/Arduino_NBConnectionHandler.cpp

@@ -56,10 +56,7 @@ NBConnectionHandler::NBConnectionHandler(const char *pin, const char *apn, const
   pass(pass),
   lastConnectionTickTime(millis()),
   connectionTickTimeInterval(CHECK_INTERVAL_IDLE),
-  keepAlive(_keepAlive),
-  _on_connect_event_callback(NULL),
-  _on_disconnect_event_callback(NULL),
-  _on_error_event_callback(NULL) {
+  keepAlive(_keepAlive) {
 }
 
 /******************************************************************************
@@ -78,34 +75,6 @@ void NBConnectionHandler::init() {
   }
 }
 
-void NBConnectionHandler::addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback) {
-  switch (event) {
-    case NetworkConnectionEvent::CONNECTED:       _on_connect_event_callback       = callback; break;
-    case NetworkConnectionEvent::DISCONNECTED:    _on_disconnect_event_callback    = callback; break;
-    case NetworkConnectionEvent::ERROR:           _on_error_event_callback         = callback; break;
-    case NetworkConnectionEvent::INIT:                                                       ; break;
-    case NetworkConnectionEvent::CONNECTING:                                                 ; break;
-    case NetworkConnectionEvent::DISCONNECTING:                                              ; break;
-    case NetworkConnectionEvent::CLOSED:                                                     ; break;
-  }
-}
-
-void NBConnectionHandler::addConnectCallback(OnNetworkEventCallback callback) {
-  _on_connect_event_callback = callback;
-}
-void NBConnectionHandler::addDisconnectCallback(OnNetworkEventCallback callback) {
-  _on_disconnect_event_callback = callback;
-}
-void NBConnectionHandler::addErrorCallback(OnNetworkEventCallback callback) {
-  _on_error_event_callback = callback;
-}
-
-void NBConnectionHandler::execNetworkEventCallback(OnNetworkEventCallback & callback, void * callback_arg) {
-  if (callback) {
-    (*callback)(callback_arg);
-  }
-}
-
 unsigned long NBConnectionHandler::getTime() {
   return nbAccess.getTime();
 }

src/Arduino_NBConnectionHandler.h

@@ -30,7 +30,7 @@
    CLASS DECLARATION
  ******************************************************************************/
 
-class NBConnectionHandler : public ConnectionHandler {
+class NBConnectionHandler : public TcpIpConnectionHandler {
   public:
     NBConnectionHandler(const char *pin, const bool keepAlive = true);
     NBConnectionHandler(const char *pin, const char *apn, const bool keepAlive = true);
@@ -57,11 +57,6 @@ class NBConnectionHandler : public ConnectionHandler {
     virtual void disconnect();
     virtual void connect();
 
-    virtual void addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback);
-    virtual void addConnectCallback(OnNetworkEventCallback callback);
-    virtual void addDisconnectCallback(OnNetworkEventCallback callback);
-    virtual void addErrorCallback(OnNetworkEventCallback callback);
-
   private:
 
     void changeConnectionState(NetworkConnectionState _newState);
@@ -81,11 +76,6 @@ class NBConnectionHandler : public ConnectionHandler {
 
     bool keepAlive;
 
-    OnNetworkEventCallback  _on_connect_event_callback,
-                            _on_disconnect_event_callback,
-                            _on_error_event_callback;
-
-    static void execNetworkEventCallback(OnNetworkEventCallback & callback, void * callback_arg);
 };
 
 #endif /* #ifdef BOARD_HAS_NB  */

src/Arduino_TcpIpConnectionHandler.h

@@ -50,6 +50,8 @@ class TcpIpConnectionHandler : public ConnectionHandler {
   #include "Arduino_WiFiConnectionHandler.h"
 #elif defined(ARDUINO_SAMD_MKRGSM1400)
   #include "Arduino_GSMConnectionHandler.h"
+#elif defined(BOARD_HAS_NB)
+  #include "Arduino_NBConnectionHandler.h"
 #endif
 
 #endif /* TCPIP_CONNECTION_HANDLER_H_ */