diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-25 18:37:50 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-25 18:37:50 +0200 |
| commit | 7c28d90c42bdb0bb91bcbd862b7c860c22cf3f7d (patch) | |
| tree | ce1f94d75acebee5ddc7cecd80b2982838fe5712 /Software/Embedded_SW/Embedded/Modules/AlarmHandling | |
| parent | b87aee2720cd71594b8cb68849d18b42cd0905bb (diff) | |
| download | Tango-7c28d90c42bdb0bb91bcbd862b7c860c22cf3f7d.tar.gz Tango-7c28d90c42bdb0bb91bcbd862b7c860c22cf3f7d.zip | |
Dryer instead of drier (resolving bug #3907)
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/AlarmHandling')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index 5d1361898..968ef689b 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -822,7 +822,7 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob) //{ // DispenserInUse[Dispenser_i] = false; //} - JobEndReasonEnum FoundReason = JOB_OK; + JobEndReasonEnum FoundReason = JOB_OK,tempFoundReason; Task_Handle TaskHandle1 = Task_self(); int pri = Task_getPri(TaskHandle1); @@ -975,7 +975,13 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob) } if ((IFS_Availability[1] == IFS_RECOGNIZED_INIT_PASSED)&&(IFS_Availability[2] == IFS_RECOGNIZED_INIT_PASSED)) //ifs installed -check cartridges { - FoundReason = Waste_CheckState(); + + tempFoundReason = Waste_Prepare(); + if (tempFoundReason!=JOB_OK) + { + FoundReason = tempFoundReason; + ReportWithPackageFilter(AlarmFilter,"waste handling alarm preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0); + } } if ((AlarmState[Alarm_i].Status == true)&&(FoundReason == JOB_OK)) { |