Skip to content

Commit 900cdb1

Browse files
committed
Watchdog: Remove Hack to trigger reset of RP2040 after OTA
1 parent cd09f04 commit 900cdb1

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

Diff for: src/utility/ota/OTA-nano-rp2040.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ int rp2040_connect_onOTARequest(char const * ota_url)
243243
}
244244

245245
/* Perform the reset to reboot to SFU. */
246-
mbed_watchdog_trigger_reset();
247-
/* If watchdog is enabled we should not reach this point */
248246
NVIC_SystemReset();
249247

250248
return static_cast<int>(OTAError::None);

Diff for: src/utility/watchdog/Watchdog.cpp

-15
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,6 @@ static void mbed_watchdog_enable_network_feed(NetworkAdapter ni)
131131
#endif
132132
}
133133
}
134-
135-
void mbed_watchdog_trigger_reset()
136-
{
137-
watchdog_config_t cfg;
138-
cfg.timeout_ms = 1;
139-
140-
if (hal_watchdog_init(&cfg) == WATCHDOG_STATUS_OK) {
141-
is_watchdog_enabled = true;
142-
while(1){}
143-
}
144-
else {
145-
DEBUG_WARNING("%s: watchdog could not be reconfigured", __FUNCTION__);
146-
}
147-
148-
}
149134
#endif /* ARDUINO_ARCH_MBED */
150135

151136
#if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)

Diff for: src/utility/watchdog/Watchdog.h

-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,4 @@ void watchdog_reset();
3434
void watchdog_enable_network_feed(NetworkAdapter ni);
3535
#endif /* (ARDUINO_ARCH_SAMD) || (ARDUINO_ARCH_MBED) */
3636

37-
#ifdef ARDUINO_ARCH_MBED
38-
void mbed_watchdog_trigger_reset();
39-
#endif /* ARDUINO_ARCH_MBED */
40-
4137
#endif /* ARDUINO_AIOTC_UTILITY_WATCHDOG_H_ */

0 commit comments

Comments
 (0)