Add ethernet interface support (OTA and Watchdog) for Portenta H7 #328
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #328 +/- ##
=======================================
Coverage 94.87% 94.87%
=======================================
Files 27 27
Lines 1113 1113
=======================================
Hits 1056 1056
Misses 57 57
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
per1234
added
type: enhancement
aentinger
approved these changes
Jul 28, 2022
src/utility/ota/OTA-portenta-h7.cpp
Outdated
| @@ -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) | |||
There was a problem hiding this comment.
Not sure if this ifdef is really needed? After all, should not this file be only compiled for Portenta H7?
There was a problem hiding this comment.
Yes, it is. The file is compiled also for NICLA VISION that does not have Ethernet. I think the best thing to do here is to rename the file into OTA-stm32-h7.cpp to avoid confusion, but then we need also to rename Arduino_Portenta_OTA library; or make a new library called Arduino_STM32_H7_OTA and deprecate Arduino_Portenta_OTA.
src/utility/watchdog/Watchdog.cpp
Outdated
| @@ -63,6 +66,11 @@ static void samd_watchdog_reset() | |||
| } | |||
| } | |||
|
|
|||
| static void samd_watchdog_enable_network_feed() | |||
| { | |||
| WiFi.setFeedWatchdogFunc(watchdog_reset); | |||
There was a problem hiding this comment.
This function works for NINA? Not to say that it does not, I just never saw it before 😉
There was a problem hiding this comment.
Yes, we added this function with this PR arduino-libraries/WiFiNINA#186 one year ago
src/utility/watchdog/Watchdog.cpp
Outdated
| @@ -154,4 +173,13 @@ void watchdog_reset() | |||
| mbed_watchdog_reset(); | |||
| #endif | |||
| } | |||
|
|
|||
| void watchdog_enable_network_feed(bool use_ethernet) | |||
There was a problem hiding this comment.
In how far is watchdog_enable_network_feed different from watchdog_enable. What are the advantages of one over the other? I don't think I get it.
There was a problem hiding this comment.
watchdog_enable enables the mcu watchdog
watchdog_enable_network_feed enables watchdog kiks/resets during network operations. This was introduced with:
Thanks @aentinger |
pennam
force-pushed
the
portenta-eth
branch
from
21974b0 to
c6a12f6
Compare
|
Cleanup and rebase: c6a12f6 should be dropped before merge. |
|
rebased to resolve conflicts |
The implementation is done as for WiFi so we can reuse the same define ARDUINO_PORTENTA_H7_WIFI_HAS_FEED_WATCHDOG_FUNC Move watchdog network feed configuration into Watchdog module
In this way we can also use the more meaningful define BOARD_HAS_ETHERNET
…ernet.h In this way we can also use the more meaningful define BOARD_HAS_ETHERNET
This board is an mbed platform + WiFiNINA so needs special handling for watchdog network feed.
|
Dropped c6a12f6 |
|
Memory usage change @ fdaac0f
Click for full report table
Click for full report CSV |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needs:
Ethernet: add possibility to configure timeout with manual configuration arduino/ArduinoCore-mbed#526 for Ethernet connection