New init state for TCP boards

Author: fabik111

examples/ArduinoIoTCloud-NetConfig/thingProperties.h

@@ -1,5 +1,6 @@
 #include <ArduinoIoTCloud.h>
 #include <Arduino_ConnectionHandler.h>
+#include <GenericConnectionHandler.h>
 #include <ConfiguratorAgents/AgentsConfiguratorManager.h>
 #include <ConfiguratorAgents/agents/BLE/BLEConfiguratorAgent.h>
 #include "arduino_secrets.h"
@@ -41,23 +42,6 @@ void initProperties() {
 #endif
 }
 
-#if defined(BOARD_HAS_ETHERNET)
-  /* DHCP mode */
-  //EthernetConnectionHandler ArduinoIoTPreferredConnection;
-  /* Manual mode. It will fallback in DHCP mode if SECRET_OPTIONAL_IP is invalid or equal to "0.0.0.0" */
-  EthernetConnectionHandler ArduinoIoTPreferredConnection(SECRET_OPTIONAL_IP, SECRET_OPTIONAL_DNS, SECRET_OPTIONAL_GATEWAY, SECRET_OPTIONAL_NETMASK);
-#elif defined(BOARD_HAS_WIFI)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
-#elif defined(BOARD_HAS_GSM)
-  GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
-#elif defined(BOARD_HAS_LORA)
-  LoRaConnectionHandler ArduinoIoTPreferredConnection(SECRET_APP_EUI, SECRET_APP_KEY, _lora_band::EU868, NULL, _lora_class::CLASS_A);
-#elif defined(BOARD_HAS_NB)
-  NBConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
-#elif defined(BOARD_HAS_CATM1_NBIOT)
-  CatM1ConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
-#elif defined(BOARD_HAS_CELLULAR)
-  CellularConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
-#endif
+GenericConnectionHandler ArduinoIoTPreferredConnection;
 
 NetworkConfigurator NetworkConf(ConfiguratorManager, ArduinoIoTPreferredConnection);

src/ArduinoIoTCloudTCP.cpp

@@ -92,17 +92,6 @@ int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, bool const enable_
   _brokerPort = brokerPort;
 #endif
 
-  /* Setup broker TLS client */
-  _brokerClient.begin(connection);
-
-#if  OTA_ENABLED
-  /* Setup OTA TLS client */
-  _otaClient.begin(connection);
-#endif
-
-  /* Setup TimeService */
-  _time_service.begin(_connection);
-
   /* Setup retry timers */
   _connection_attempt.begin(AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms, AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms);
   return begin(enable_watchdog, _brokerAddress, _brokerPort);
@@ -224,6 +213,7 @@ void ArduinoIoTCloudTCP::update()
   switch (_state)
   {
   case State::ConfigPhy:            next_state = handle_ConfigPhy();            break;
+  case State::Init:                 next_state = handle_Init();                 break;
   case State::ConnectPhy:           next_state = handle_ConnectPhy();           break;
   case State::SyncTime:             next_state = handle_SyncTime();             break;
   case State::ConnectMqttBroker:    next_state = handle_ConnectMqttBroker();    break;
@@ -261,12 +251,31 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConfigPhy()
 {
   if (_configurator == nullptr || _configurator->poll() == NetworkConfiguratorStates::CONFIGURED)
   {
-    return State::ConnectPhy;
+    return State::Init;
   }
 
   return State::ConfigPhy;
 }
 
+ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Init()
+{
+  if(_configurator != nullptr){
+    _configurator->end();
+  }
+  /* Setup broker TLS client */
+  _brokerClient.begin(*_connection);
+
+#if  OTA_ENABLED
+  /* Setup OTA TLS client */
+  _otaClient.begin(*_connection);
+#endif
+
+  /* Setup TimeService */
+  _time_service.begin(_connection);
+  
+  return State::ConnectPhy;
+}
+
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectPhy()
 {
   if (_connection->check() == NetworkConnectionState::CONNECTED)

src/ArduinoIoTCloudTCP.h

@@ -119,6 +119,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     enum class State
     {
       ConfigPhy,
+      Init,
       ConnectPhy,
       SyncTime,
       ConnectMqttBroker,
@@ -171,6 +172,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     inline String getTopic_datain   () { return ( getThingId().length() == 0) ? String("") : String("/a/t/" + getThingId() + "/e/i"); }
 
     State handle_ConfigPhy();
+    State handle_Init();
     State handle_ConnectPhy();
     State handle_SyncTime();
     State handle_ConnectMqttBroker();