add define to enable/disable connection handler

Author: pennam

extras/test/include/Arduino.h

@@ -23,6 +23,9 @@
  ******************************************************************************/
 
 typedef std::string String;
+typedef struct {
+  void * udp;
+} UDP;
 
 /******************************************************************************
    FUNCTION PROTOTYPES

src/AIoTC_Config.h

@@ -148,8 +148,10 @@
   #define BOARD_STM32H7
 #endif
 
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_OPTA) || defined(ARDUINO_GIGA) \
-  || defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_PORTENTA_C33)
+#define CONNECTION_HANDLER_ENABLED (1)
+
+#if ((defined(BOARD_STM32H7) || defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_PORTENTA_C33)) &&\
+     (defined(CONNECTION_HANDLER_ENABLED) && (CONNECTION_HANDLER_ENABLED == 1)))
   #define NETWORK_CONFIGURATOR_ENABLED (1)
 #else
   #define NETWORK_CONFIGURATOR_ENABLED (0)

src/ArduinoIoTCloud.cpp

@@ -26,11 +26,13 @@
  ******************************************************************************/
 
 ArduinoIoTCloudClass::ArduinoIoTCloudClass()
-: _connection{nullptr}
+: _time_service(TimeService)
+#if CONNECTION_HANDLER_ENABLED
+,_connection{nullptr}
+#endif
 #if NETWORK_CONFIGURATOR_ENABLED
 , _configurator{nullptr}
 #endif
-, _time_service(TimeService)
 , _thing_id{"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"}
 , _lib_version{AIOT_CONFIG_LIB_VERSION}
 , _device_id{"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"}

src/ArduinoIoTCloud.h

@@ -24,7 +24,10 @@
 
 #include <AIoTC_Config.h>
 
-#include <Arduino_ConnectionHandler.h>
+#if CONNECTION_HANDLER_ENABLED
+  #include <Arduino_ConnectionHandler.h>
+#endif
+
 #if NETWORK_CONFIGURATOR_ENABLED
   #include <Arduino_NetworkConfigurator.h>
 #endif
@@ -99,14 +102,16 @@ class ArduinoIoTCloudClass
     inline void     setDeviceId(String const device_id) { _device_id = device_id; };
     inline String & getDeviceId()                       { return _device_id; };
 
+#if CONNECTION_HANDLER_ENABLED
     inline ConnectionHandler * getConnection()          { return _connection; }
+#endif
 
     inline unsigned long getInternalTime()              { return _time_service.getTime(); }
     inline unsigned long getLocalTime()                 { return _time_service.getLocalTime(); }
 
-    #if NETWORK_CONFIGURATOR_ENABLED
+#if NETWORK_CONFIGURATOR_ENABLED
     inline void setConfigurator(NetworkConfiguratorClass & configurator) { _configurator = &configurator; }
-    #endif
+#endif
     void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback);
 
 #define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
@@ -151,11 +156,13 @@ class ArduinoIoTCloudClass
 
   protected:
 
+    TimeServiceClass & _time_service;
+#if CONNECTION_HANDLER_ENABLED
     ConnectionHandler * _connection;
-    #if NETWORK_CONFIGURATOR_ENABLED
+#endif
+#if NETWORK_CONFIGURATOR_ENABLED
     NetworkConfiguratorClass * _configurator;
-    #endif
-    TimeServiceClass & _time_service;
+#endif
     String _thing_id;
     String _lib_version;
 

src/ArduinoIoTCloudTCP.cpp

@@ -80,6 +80,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
  * PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
