Create OTA::isCapable and move code from ArduinoIoTCloudTCP

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -205,38 +205,8 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   addPropertyReal(_tz_offset, "tz_offset", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
   addPropertyReal(_tz_dst_until, "tz_dst_until", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
 
-#if OTA_STORAGE_PORTENTA_QSPI
-  #define BOOTLOADER_ADDR   (0x8000000)
-  uint32_t bootloader_data_offset = 0x1F000;
-  uint8_t* bootloader_data = (uint8_t*)(BOOTLOADER_ADDR + bootloader_data_offset);
-  uint8_t currentBootloaderVersion = bootloader_data[1];
-  if (currentBootloaderVersion < 22) {
-    _ota_cap = false;
-    DEBUG_WARNING("ArduinoIoTCloudTCP::%s In order to be ready for cloud OTA, update the bootloader", __FUNCTION__);
-    DEBUG_WARNING("ArduinoIoTCloudTCP::%s File -> Examples -> Portenta_System -> PortentaH7_updateBootloader", __FUNCTION__);
-  }
-  else {
-    _ota_cap = true;
-  }
-#endif
-
-#if OTA_STORAGE_SNU && OTA_ENABLED
-  if (String(WiFi.firmwareVersion()) < String("1.4.1")) {
-    _ota_cap = false;
-    DEBUG_WARNING("ArduinoIoTCloudTCP::%s In order to be ready for cloud OTA, NINA firmware needs to be >= 1.4.1, current %s", __FUNCTION__, WiFi.firmwareVersion());
-  }
-  else {
-    _ota_cap = true;
-  }
-#endif /* OTA_STORAGE_SNU */
-
-#if defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_NICLA_VISION)
-  _ota_cap = true;
-#endif
-
-#if defined(ARDUINO_ARCH_ESP32) && OTA_ENABLED
-  /* NOTE: here is possible to check if current partition scheme is OTA compatible */
-  _ota_cap = true;
+#if OTA_ENABLED
+  _ota_cap = OTA::isCapable();
 #endif
 
 #if OTA_ENABLED

src/utility/ota/OTA-esp32.cpp

@@ -120,4 +120,10 @@ String esp32_getOTAImageSHA256()
   return sha256_str;
 }
 
+bool esp32_isOTACapable()
+{
+  /* NOTE: here is possible to check if current partition scheme is OTA compatible */
+  return true;
+}
+
 #endif /* ARDUINO_ARCH_ESP32 */

src/utility/ota/OTA-nano-rp2040.cpp

@@ -258,4 +258,9 @@ String rp2040_connect_getOTAImageSHA256()
   return FlashSHA256::calc(XIP_BASE, 0x100000);
 }
 
+bool rp2040_connect_isOTACapable()
+{
+  return true;
+}
+
 #endif /* ARDUINO_NANO_RP2040_CONNECT */

src/utility/ota/OTA-portenta-h7.cpp

@@ -149,6 +149,11 @@ String portenta_h7_getOTAImageSHA256()
   return sha256_str;
 }
 
+bool portenta_h7_isOTACapable()
+{
+  return Arduino_Portenta_OTA::isOtaCapable();
+}
+
 void portenta_h7_setNetworkAdapter(NetworkAdapter iface)
 {
   _ota_adapter = iface;

src/utility/ota/OTA-samd.cpp

@@ -81,4 +81,17 @@ String samd_getOTAImageSHA256()
   return FlashSHA256::calc(0x2000, 0x40000 - 0x2000);
 }
 
+bool samd_isOTACapable()
+{
+#if OTA_STORAGE_SNU
+  if (String(WiFi.firmwareVersion()) < String("1.4.1")) {
+    DEBUG_WARNING("ArduinoIoTCloudTCP::%s In order to be ready for cloud OTA, NINA firmware needs to be >= 1.4.1, current %s", __FUNCTION__, WiFi.firmwareVersion());
+    return false;
+  } else {
+    return true;
+  }
+#endif
+  return false;
+}
+
 #endif /* ARDUINO_ARCH_SAMD */

src/utility/ota/OTA.cpp

@@ -27,35 +27,38 @@
 #include <Arduino_DebugUtils.h>
 
 /******************************************************************************
- * FUNCTION DEFINITION
+ * FUNCTION DECLARATION
  ******************************************************************************/
 
 #ifdef ARDUINO_ARCH_SAMD
 int samd_onOTARequest(char const * url);
 String samd_getOTAImageSHA256();
+bool samd_isOTACapable();
 #endif
 
 #ifdef ARDUINO_NANO_RP2040_CONNECT
 int rp2040_connect_onOTARequest(char const * url);
 String rp2040_connect_getOTAImageSHA256();
+bool rp2040_connect_isOTACapable();
 #endif
 
 #ifdef BOARD_STM32H7
 int portenta_h7_onOTARequest(char const * url);
 String portenta_h7_getOTAImageSHA256();
 void portenta_h7_setNetworkAdapter(NetworkAdapter iface);
+bool portenta_h7_isOTACapable();
 #endif
 
 #ifdef ARDUINO_ARCH_ESP32
 int esp32_onOTARequest(char const * url);
 String esp32_getOTAImageSHA256();
+bool esp32_isOTACapable();
 #endif
 
 /******************************************************************************
  * PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-
 int OTA::onRequest(String url)
 {
   DEBUG_INFO("ArduinoIoTCloudTCP::%s _ota_url = %s", __FUNCTION__, url.c_str());
@@ -88,6 +91,20 @@ String OTA::getImageSHA256()
 #endif
 }
 
+bool OTA::isCapable()
+{
+#if defined (ARDUINO_ARCH_SAMD)
+  return samd_isOTACapable();
+#elif defined (ARDUINO_NANO_RP2040_CONNECT)
+  return rp2040_connect_isOTACapable();
+#elif defined (BOARD_STM32H7)
+  return portenta_h7_isOTACapable();
+#elif defined (ARDUINO_ARCH_ESP32)
+  return esp32_isOTACapable();
+#else
+  #error "OTA not supported for this architecture"
+#endif
+}
 
 void OTA::setNetworkAdapter(NetworkAdapter iface)
 {
@@ -105,4 +122,3 @@ void OTA::setNetworkAdapter(NetworkAdapter iface)
 }
 
 #endif /* OTA_ENABLED */
-

src/utility/ota/OTA.h

@@ -65,6 +65,7 @@ class OTA
   static int onRequest(String url);
   static String getImageSHA256();
   static void setNetworkAdapter(NetworkAdapter iface);
+  static bool isCapable();
 
 };