Extract samd related OTA request code into function 'samd_onOTARequest'.

The main imperative behind doing this is that the method ArduinoIoTCloudTCP::onOTARequest is getting really cluttered and for the sake of clarity its better to extract the code into a separate function.

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -579,34 +579,12 @@ int ArduinoIoTCloudTCP::write(String const topic, byte const data[], int const l
 #if OTA_ENABLED
 void ArduinoIoTCloudTCP::onOTARequest()
 {
-#ifdef ARDUINO_ARCH_SAMD
-  samd_watchdog_reset();
-#endif /* ARDUINO_ARCH_SAMD */
-
   DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s _ota_url = %s", __FUNCTION__, _ota_url.c_str());
 
-#if OTA_STORAGE_SNU
-  /* Just to be safe delete any remains from previous updates. */
-  WiFiStorage.remove("/fs/UPDATE.BIN.LZSS");
-  WiFiStorage.remove("/fs/UPDATE.BIN.LZSS.TMP");
-
 #ifdef ARDUINO_ARCH_SAMD
-  samd_watchdog_reset();
+  _ota_error = samd_onOTARequest(_ota_url.c_str());
 #endif /* ARDUINO_ARCH_SAMD */
 
-  /* Trigger direct download to nina module. */
-  uint8_t nina_ota_err_code = 0;
-  if (!WiFiStorage.downloadOTA(_ota_url.c_str(), &nina_ota_err_code))
-  {
-    DEBUG_ERROR("ArduinoIoTCloudTCP::%s error download to nina: %d", __FUNCTION__, nina_ota_err_code);
-    _ota_error = static_cast<int>(OTAError::DownloadFailed);
-    return;
-  }
-
-  /* Perform the reset to reboot to SxU. */
-  NVIC_SystemReset();
-#endif /* OTA_STORAGE_SNU */
-
 #if OTA_STORAGE_PORTENTA_QSPI
   mbed_watchdog_reset();
 

src/utility/ota/OTA-samd.cpp

@@ -0,0 +1,63 @@
+/*
+   This file is part of ArduinoIoTCloud.
+
+   Copyright 2020 ARDUINO SA (http://www.arduino.cc/)
+
+   This software is released under the GNU General Public License version 3,
+   which covers the main part of arduino-cli.
+   The terms of this license can be found at:
+   https://www.gnu.org/licenses/gpl-3.0.en.html
+
+   You can be released from the requirements of the above licenses by purchasing
+   a commercial license. Buying such a license is mandatory if you want to modify or
+   otherwise use the software for commercial activities involving the Arduino
+   software without disclosing the source code of your own applications. To purchase
+   a commercial license, send an email to [email protected].
+*/
+
+#ifdef ARDUINO_ARCH_SAMD
+
+/******************************************************************************
+ * INCLUDE
+ ******************************************************************************/
+
+#include "OTA.h"
+
+#include <Arduino.h>
+#include <Arduino_DebugUtils.h>
+
+#include "../watchdog/Watchdog.h"
+
+#if OTA_STORAGE_SNU
+#  include <WiFiNINA.h> /* WiFiStorage */
+#endif
+
+/******************************************************************************
+ * FUNCTION DEFINITION
+ ******************************************************************************/
+
+int samd_onOTARequest(char const * ota_url)
+{
+  samd_watchdog_reset();
+
+#if OTA_STORAGE_SNU
+  /* Just to be safe delete any remains from previous updates. */
+  WiFiStorage.remove("/fs/UPDATE.BIN.LZSS");
+  WiFiStorage.remove("/fs/UPDATE.BIN.LZSS.TMP");
+
+  samd_watchdog_reset();
+
+  /* Trigger direct download to nina module. */
+  uint8_t nina_ota_err_code = 0;
+  if (!WiFiStorage.downloadOTA(ota_url, &nina_ota_err_code))
+  {
+    DEBUG_ERROR("ArduinoIoTCloudTCP::%s error download to nina: %d", __FUNCTION__, nina_ota_err_code);
+    return static_cast<int>(OTAError::DownloadFailed);
+  }
+
+  /* Perform the reset to reboot to SxU. */
+  NVIC_SystemReset();
+#endif /* OTA_STORAGE_SNU */
+}
+
+#endif /* ARDUINO_ARCH_SAMD */

src/utility/ota/OTA.h

@@ -51,6 +51,14 @@ enum class OTAError : int
   DownloadFailed = 1,
 };
 
+/******************************************************************************
+ * FUNCTION DEFINITION
+ ******************************************************************************/
+
+#ifdef ARDUINO_ARCH_SAMD
+int samd_onOTARequest(char const * ota_url);
+#endif
+
 #endif /* OTA_ENABLED */
 
 #endif /* ARDUINO_OTA_LOGIC_H_ */