Merge pull request #328 from pennam/portenta-eth

Add ethernet interface support (OTA and Watchdog) for Portenta H7

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -307,9 +307,8 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
 #if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
   if (enable_watchdog) {
     watchdog_enable();
-#if defined (WIFI_HAS_FEED_WATCHDOG_FUNC) || defined (ARDUINO_PORTENTA_H7_WIFI_HAS_FEED_WATCHDOG_FUNC)
-      WiFi.setFeedWatchdogFunc(watchdog_reset);
-#endif
+    bool const use_ethernet = _connection->getInterface() == NetworkAdapter::ETHERNET ? true : false;
+    watchdog_enable_network_feed(use_ethernet);
   }
 #endif
 
@@ -830,7 +829,8 @@ void ArduinoIoTCloudTCP::onOTARequest()
 #endif
 
 #ifdef BOARD_STM32H7
-  _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

@@ -27,14 +27,15 @@
 
 #include <Arduino_DebugUtils.h>
 #include <Arduino_Portenta_OTA.h>
+#include <Arduino_ConnectionHandler.h>
 
 #include "../watchdog/Watchdog.h"
 
 /******************************************************************************
  * FUNCTION DEFINITION
  ******************************************************************************/
 
-int portenta_h7_onOTARequest(char const * ota_url)
+int portenta_h7_onOTARequest(char const * ota_url, const bool use_ethernet)
 {
   watchdog_reset();
 
@@ -63,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 (BOARD_HAS_ETHERNET)
+  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
 
 #ifdef BOARD_STM32H7
-int portenta_h7_onOTARequest(char const * ota_url);
+int portenta_h7_onOTARequest(char const * ota_url, const bool use_ethernet);
 #endif
 
 #endif /* ARDUINO_OTA_LOGIC_H_ */

src/utility/watchdog/Watchdog.cpp

@@ -38,6 +38,8 @@
 #  define NANO_RP2040_WATCHDOG_MAX_TIMEOUT_ms (8389)
 #endif /* ARDUINO_ARCH_MBED */
 
+#include <Arduino_ConnectionHandler.h>
+
 /******************************************************************************
  * GLOBAL VARIABLES
  ******************************************************************************/
@@ -114,6 +116,19 @@ static void mbed_watchdog_reset()
   }
 }
 
+#if defined (ARDUINO_PORTENTA_H7_WIFI_HAS_FEED_WATCHDOG_FUNC)
+static void mbed_watchdog_enable_network_feed(const bool use_ethernet)
+{
+#if defined(BOARD_HAS_ETHERNET)
+  if(use_ethernet) {
+    Ethernet.setFeedWatchdogFunc(watchdog_reset);
+  } else
+#endif
+    WiFi.setFeedWatchdogFunc(watchdog_reset);
+
+}
+#endif
+
 void mbed_watchdog_trigger_reset()
 {
   watchdog_config_t cfg;
@@ -154,4 +169,15 @@ void watchdog_reset()
   mbed_watchdog_reset();
 #endif
 }
+
+void watchdog_enable_network_feed(const bool use_ethernet)
+{
+#ifdef WIFI_HAS_FEED_WATCHDOG_FUNC
+  WiFi.setFeedWatchdogFunc(watchdog_reset);
+#endif
+
+#ifdef ARDUINO_PORTENTA_H7_WIFI_HAS_FEED_WATCHDOG_FUNC
+  mbed_watchdog_enable_network_feed(use_ethernet);
+#endif
+}
 #endif /* (ARDUINO_ARCH_SAMD) || (ARDUINO_ARCH_MBED) */

src/utility/watchdog/Watchdog.h

@@ -25,6 +25,7 @@
 #if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)
 void watchdog_enable();
 void watchdog_reset();
+void watchdog_enable_network_feed(const bool use_ethernet);
 #endif /* (ARDUINO_ARCH_SAMD) || (ARDUINO_ARCH_MBED) */
 
 #ifdef ARDUINO_ARCH_MBED