diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-29 14:43:11 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-29 14:43:11 +0200 |
| commit | 5a1fafe5ba74f32fcabaf25466c046527ff2384e (patch) | |
| tree | 07f313e2f25d2e58f3abd48794e176611bf20d6e /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 1fabacea3865a285f34a706a4a83006a7e59fb50 (diff) | |
| parent | bb541d734bae59614659fe1c4bc4bbe2f85d16d0 (diff) | |
| download | Tango-5a1fafe5ba74f32fcabaf25466c046527ff2384e.tar.gz Tango-5a1fafe5ba74f32fcabaf25466c046527ff2384e.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.c | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/control.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 3de362af9..d366e8832 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -785,6 +785,7 @@ uint32_t MillisecLowLoop(uint32_t tick) PressureCalc[Disp_i] = MillisecCalculatePressures(Disp_i); } } + HeaterPrepareFailureCheck(); if (WHS_Type == WHS_TYPE_NEW) { //Trigger_WHS_PT100_Read_All(); diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 0a092821e..e02bd8191 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -189,6 +189,7 @@ uint32_t ControlActivityLed( uint32_t Parameter1) AlarmHandlingSetAlarm(EVENT_TYPE__FPGA_WATCHDOG_ACTIVATED,true); if (JobIsActive()) { + Report("Hardware Failure Error - abort job!",__FILE__,__LINE__,EVENT_TYPE__FPGA_WATCHDOG_ACTIVATED,RpError, 0,0); JobEndReason = JOB_MOTOR_ALARM; usnprintf(AlarmReasonStr, 100, "Hardware Failure Error"); SendJobProgress(0.0,0,false, "Hardware Failure Error"); |