Use specific macros to define device topic subscription delays

Author: pennam

src/AIoTC_Config.h

@@ -140,10 +140,12 @@
  * CONSTANTS
  ******************************************************************************/
 
-#define AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms      (1000UL)
-#define AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms (32000UL)
-#define AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms  (30000UL)
-#define AIOT_CONFIG_LASTVALUES_SYNC_MAX_RETRY_CNT      (10UL)
+#define AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms                (1000UL)
+#define AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms           (32000UL)
+#define AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms    (5*1000UL)
+#define AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms (32000UL)
+#define AIOT_CONFIG_TIMEOUT_FOR_LASTVALUES_SYNC_ms            (30000UL)
+#define AIOT_CONFIG_LASTVALUES_SYNC_MAX_RETRY_CNT                (10UL)
 
 #define AIOT_CONFIG_RP2040_OTA_HTTP_HEADER_RECEIVE_TIMEOUT_ms (10*1000UL)
 #define AIOT_CONFIG_RP2040_OTA_HTTP_DATA_RECEIVE_TIMEOUT_ms   (4*60*1000UL)

src/ArduinoIoTCloudTCP.cpp

@@ -450,9 +450,10 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeDeviceTopic()
     return State::ConnectPhy;
   }
 
-  unsigned long reconnection_retry_delay = (1 << _last_device_subscribe_cnt) * AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms;
-  reconnection_retry_delay = min(reconnection_retry_delay, static_cast<unsigned long>(AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms));
-  _next_device_subscribe_attempt_tick = millis() + reconnection_retry_delay;
+  /* No device configuration reply. Wait: 5s -> 10s -> 20s -> 30s */
+  unsigned long subscribe_retry_delay = (1 << _last_device_subscribe_cnt) * AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms;
+  subscribe_retry_delay = min(subscribe_retry_delay, static_cast<unsigned long>(AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms));
+  _next_device_subscribe_attempt_tick = millis() + subscribe_retry_delay;
   _last_device_subscribe_cnt++;
 
   return State::WaitDeviceConfig;
@@ -490,7 +491,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
 
   if(_deviceSubscribedToThing == true)
   {
-    /* Unsubscribe from old things topics and go oi with a new subsctiption */
+    /* Unsubscribe from old things topics and go on with a new subsctiption */
     _mqttClient.unsubscribe(_shadowTopicIn);
     _mqttClient.unsubscribe(_dataTopicIn);
 
@@ -501,14 +502,10 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
 
   if (deviceNotAttached())
   {
-    /* start long timeout counter
-     * return return State::SubscribeThingTopics
-     * if long timeout expired unsubscribe and
-     * return State::SubscribeDeviceTopic
-     */
-    unsigned long reconnection_retry_delay = (1 << _last_device_subscribe_cnt) * AIOT_CONFIG_RECONNECTION_RETRY_DELAY_ms * 10000;
-    reconnection_retry_delay = min(reconnection_retry_delay, static_cast<unsigned long>(AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms));
-    _next_device_subscribe_attempt_tick = millis() + reconnection_retry_delay;
+    /* Configuration received but device not attached. Wait: 40s */
+    unsigned long subscribe_retry_delay = (1 << _last_device_subscribe_cnt) * AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms * 10;
+    subscribe_retry_delay = min(subscribe_retry_delay, static_cast<unsigned long>(AIOT_CONFIG_MAX_RECONNECTION_RETRY_DELAY_ms * 10));
+    _next_device_subscribe_attempt_tick = millis() + subscribe_retry_delay;
     _last_device_subscribe_cnt++;
     return State::WaitDeviceConfig;
   }