Moving implementation of connect/disconnect into base class Arduino_ConnectionHandler

Author: aentinger

src/Arduino_ConnectionHandler.cpp

@@ -21,10 +21,36 @@
 
 #include "Arduino_ConnectionHandler.h"
 
+/******************************************************************************
+   CONSTRUCTOR/DESTRUCTOR
+ ******************************************************************************/
+
+ConnectionHandler::ConnectionHandler(bool const keep_alive)
+: _keep_alive{keep_alive}
+, _netConnectionState{NetworkConnectionState::INIT}
+{
+
+}
+
 /******************************************************************************
    PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
+void ConnectionHandler::connect()
+{
+  if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
+  {
+    _keep_alive = true;
+    _netConnectionState = NetworkConnectionState::INIT;
+  }
+}
+
+void ConnectionHandler::disconnect()
+{
+  _keep_alive = false;
+  _netConnectionState = NetworkConnectionState::DISCONNECTING;
+}
+
 void ConnectionHandler::addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback) {
   switch (event) {
     case NetworkConnectionEvent::CONNECTED:       _on_connect_event_callback       = callback; break;

src/Arduino_ConnectionHandler.h

@@ -136,6 +136,10 @@ typedef void (*OnNetworkEventCallback)();
 
 class ConnectionHandler {
   public:
+
+    ConnectionHandler(bool const keep_alive);
+
+
     virtual NetworkConnectionState check() = 0;
 
     #if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB)
@@ -153,16 +157,19 @@ class ConnectionHandler {
     virtual NetworkConnectionState getStatus() __attribute__((deprecated)) {
       return _netConnectionState;
     }
-    virtual void connect() = 0;
-    virtual void disconnect() = 0;
+
+    void connect();
+    void disconnect();
+
     void addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback);
     void addConnectCallback(OnNetworkEventCallback callback) __attribute__((deprecated));
     void addDisconnectCallback(OnNetworkEventCallback callback) __attribute__((deprecated));
     void addErrorCallback(OnNetworkEventCallback callback) __attribute__((deprecated));
 
   protected:
 
-    NetworkConnectionState _netConnectionState = NetworkConnectionState::INIT;
+    bool _keep_alive;
+    NetworkConnectionState _netConnectionState;
 
     void execCallback(NetworkConnectionEvent const event);
 

src/Arduino_GSMConnectionHandler.cpp

@@ -55,11 +55,11 @@ static unsigned int const CHECK_INTERVAL_TABLE[] =
  ******************************************************************************/
 
 GSMConnectionHandler::GSMConnectionHandler(const char * pin, const char * apn, const char * login, const char * pass, bool const keep_alive)
-: _pin(pin)
+: ConnectionHandler{keep_alive}
+, _pin(pin)
 , _apn(apn)
 , _login(login)
 , _pass(pass)
-, _keep_alive(keep_alive)
 , _lastConnectionTickTime(millis())
 {
 
@@ -99,21 +99,6 @@ NetworkConnectionState GSMConnectionHandler::check()
   return _netConnectionState;
 }
 
-void GSMConnectionHandler::disconnect()
-{
-  _keep_alive = false;
-  _netConnectionState = NetworkConnectionState::DISCONNECTING;
-}
-
-void GSMConnectionHandler::connect()
-{
-  if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
-  {
-    _keep_alive = true;
-    _netConnectionState = NetworkConnectionState::INIT;
-  }
-}
-
 /******************************************************************************
    PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/

src/Arduino_GSMConnectionHandler.h

@@ -42,8 +42,6 @@ class GSMConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState check() override;
     virtual Client & getClient() override { return _gsm_client; };
     virtual UDP & getUDP() override { return _gsm_udp; };
-    virtual void disconnect() override;
-    virtual void connect() override;
 
 
   private:
@@ -52,7 +50,6 @@ class GSMConnectionHandler : public ConnectionHandler
     const char * _apn;
     const char * _login;
     const char * _pass;
-    bool _keep_alive;
     unsigned long _lastConnectionTickTime;
 
     GSM _gsm;

src/Arduino_LoRaConnectionHandler.cpp

@@ -61,12 +61,12 @@ static unsigned int const CHECK_INTERVAL_TABLE[] =
  ******************************************************************************/
 
 LoRaConnectionHandler::LoRaConnectionHandler(char const * appeui, char const * appkey, _lora_band const band, _lora_class const device_class)
-: _appeui(appeui)
+: ConnectionHandler{false}
+, _appeui(appeui)
 , _appkey(appkey)
 , _band(band)
 , _device_class(device_class)
 , _lastConnectionTickTime(millis())
-, _keep_alive(false)
 {
 
 }
