aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-11-05 11:48:38 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-11-05 11:48:38 +0200
commit2094d5c8b7d3e360b6bd7207d54e845103aca7c4 (patch)
tree3b362f598f15436bf3c82533a2fd21387603452a /Software/Embedded_SW/Embedded/Modules/Control
parent408df8b336b56192f8536e51830dbc3c40743674 (diff)
parent8bce53c5bea437d09946e1d29f153bfaa7a45133 (diff)
downloadTango-2094d5c8b7d3e360b6bd7207d54e845103aca7c4.tar.gz
Tango-2094d5c8b7d3e360b6bd7207d54e845103aca7c4.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 9eb9d9822..5785bafe4 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -486,6 +486,10 @@ uint32_t MillisecLoop(uint32_t tick)
{
MillisecReadFromTempSensor(Sensor_i, NULL);
}
+ if (watchdogCriticalAlarm == false)
+ {
+ Control_WD(ENABLE,5); //activate heaters/dispenser watchdog, 0.5 seconds
+ }
}
if (O900Millisecond_Tick)
@@ -499,10 +503,6 @@ uint32_t MillisecLoop(uint32_t tick)
CalculateDispenserPressure(Disp_i);
}
FPGA_GetAllDispensersValveBusyOCD();
- if (watchdogCriticalAlarm == false)
- {
- Control_WD(ENABLE,50); //activate heaters/dispenser watchdog, 5 seconds
- }
DrawerFansStatus = Read_Fans_Tacho();
KeepAliveOneSecondCall();
}