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

@@ -58,6 +58,12 @@
  * AUTOMATICALLY CONFIGURED DEFINES
  ******************************************************************************/
 
+#if defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE)
+  #define DEBUG_ENABLED (1)
+#else
+  #define DEBUG_ENABLED (0)
+#endif
+
 #if !defined(HAS_NOTECARD)
 
 #if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
@@ -148,8 +154,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,12 +24,15 @@
 
 #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
 
-#if defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE)
+#if DEBUG_ENABLED
   #include <Arduino_DebugUtils.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/ArduinoIoTCloudDevice.cpp

@@ -19,6 +19,10 @@
 #include "ArduinoIoTCloudDevice.h"
 #include "interfaces/CloudProcess.h"
 
+#if DEBUG_ENABLED
+  #include <Arduino_DebugUtils.h>
+#endif
+
 /******************************************************************************
    CTOR/DTOR
  ******************************************************************************/

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)
 {
@@ -292,14 +294,15 @@ int ArduinoIoTCloudTCP::begin(bool const enableWatchdog, String brokerAddress, u
   _ota.setAuthentication(getDeviceId().c_str(), _password.c_str());
 #endif // OTA_ENABLED && !defined(OFFLOADED_DOWNLOAD) && defined(OTA_BASIC_AUTH)
 
-#ifdef BOARD_HAS_OFFLOADED_ECCX08
+
+#if defined(BOARD_HAS_OFFLOADED_ECCX08) && defined(CONNECTION_HANDLER_ENABLED) && (CONNECTION_HANDLER_ENABLED == 1)
   if (String(WiFi.firmwareVersion()) < String("1.6.0")) {
     DEBUG_ERROR("ArduinoIoTCloudTCP::%s In order to connect to Arduino IoT Cloud, NINA firmware needs to be >= 1.6.0, current %s", __FUNCTION__, WiFi.firmwareVersion());
     return 0;
   }
 #endif /* BOARD_HAS_OFFLOADED_ECCX08 */
 
-#if defined (ARDUINO_UNOWIFIR4)
+#if defined(ARDUINO_UNOWIFIR4) && defined(CONNECTION_HANDLER_ENABLED) && (CONNECTION_HANDLER_ENABLED == 1)
   if (String(WiFi.firmwareVersion()) < String("0.2.0")) {
     DEBUG_ERROR("ArduinoIoTCloudTCP::%s In order to connect to Arduino IoT Cloud, WiFi firmware needs to be >= 0.2.0, current %s", __FUNCTION__, WiFi.firmwareVersion());
     return 0;
@@ -342,8 +345,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 +362,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 +376,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/ArduinoIoTCloudThing.cpp

@@ -22,6 +22,10 @@
 #include "property/types/CloudWrapperInt.h"
 #include "property/types/CloudWrapperUnsignedInt.h"
 
+#if DEBUG_ENABLED
+  #include <Arduino_DebugUtils.h>
+#endif
+
 /******************************************************************************
  * CTOR/DTOR
  ******************************************************************************/

src/ota/implementation/OTANanoRP2040.cpp

@@ -13,7 +13,9 @@
 #if defined(ARDUINO_NANO_RP2040_CONNECT) && OTA_ENABLED
 #include <SFU.h>
 #include "OTANanoRP2040.h"
-#include <Arduino_DebugUtils.h>
+#if DEBUG_ENABLED
+  #include <Arduino_DebugUtils.h>
+#endif
 #include "mbed.h"
 #include "utility/watchdog/Watchdog.h"
 

src/ota/implementation/OTASamd.cpp

@@ -13,7 +13,9 @@
 #if defined(ARDUINO_ARCH_SAMD) && OTA_ENABLED
 #include "OTASamd.h"
 
-#include <Arduino_DebugUtils.h>
+#if DEBUG_ENABLED
+  #include <Arduino_DebugUtils.h>
+#endif
 #if OTA_STORAGE_SNU
 #  include <SNU.h>
 #  include <WiFiNINA.h> /* WiFiStorage */

src/ota/implementation/OTAUnoR4.cpp

@@ -13,7 +13,9 @@
 #if defined(ARDUINO_UNOR4_WIFI) && OTA_ENABLED
 #include "OTAUnoR4.h"
 
-#include <Arduino_DebugUtils.h>
+#if DEBUG_ENABLED
+  #include <Arduino_DebugUtils.h>
+#endif
 #include "fsp_common_api.h"
 #include "r_flash_lp.h"
 #include "WiFi.h"

src/ota/interface/OTAInterface.h

@@ -21,7 +21,9 @@
 #include <Arduino_SHA256.h>
 
 #include <interfaces/CloudProcess.h>
-#include <Arduino_DebugUtils.h>
+#if DEBUG_ENABLED
+  #include <Arduino_DebugUtils.h>
+#endif
 
 /******************************************************************************
  * CLASS DECLARATION

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
 };