Remove WaitDeviceConfig state

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -270,7 +270,6 @@ void ArduinoIoTCloudTCP::update()
   case State::ConnectMqttBroker:    next_state = handle_ConnectMqttBroker();    break;
   case State::SendDeviceProperties: next_state = handle_SendDeviceProperties(); break;
   case State::SubscribeDeviceTopic: next_state = handle_SubscribeDeviceTopic(); break;
-  case State::WaitDeviceConfig:     next_state = handle_WaitDeviceConfig();     break;
   case State::CheckDeviceConfig:    next_state = handle_CheckDeviceConfig();    break;
   case State::SubscribeThingTopics: next_state = handle_SubscribeThingTopics(); break;
   case State::RequestLastValues:    next_state = handle_RequestLastValues();    break;
@@ -366,18 +365,21 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SendDeviceProperties()
   DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s announce device to the Cloud %d", __FUNCTION__, _time_service.getTime());
   /* TODO check if write fails */
   sendDevicePropertiesToCloud();
-  return State::WaitDeviceConfig;
+  return State::SubscribeDeviceTopic;
 }
 
-ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_WaitDeviceConfig()
+ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeDeviceTopic()
 {
   if (!_mqttClient.connected())
   {
     return State::Disconnect;
   }
 
   bool const is_retry_attempt = (_last_device_subscribe_cnt > 0);
-  if (is_retry_attempt && (millis() > _next_device_subscribe_attempt_tick))
+  if (is_retry_attempt && (millis() < _next_device_subscribe_attempt_tick))
+    return State::SubscribeDeviceTopic;
+
+  if (is_retry_attempt)
   {
     /* Configuration not received or device not attached to a valid thing. Try to resubscribe */
     if (_mqttClient.unsubscribe(_deviceTopicIn))
@@ -386,19 +388,6 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_WaitDeviceConfig()
     }
   }
 
-  if (!is_retry_attempt || (is_retry_attempt && (millis() > _next_device_subscribe_attempt_tick)))
-    return State::SubscribeDeviceTopic;
-
-  return State::WaitDeviceConfig;
-}
-
-ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeDeviceTopic()
-{
-  if (!_mqttClient.connected())
-  {
-    return State::Disconnect;
-  }
-
   DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s request device configuration %d", __FUNCTION__, _time_service.getTime());
 
   if (!_mqttClient.subscribe(_deviceTopicIn))
@@ -423,7 +412,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeDeviceTopic()
   _next_device_subscribe_attempt_tick = millis() + subscribe_retry_delay;
   DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s %d next configuration request in %d ms", __FUNCTION__, _last_device_subscribe_cnt, subscribe_retry_delay);
 
-  return State::WaitDeviceConfig;
+  return State::SubscribeDeviceTopic;
 }
 
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
@@ -445,7 +434,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
     _next_device_subscribe_attempt_tick = millis() + attach_retry_delay;
 
     DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s device not attached, next configuration request in %d ms", __FUNCTION__, attach_retry_delay);
-    return State::WaitDeviceConfig;
+    return State::SubscribeDeviceTopic;
   }
 
   DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s device attached to a new valid thing_id %s %d", __FUNCTION__, getThingId().c_str(), _time_service.getTime());
@@ -657,6 +646,7 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
   /* Topic for OTA properties and device configuration */
   if (_deviceTopicIn == topic) {
     CBORDecoder::decode(_device_property_container, (uint8_t*)bytes, length);
+    _last_device_subscribe_cnt = 0;
     _state = State::CheckDeviceConfig;
   }
 

src/ArduinoIoTCloudTCP.h

@@ -113,7 +113,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
       ConnectMqttBroker,
       SendDeviceProperties,
       SubscribeDeviceTopic,
-      WaitDeviceConfig,
       CheckDeviceConfig,
       SubscribeThingTopics,
       RequestLastValues,
@@ -199,7 +198,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     State handle_SyncTime();
     State handle_ConnectMqttBroker();
     State handle_SendDeviceProperties();
-    State handle_WaitDeviceConfig();
     State handle_CheckDeviceConfig();
     State handle_SubscribeDeviceTopic();
     State handle_SubscribeThingTopics();