+#if CONNECTION_HANDLER_ENABLED
 int ArduinoIoTCloudTCP::begin(ConnectionHandler& connection, bool const enableWatchdog, String brokerAddress, uint16_t brokerPort, bool autoReconnect)
 {
   _connection = &connection;
@@ -89,6 +90,7 @@ int ArduinoIoTCloudTCP::begin(ConnectionHandler& connection, bool const enableWa
   return begin(_connection->getClient(), _connection->getUDP(), enableWatchdog, brokerAddress, brokerPort, autoReconnect);
 #endif
 }
+#endif
 
 int ArduinoIoTCloudTCP::begin(Client& brokerClient, Client& otaClient, UDP& ntpClient, bool const enableWatchdog, String brokerAddress, uint16_t brokerPort, bool autoReconnect)
 {
@@ -342,8 +344,13 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Init()
   _otaTLSClient.begin(_otaClient);
 #endif
 
+#if CONNECTION_HANDLER_ENABLED
   /* Setup TimeService */
-  _time_service.begin(_connection);
+  if (_connection != nullptr) {
+    _time_service.begin(_connection);
+  } else
+#endif
+  _time_service.begin(_ntpClient);
 
   /* Since we do not control what code the user inserts
    * between ArduinoIoTCloudTCP::begin() and the first
@@ -354,8 +361,12 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Init()
   if (_enableWatchdog) {
     /* Initialize watchdog hardware */
     watchdog_enable();
-    /* Setup callbacks to feed the watchdog during offloaded network operations (connection/download)*/
-    watchdog_enable_network_feed(_connection->getInterface());
+#if CONNECTION_HANDLER_ENABLED
+    if (_connection != nullptr) {
+      /* Setup callbacks to feed the watchdog during offloaded network operations (connection/download)*/
+      watchdog_enable_network_feed(_connection->getInterface());
+    }
+#endif
   }
 #endif
 
@@ -364,13 +375,20 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Init()
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectPhy()
 {
-  if (_connection->check() == NetworkConnectionState::CONNECTED)
-  {
-    if (!_connection_attempt.isRetry() || (_connection_attempt.isRetry() && _connection_attempt.isExpired()))
-      return State::SyncTime;
+#if CONNECTION_HANDLER_ENABLED
+  if (_connection == nullptr) {
+    return State::SyncTime;
   }
 
+  if (_connection->check() == NetworkConnectionState::CONNECTED) {
+    if (!_connection_attempt.isRetry() || (_connection_attempt.isRetry() && _connection_attempt.isExpired())) {
+      return State::SyncTime;
+    }
+  }
   return State::ConnectPhy;
+#else
+  return State::SyncTime;
+#endif
 }
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SyncTime()

src/ArduinoIoTCloudTCP.h

@@ -74,7 +74,9 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     virtual void printDebugInfo() override;
     virtual void disconnect    () override;
 
+#if CONNECTION_HANDLER_ENABLED
     int begin(ConnectionHandler& connection, bool const enableWatchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS, uint16_t brokerPort = DEFAULT_BROKER_PORT_AUTO, bool autoReconnect = true);
+#endif
     int begin(Client& brokerClient, Client& otaClient, UDP& ntpClient, bool const enableWatchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS, uint16_t brokerPort = DEFAULT_BROKER_PORT_AUTO, bool autoReconnect = true);
     int begin(Client& brokerClient, UDP& ntpClient, bool const enableWatchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS, uint16_t brokerPort = DEFAULT_BROKER_PORT_AUTO, bool autoReconnect = true);
 

src/tls/utility/TLSClientBroker.h

@@ -10,8 +10,10 @@
 
 #pragma once
 
-#include <Arduino_ConnectionHandler.h>
 #include <AIoTC_Config.h>
+#if CONNECTION_HANDLER_ENABLED
+  #include <Arduino_ConnectionHandler.h>
+#endif
 
 enum class ArduinoIoTAuthenticationMode
 {

src/tls/utility/TLSClientOta.h

@@ -10,8 +10,11 @@
 
 #pragma once
 
-#include <Arduino_ConnectionHandler.h>
 #include <AIoTC_Config.h>
+#if CONNECTION_HANDLER_ENABLED
+  #include <Arduino_ConnectionHandler.h>
+#endif
+
 
 #if defined(BOARD_HAS_OFFLOADED_ECCX08)
   /*
@@ -69,6 +72,7 @@
 public:
   void begin(Client* client);
 
+#if CONNECTION_HANDLER_ENABLED
   static inline Client& getNewClient(NetworkAdapter net) {
     switch(net) {
 #ifdef BOARD_HAS_WIFI
@@ -97,4 +101,5 @@
 #endif // BOARD_HAS_CELLULAR
     }
   }
+#endif // CONNECTION_HANDLER_ENABLED
 };

src/utility/time/TimeService.cpp

@@ -116,14 +116,17 @@ static time_t const EPOCH = 0;
  **************************************************************************************/
 
 TimeServiceClass::TimeServiceClass()
-: _con_hdl(nullptr)
-, _is_rtc_configured(false)
+: _is_rtc_configured(false)
 , _is_tz_configured(false)
 , _timezone_offset(24 * 60 * 60)
 , _timezone_dst_until(0)
 , _last_sync_tick(0)
 , _sync_interval_ms(TIMESERVICE_NTP_SYNC_TIMEOUT_ms)
 , _sync_func(nullptr)
+#if CONNECTION_HANDLER_ENABLED
+, _con_hdl(nullptr)
+#endif
+, _ntp_client(nullptr)
 {
 
 }
@@ -132,9 +135,26 @@ TimeServiceClass::TimeServiceClass()
  * PUBLIC MEMBER FUNCTIONS
  **************************************************************************************/
 
+#if CONNECTION_HANDLER_ENABLED
 void TimeServiceClass::begin(ConnectionHandler * con_hdl)
 {
   _con_hdl = con_hdl;
+#ifdef HAS_TCP
+  begin(&_con_hdl->getUDP());
+#else
+  begin();
+#endif
+}
+#endif
+
+void TimeServiceClass::begin(UDP * ntp_client)
+{
+  _ntp_client = ntp_client;
+  begin();
+}
+
+void TimeServiceClass::begin()
+{
   initRTC();
 #ifdef HAS_LORA
   setRTC(EPOCH_AT_COMPILE_TIME);
@@ -293,11 +313,12 @@ unsigned long TimeServiceClass::getTimeFromString(const String& input)
 #if defined(HAS_NOTECARD) || defined(HAS_TCP)
 bool TimeServiceClass::connected()
 {
-  if(_con_hdl == nullptr) {
-    return false;
-  } else {
+#if CONNECTION_HANDLER_ENABLED
+  if(_con_hdl != nullptr) {
     return _con_hdl->check() == NetworkConnectionState::CONNECTED;
   }
+#endif
+  return true;  // If no connection handler is used, assume we are connected
 }
 
 unsigned long TimeServiceClass::getRemoteTime()
@@ -308,25 +329,34 @@ unsigned long TimeServiceClass::getRemoteTime()
      * This is the most reliable time source and it will
      * ensure a correct behaviour of the library.
      */
-    if(_con_hdl->getInterface() != NetworkAdapter::CELL) {
-      unsigned long const ntp_time = NTPUtils::getTime(_con_hdl->getUDP());
+    bool use_ntp = true;
+#if CONNECTION_HANDLER_ENABLED
+    if((_con_hdl != nullptr) && (_con_hdl->getInterface() != NetworkAdapter::CELL)) {
+      use_ntp = false;
+    }
+#endif
+    if (use_ntp && (_ntp_client != nullptr)) {
+      unsigned long const ntp_time = NTPUtils::getTime(*_ntp_client);
       if(isTimeValid(ntp_time)) {
         return ntp_time;
       }
     }
     DEBUG_WARNING("TimeServiceClass::%s cannot get time from NTP, fallback on connection handler", __FUNCTION__);
 #endif  /* HAS_TCP */
 
+#if CONNECTION_HANDLER_ENABLED
     /* As fallback if NTP request fails try to obtain the
      * network time using the connection handler.
      */
-    unsigned long const connection_time = _con_hdl->getTime();
-    if(isTimeValid(connection_time)) {
-      return connection_time;
+    if (_con_hdl != nullptr) {
+      unsigned long const connection_time = _con_hdl->getTime();
+      if(isTimeValid(connection_time)) {
+        return connection_time;
+      }
+      DEBUG_WARNING("TimeServiceClass::%s cannot get time from connection handler", __FUNCTION__);
     }
-    DEBUG_WARNING("TimeServiceClass::%s cannot get time from connection handler", __FUNCTION__);
+#endif
   }
-
   /* Return known invalid value because we are not connected */
   return EPOCH;
 }

src/utility/time/TimeService.h

@@ -23,7 +23,9 @@
  **************************************************************************************/
 
 #include <AIoTC_Config.h>
-#include <Arduino_ConnectionHandler.h>
+#if CONNECTION_HANDLER_ENABLED
+  #include <Arduino_ConnectionHandler.h>
+#endif
 
 /******************************************************************************
  * TYPEDEF
@@ -42,7 +44,11 @@ class TimeServiceClass
 
   TimeServiceClass();
 
-  void          begin  (ConnectionHandler * con_hdl);
+#if CONNECTION_HANDLER_ENABLED
+  void          begin(ConnectionHandler * con_hdl);
+#endif
+  void          begin(UDP * ntp_client);
+  void          begin();
   unsigned long getTime();
   void          setTime(unsigned long time);
   unsigned long getLocalTime();
@@ -59,14 +65,18 @@ class TimeServiceClass
   static bool isTimeValid(unsigned long const time);
 
 private:
-  ConnectionHandler * _con_hdl;
+
   bool _is_rtc_configured;
   bool _is_tz_configured;
   long _timezone_offset;
   unsigned long _timezone_dst_until;
   unsigned long _last_sync_tick;
   unsigned long _sync_interval_ms;
   syncTimeFunctionPtr _sync_func;
+#if CONNECTION_HANDLER_ENABLED
+  ConnectionHandler * _con_hdl;
+#endif
+  UDP * _ntp_client;
 
 #if defined(HAS_NOTECARD) || defined(HAS_TCP)
   unsigned long getRemoteTime();