Removing not required classes TcpIpConnectionHandler ans LPWANConnectionHandler

Author: aentinger

src/Arduino_ConnectionHandler.h

@@ -145,11 +145,17 @@ class ConnectionHandler {
       virtual UDP &getUDP() = 0;
     #endif
 
+    #if defined(BOARD_HAS_LORA)
+      virtual int write(const uint8_t *buf, size_t size) = 0;
+      virtual int read() = 0;
+      virtual bool available() = 0;
+    #endif
+
     virtual NetworkConnectionState getStatus() __attribute__((deprecated)) {
       return netConnectionState;
     }
-    virtual void connect();
-    virtual void disconnect();
+    virtual void connect() = 0;
+    virtual void disconnect() = 0;
     void addCallback(NetworkConnectionEvent const event, OnNetworkEventCallback callback);
     void addConnectCallback(OnNetworkEventCallback callback);
     void addDisconnectCallback(OnNetworkEventCallback callback);
@@ -167,12 +173,14 @@ class ConnectionHandler {
 
 };
 
-#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB)
-  #include "Arduino_TcpIpConnectionHandler.h"
-#endif
-
-#if defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
-  #include "Arduino_LPWANConnectionHandler.h"
+#if defined(BOARD_HAS_WIFI)
+  #include "Arduino_WiFiConnectionHandler.h"
+#elif defined(BOARD_HAS_GSM)
+  #include "Arduino_GSMConnectionHandler.h"
+#elif defined(BOARD_HAS_NB)
+  #include "Arduino_NBConnectionHandler.h"
+#elif defined(BOARD_HAS_LORA)
+  #include "Arduino_LoRaConnectionHandler.h"
 #endif
 
 #endif /* CONNECTION_HANDLER_H_ */

src/Arduino_GSMConnectionHandler.h

@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "Arduino_TcpIpConnectionHandler.h"
+#include "Arduino_ConnectionHandler.h"
 
 
 #ifdef BOARD_HAS_GSM /* Only compile if this is a board with GSM */
@@ -31,7 +31,7 @@
    CLASS DECLARATION
  ******************************************************************************/
 
-class GSMConnectionHandler : public TcpIpConnectionHandler {
+class GSMConnectionHandler : public ConnectionHandler {
   public:
     GSMConnectionHandler(const char *pin, const char *apn, const char *login, const char *pass, const bool keepAlive = true);
 

src/Arduino_LPWANConnectionHandler.h

@@ -22,7 +22,7 @@
    INCLUDE
  ******************************************************************************/
 
-#include "Arduino_LPWANConnectionHandler.h"
+#include "Arduino_ConnectionHandler.h"
 
 typedef enum {
   LORA_ERROR_ACK_NOT_RECEIVED = -1,
@@ -40,20 +40,20 @@ typedef enum {
    CLASS DECLARATION
  ******************************************************************************/
 
-class LoRaConnectionHandler : public LPWANConnectionHandler {
+class LoRaConnectionHandler : public ConnectionHandler {
   public:
     LoRaConnectionHandler(const char *_appeui, const char *_appkey, _lora_band = _lora_band::EU868, _lora_class = _lora_class::CLASS_A);
 
-    void init();
-    unsigned long getTime();
-    NetworkConnectionState check();
+    virtual void init();
+    virtual unsigned long getTime();
+    virtual NetworkConnectionState check();
 
-    int write(const uint8_t *buf, size_t size);
-    int read();
-    bool available();
+    virtual int write(const uint8_t *buf, size_t size);
+    virtual int read();
+    virtual bool available();
 
-    void disconnect();
-    void connect();
+    virtual void disconnect();
+    virtual void connect();
 
   private:
 

src/Arduino_LoRaConnectionHandler.h

@@ -30,7 +30,7 @@
    CLASS DECLARATION
  ******************************************************************************/
 
-class NBConnectionHandler : public TcpIpConnectionHandler {
+class NBConnectionHandler : public ConnectionHandler {
   public:
     NBConnectionHandler(const char *pin, const bool keepAlive = true);
     NBConnectionHandler(const char *pin, const char *apn, const bool keepAlive = true);

src/Arduino_NBConnectionHandler.h

@@ -22,15 +22,15 @@
    INCLUDE
  ******************************************************************************/
 
-#include "Arduino_TcpIpConnectionHandler.h"
+#include "Arduino_ConnectionHandler.h"
 
 #ifdef BOARD_HAS_WIFI /* Only compile if the board has WiFi */
 
 /******************************************************************************
    CLASS DECLARATION
  ******************************************************************************/
 
-class WiFiConnectionHandler : public TcpIpConnectionHandler {
+class WiFiConnectionHandler : public ConnectionHandler {
   public:
     WiFiConnectionHandler(const char *_ssid, const char *_pass, bool _keepAlive = true);