diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-11-05 11:53:52 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-11-05 11:53:52 +0200 |
| commit | 0ff5db756936c04637fd347d35eafb8cc4c04346 (patch) | |
| tree | 012e86810a197230d7e7397e675fb42c5323ae58 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 6e91def0919eaba1b24e088e389cb3b6d9c2cde8 (diff) | |
| parent | 2094d5c8b7d3e360b6bd7207d54e845103aca7c4 (diff) | |
| download | Tango-0ff5db756936c04637fd347d35eafb8cc4c04346.tar.gz Tango-0ff5db756936c04637fd347d35eafb8cc4c04346.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.c | 8 |
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(); } |