Handle systemReset in a dedicated IoTCloud state to be able to wait messages are synced before reset the board

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -315,6 +315,9 @@ void ArduinoIoTCloudTCP::update()
   case State::SubscribeMqttTopics: next_state = handle_SubscribeMqttTopics(); break;
   case State::RequestLastValues:   next_state = handle_RequestLastValues();   break;
   case State::Connected:           next_state = handle_Connected();           break;
+#if OTA_ENABLED
+  case State::Reset:               next_state = handle_Reset();               break;
+#endif
   }
   _state = next_state;
 
@@ -520,8 +523,8 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
         _ota_req = false;
         /* Transmit the cleared error and request flags to the cloud. */
         sendPropertiesToCloud();
-        /* Reset the board to apply OTA update */
-        systemReset();
+        /* We are now ready to reset and apply OTA update */
+        return State::Reset;
       }
     }
 #endif /* OTA_ENABLED */
@@ -530,6 +533,19 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
   }
 }
 
+#if OTA_ENABLED
+ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Reset()
+{
+  static unsigned long const timeToReset = millis() + 1000;
+  /* We need to wait at least one second to make sure properties are synced up */
+  if(static_cast<int32_t>(timeToReset - millis()) <= 0) {
+    /* Reset the board to apply OTA update */
+    systemReset();
+  }
+  return State::Reset;
+}
+#endif /* OTA_ENABLED */
+
 void ArduinoIoTCloudTCP::onMessage(int length)
 {
   ArduinoCloud.handleMessage(length);

src/ArduinoIoTCloudTCP.h

@@ -104,6 +104,9 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
       SubscribeMqttTopics,
       RequestLastValues,
       Connected,
+#if OTA_ENABLED
+      Reset,
+#endif
     };
 
     State _state;
@@ -156,6 +159,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     State handle_SubscribeMqttTopics();
     State handle_RequestLastValues();
     State handle_Connected();
+    State handle_Reset();
 
     static void onMessage(int length);
     void handleMessage(int length);