aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2019-04-07 16:15:05 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2019-04-07 16:15:05 +0300
commitb4a71931ea52636c6b36376aa9d71697ccf73524 (patch)
treed4b6db4671e4e7bf1f91d008798ae909462ed784 /Software/Embedded_SW/Embedded/Modules/Control
parent4a9fb8a89a7fc48d9d3ecc9f24770c472834453d (diff)
parentdf349ae963176cb53ef7b924cfb53ba09d32bfaf (diff)
downloadTango-b4a71931ea52636c6b36376aa9d71697ccf73524.tar.gz
Tango-b4a71931ea52636c6b36376aa9d71697ccf73524.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 738f59686..d34ac9ff9 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -484,6 +484,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
if (watchdogCriticalAlarm == false)
{
Control_WD(ENABLE,5); //activate heaters/dispenser watchdog, 0.5 seconds
+ //LOG_ERROR (1111, "Control_WD");
}
}
}