Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Coenen <manuel@duet3d.com>2021-02-08 12:40:04 +0300
committerManuel Coenen <manuel@duet3d.com>2021-02-08 12:40:04 +0300
commit55392b9b281ec312bc2f6df6bddde56f4b67cbc1 (patch)
tree968e1058c30e1c1dcac6469ebb390b2cf3a64c3a /src/RepRap.cpp
parentaf11d08f91d98c7ce6c5ae15602378043d278260 (diff)
parent09167097d1d887d0b3b033595020a0ed8603c55d (diff)
Merge remote-tracking branch 'origin/3.3-dev' into wil-rework-spindle-management
Diffstat (limited to 'src/RepRap.cpp')
-rw-r--r--src/RepRap.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/RepRap.cpp b/src/RepRap.cpp
index e6a290bf..01d6fb57 100644
--- a/src/RepRap.cpp
+++ b/src/RepRap.cpp
@@ -1234,8 +1234,9 @@ void RepRap::Tick() noexcept
if (active)
{
WatchdogReset(); // kick the watchdog
+
#if SAM4E || SAME70
- RSWDT->RSWDT_CR = RSWDT_CR_KEY_PASSWD | RSWDT_CR_WDRSTT; // kick the secondary watchdog
+ WatchdogResetSecondary(); // kick the secondary watchdog
#endif
if (!stopped)