Remove OTA::setNetworkAdapter

Add iface parameter to OTA::onRequest

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -209,10 +209,6 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   _ota_cap = OTA::isCapable();
 #endif
 
-#if OTA_ENABLED
-  OTA::setNetworkAdapter(_connection->getInterface());
-#endif
-
 #ifdef BOARD_HAS_OFFLOADED_ECCX08
   if (String(WiFi.firmwareVersion()) < String("1.4.4")) {
     DEBUG_ERROR("ArduinoIoTCloudTCP::%s In order to connect to Arduino IoT Cloud, NINA firmware needs to be >= 1.4.4, current %s", __FUNCTION__, WiFi.firmwareVersion());
@@ -583,7 +579,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
         /* Transmit the cleared request flags to the cloud. */
         sendDevicePropertyToCloud("OTA_REQ");
         /* Call member function to handle OTA request. */
-        _ota_error = OTA::onRequest(_ota_url);
+        _ota_error = OTA::onRequest(_ota_url, _connection->getInterface());
         /* If something fails send the OTA error to the cloud */
         sendDevicePropertyToCloud("OTA_ERROR");
       }

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

@@ -35,12 +35,6 @@
 
 #include "../watchdog/Watchdog.h"
 
-/******************************************************************************
- * LOCAL VARIABLES
- ******************************************************************************/
-
-static NetworkAdapter _ota_adapter = NetworkAdapter::WIFI;
-
 /******************************************************************************
  * EXTERN
  ******************************************************************************/
@@ -51,7 +45,7 @@ extern RTC_HandleTypeDef RTCHandle;
  * FUNCTION DEFINITION
  ******************************************************************************/
 
-int portenta_h7_onOTARequest(char const * ota_url)
+int portenta_h7_onOTARequest(char const * ota_url, NetworkAdapter iface)
 {
   watchdog_reset();
 
@@ -82,7 +76,7 @@ int portenta_h7_onOTARequest(char const * ota_url)
   /* Download the OTA file from the web storage location. */
   MbedSocketClass * download_socket = static_cast<MbedSocketClass*>(&WiFi);
 #if defined (BOARD_HAS_ETHERNET)
-  if(_ota_adapter == NetworkAdapter::ETHERNET) {
+  if(iface == NetworkAdapter::ETHERNET) {
     download_socket = static_cast<MbedSocketClass*>(&Ethernet);
   }
 #endif
@@ -154,9 +148,4 @@ bool portenta_h7_isOTACapable()
   return Arduino_Portenta_OTA::isOtaCapable();
 }
 
-void portenta_h7_setNetworkAdapter(NetworkAdapter iface)
-{
-  _ota_adapter = iface;
-}
-
 #endif /* BOARD_STM32H7 */

src/utility/ota/OTA.cpp

@@ -43,7 +43,7 @@ bool rp2040_connect_isOTACapable();
 #endif
 
 #ifdef BOARD_STM32H7
-int portenta_h7_onOTARequest(char const * url);
+int portenta_h7_onOTARequest(char const * url, NetworkAdapter iface);
 String portenta_h7_getOTAImageSHA256();
 void portenta_h7_setNetworkAdapter(NetworkAdapter iface);
 bool portenta_h7_isOTACapable();
@@ -59,17 +59,20 @@ bool esp32_isOTACapable();
  * PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-int OTA::onRequest(String url)
+int OTA::onRequest(String url, NetworkAdapter iface)
 {
   DEBUG_INFO("ArduinoIoTCloudTCP::%s _ota_url = %s", __FUNCTION__, url.c_str());
 
 #if defined (ARDUINO_ARCH_SAMD)
+  (void)iface;
   return samd_onOTARequest(url.c_str());
 #elif defined (ARDUINO_NANO_RP2040_CONNECT)
+  (void)iface;
   return rp2040_connect_onOTARequest(url.c_str());
 #elif defined (BOARD_STM32H7)
-  return portenta_h7_onOTARequest(url.c_str());
+  return portenta_h7_onOTARequest(url.c_str(), iface);
 #elif defined (ARDUINO_ARCH_ESP32)
+  (void)iface;
   return esp32_onOTARequest(url.c_str());
 #else
   #error "OTA not supported for this architecture"
@@ -106,19 +109,4 @@ bool OTA::isCapable()
 #endif
 }
 
-void OTA::setNetworkAdapter(NetworkAdapter iface)
-{
-#if defined (ARDUINO_ARCH_SAMD)
-  /* Only WiFi available */
-#elif defined (ARDUINO_NANO_RP2040_CONNECT)
-  /* Only WiFi available */
-#elif defined (BOARD_STM32H7)
-  portenta_h7_setNetworkAdapter(iface);
-#elif defined (ARDUINO_ARCH_ESP32)
-  /* Only WiFi available */
-#else
-  #error "OTA not supported for this architecture"
-#endif
-}
-
 #endif /* OTA_ENABLED */

src/utility/ota/OTA.h

@@ -62,9 +62,8 @@ class OTA
 {
 public:
 
-  static int onRequest(String url);
+  static int onRequest(String url, NetworkAdapter iface);
   static String getImageSHA256();
-  static void setNetworkAdapter(NetworkAdapter iface);
   static bool isCapable();
 
 };