@@ -137,19 +137,6 @@ bool LoRaConnectionHandler::available()
   return _modem.available();
 }
 
-void LoRaConnectionHandler::connect()
-{
-  if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
-  {
-    _keep_alive = true;
-    _netConnectionState = NetworkConnectionState::INIT;
-  }
-}
-void LoRaConnectionHandler::disconnect()
-{
-  /* Do nothing */
-}
-
 /******************************************************************************
    PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/

src/Arduino_LoRaConnectionHandler.h

@@ -39,8 +39,6 @@ class LoRaConnectionHandler : public ConnectionHandler
     virtual int write(const uint8_t *buf, size_t size) override;
     virtual int read() override;
     virtual bool available() override;
-    virtual void disconnect() override;
-    virtual void connect() override;
 
 
   private:
@@ -50,7 +48,6 @@ class LoRaConnectionHandler : public ConnectionHandler
     _lora_band _band;
     _lora_class _device_class;
     unsigned long _lastConnectionTickTime;
-    bool _keep_alive;
     LoRaModem _modem;
 
     NetworkConnectionState update_handleInit();

src/Arduino_NBConnectionHandler.cpp

@@ -66,12 +66,12 @@ NBConnectionHandler::NBConnectionHandler(char const * pin, char const * apn, boo
 }
 
 NBConnectionHandler::NBConnectionHandler(char const * pin, char const * apn, char const * login, char const * pass, bool const keep_alive)
-: _pin(pin)
+: ConnectionHandler{keep_alive}
+, _pin(pin)
 , _apn(apn)
 , _login(login)
 , _pass(pass)
 , _lastConnectionTickTime(millis())
-, _keep_alive(keep_alive)
 {
 
 }
@@ -110,21 +110,6 @@ NetworkConnectionState NBConnectionHandler::check()
   return _netConnectionState;
 }
 
-void NBConnectionHandler::connect()
-{
-  if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
-  {
-    _keep_alive = true;
-    _netConnectionState = NetworkConnectionState::INIT;
-  }
-}
-
-void NBConnectionHandler::disconnect()
-{
-  _keep_alive = false;
-  _netConnectionState = NetworkConnectionState::DISCONNECTING;
-}
-
 /******************************************************************************
    PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/

src/Arduino_NBConnectionHandler.h

@@ -43,8 +43,6 @@ class NBConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState check() override;
     virtual Client & getClient() override { return _nb_client; };
     virtual UDP & getUDP() override { return _nb_udp; };
-    virtual void disconnect() override;
-    virtual void connect() override;
 
 
   private:
@@ -56,7 +54,6 @@ class NBConnectionHandler : public ConnectionHandler
     char const * _login;
     char const * _pass;
     unsigned long _lastConnectionTickTime;
-    bool _keep_alive;
 
     NB _nb;
     GPRS _nb_gprs;

src/Arduino_WiFiConnectionHandler.cpp

@@ -44,10 +44,10 @@ static unsigned int const CHECK_INTERVAL_TABLE[] =
  ******************************************************************************/
 
 WiFiConnectionHandler::WiFiConnectionHandler(char const * ssid, char const * pass, bool const keep_alive)
-: _ssid{ssid}
+: ConnectionHandler{keep_alive}
+, _ssid{ssid}
 , _pass{pass}
 , _lastConnectionTickTime{millis()}
-, _keep_alive{keep_alive}
 {
 
 }
@@ -94,21 +94,6 @@ NetworkConnectionState WiFiConnectionHandler::check()
    PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/
 
-void WiFiConnectionHandler::connect()
-{
-  if (_netConnectionState != NetworkConnectionState::INIT && _netConnectionState != NetworkConnectionState::CONNECTING)
-  {
-    _keep_alive = true;
-    _netConnectionState = NetworkConnectionState::INIT;
-  }
-}
-
-void WiFiConnectionHandler::disconnect()
-{
-  _keep_alive = false;
-  _netConnectionState = NetworkConnectionState::DISCONNECTING;
-}
-
 NetworkConnectionState WiFiConnectionHandler::update_handleInit()
 {
 #ifndef BOARD_ESP8266

src/Arduino_WiFiConnectionHandler.h

@@ -41,15 +41,12 @@ class WiFiConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState check() override;
     virtual Client & getClient() override{ return _wifi_client; }
     virtual UDP & getUDP() override { return _wifi_udp; }
-    virtual void disconnect() override;
-    virtual void connect() override;
 
 
   private:
 
     char const * _ssid;
     char const * _pass;
-    bool _keep_alive;
     unsigned long _lastConnectionTickTime;
 
     WiFiUDP _wifi_udp;