OTA: Use connection handler network adapter type to select between Ethernet and WiFi

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -830,7 +830,8 @@ void ArduinoIoTCloudTCP::onOTARequest()
 #endif
 
 #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
-  _ota_error = portenta_h7_onOTARequest(_ota_url.c_str());
+  bool const use_ethernet = _connection->getInterface() == NetworkAdapter::ETHERNET ? true : false;
+  _ota_error = portenta_h7_onOTARequest(_ota_url.c_str(), use_ethernet);
 #endif
 }
 #endif

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

@@ -26,13 +26,16 @@
 #include <Arduino_DebugUtils.h>
 #include <Arduino_Portenta_OTA.h>
 
+#include <WiFi.h>
+#include <Ethernet.h>
+
 #include "../watchdog/Watchdog.h"
 
 /******************************************************************************
  * FUNCTION DEFINITION
  ******************************************************************************/
 
-int portenta_h7_onOTARequest(char const * ota_url)
+int portenta_h7_onOTARequest(char const * ota_url, bool use_ethernet)
 {
   watchdog_reset();
 
@@ -61,7 +64,13 @@ int portenta_h7_onOTARequest(char const * ota_url)
   watchdog_reset();
 
   /* Download the OTA file from the web storage location. */
-  int const ota_portenta_qspi_download_ret_code = ota_portenta_qspi.download(ota_url, true /* is_https */);
+  MbedSocketClass * download_socket = static_cast<MbedSocketClass*>(&WiFi);
+#if defined (ARDUINO_PORTENTA_H7_M7)
+  if(use_ethernet) {
+    download_socket = static_cast<MbedSocketClass*>(&Ethernet);
+  }
+#endif
+  int const ota_portenta_qspi_download_ret_code = ota_portenta_qspi.download(ota_url, true /* is_https */, download_socket);
   DEBUG_VERBOSE("Arduino_Portenta_OTA_QSPI::download(%s) returns %d", ota_url, ota_portenta_qspi_download_ret_code);
 
   watchdog_reset();

src/utility/ota/OTA.h

@@ -63,7 +63,7 @@ int rp2040_connect_onOTARequest(char const * ota_url);
 #endif
 
 #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_NICLA_VISION)
-int portenta_h7_onOTARequest(char const * ota_url);
+int portenta_h7_onOTARequest(char const * ota_url, bool use_ethernet);
 #endif
 
 #endif /* ARDUINO_OTA_LOGIC_H_ */