Merge pull request #160 from andreagilardoni/nc-removal

Removing Notecard references from repo

Author: andreagilardoni

src/ConnectionHandlerInterface.h

@@ -48,17 +48,15 @@ class ConnectionHandler {
 
     virtual NetworkConnectionState check();
 
-    #if not defined(BOARD_HAS_LORA)
-      virtual unsigned long getTime() = 0;
-    #endif
-
-    #if defined(BOARD_HAS_NOTECARD) || defined(BOARD_HAS_LORA)
+    #if defined(BOARD_HAS_LORA)
       virtual bool available() = 0;
       virtual int read() = 0;
       virtual int write(const uint8_t *buf, size_t size) = 0;
     #else
       virtual Client &getClient() = 0;
       virtual UDP &getUDP() = 0;
+
+      virtual unsigned long getTime() = 0;
     #endif
 
     NetworkConnectionState getStatus() __attribute__((deprecated)) {

src/GenericConnectionHandler.cpp

@@ -78,7 +78,7 @@ NetworkConnectionState GenericConnectionHandler::update_handleDisconnected() {
     return _ch != nullptr ? _ch->update_handleDisconnected() : NetworkConnectionState::INIT;
 }
 
-#if not (defined(BOARD_HAS_LORA) or defined(BOARD_HAS_NOTECARD))
+#if !defined(BOARD_HAS_LORA)
 unsigned long GenericConnectionHandler::getTime() {
     return _ch != nullptr ? _ch->getTime() : 0;
 }
@@ -91,7 +91,7 @@ UDP & GenericConnectionHandler::getUDP() {
     return _ch->getUDP(); // NOTE _ch may be nullptr
 }
 
-#endif // not (defined(BOARD_HAS_LORA) or defined(BOARD_HAS_NOTECARD))
+#endif // defined(BOARD_HAS_LORA)
 
 void GenericConnectionHandler::connect() {
     if(_ch!=nullptr) {

src/GenericConnectionHandler.h

@@ -31,7 +31,7 @@ class GenericConnectionHandler : public ConnectionHandler
 
     GenericConnectionHandler(bool const keep_alive=true): ConnectionHandler(keep_alive), _ch(nullptr) {}
 
-    #if defined(BOARD_HAS_NOTECARD) || defined(BOARD_HAS_LORA)
+    #if defined(BOARD_HAS_LORA)
       virtual bool available() = 0;
       virtual int read() = 0;
       virtual int write(const uint8_t *buf, size_t size) = 0;