Add a state ConnectPhy where we are waiting for the connection to the phy layer to be established

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -74,7 +74,7 @@ extern "C" unsigned long getTime()
  ******************************************************************************/
 
 ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
-: _state{State::ConnectMqttBroker}
+: _state{State::ConnectPhy}
 , _lastSyncRequestTickTime{0}
 , _mqtt_data_buf{0}
 , _mqtt_data_len{0}
@@ -116,7 +116,6 @@ int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, String brokerAddre
 
 int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
 {
-
   _brokerAddress = brokerAddress;
   _brokerPort = brokerPort;
 
@@ -176,8 +175,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
 
 void ArduinoIoTCloudTCP::update()
 {
-  if(checkPhyConnection()   != NetworkConnectionState::CONNECTED)     return;
-
   /* Retrieve the latest data from the MQTT Client. */
   if (_mqttClient.connected())
     _mqttClient.poll();
@@ -186,6 +183,7 @@ void ArduinoIoTCloudTCP::update()
   State next_state = _state;
   switch (_state)
   {
+  case State::ConnectPhy:          next_state = handle_ConnectPhy();          break;
   case State::ConnectMqttBroker:   next_state = handle_ConnectMqttBroker();   break;
   case State::SubscribeMqttTopics: next_state = handle_SubscribeMqttTopics(); break;
   case State::RequestLastValues:   next_state = handle_RequestLastValues();   break;
@@ -220,6 +218,14 @@ void ArduinoIoTCloudTCP::setOTAStorage(OTAStorage & ota_storage)
  * PRIVATE MEMBER FUNCTIONS
  ******************************************************************************/
 
+ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectPhy()
+{
+  if (_connection->check() == NetworkConnectionState::CONNECTED)
+    return State::ConnectMqttBroker;
+  else
+    return State::ConnectPhy;
+}
+
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
 {
   if (_mqttClient.connect(_brokerAddress.c_str(), _brokerPort))

src/ArduinoIoTCloudTCP.h

@@ -98,6 +98,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
 
     enum class State
     {
+      ConnectPhy,
       ConnectMqttBroker,
       SubscribeMqttTopics,
       RequestLastValues,
@@ -146,6 +147,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     inline String getTopic_datain   () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/i") : String("/a/t/" + getThingId() + "/e/i"); }
     inline String getTopic_ota_in   () { return String("/a/d/" + getDeviceId() + "/ota/i"); }
 
+    State handle_ConnectPhy();
     State handle_ConnectMqttBroker();
     State handle_SubscribeMqttTopics();
     State handle_RequestLastValues();