watchdog

eez-open · Nov 6, 2020 · 42f8470 · 42f8470
1 parent 43dfc8c
commit 42f8470
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/eez/modules/dib-dcp405/dib-dcp405.cpp b/src/eez/modules/dib-dcp405/dib-dcp405.cpp
@@ -400,6 +400,8 @@ struct DcpChannel : public Channel {
 			}
 			delay(1);
 		}
+
+		WATCHDOG_RESET(WATCHDOG_LONG_OPERATION);
 #endif
     }
 

diff --git a/src/eez/system.cpp b/src/eez/system.cpp
@@ -18,19 +18,22 @@
 
 #include <stdio.h>
 
-#include <main.h>
-#include <iwdg.h>
-
 #include <eez/system.h>
 
 #if defined(EEZ_PLATFORM_STM32)
+#include <main.h>
+#include <iwdg.h>
+
 volatile uint32_t g_tickCount;
-#endif
 
 int g_watchdogExpectingTask = WATCHDOG_HIGH_PRIORITY_THREAD;
 
+namespace eez {
+extern bool g_isBooted;
+}
+
 void doWatchdogReset(int fromTask) {
-	if (fromTask == WATCHDOG_LONG_OPERATION) {
+	if (fromTask == WATCHDOG_LONG_OPERATION || !eez::g_isBooted) {
 		HAL_IWDG_Refresh(&hiwdg);
 	} else if (fromTask == WATCHDOG_HIGH_PRIORITY_THREAD) {
 		if (g_watchdogExpectingTask == WATCHDOG_HIGH_PRIORITY_THREAD) {
@@ -44,6 +47,7 @@ void doWatchdogReset(int fromTask) {
 		}
 	}
 }
+#endif
 
 namespace eez {