aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/AlarmHandling
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-06-29 21:50:42 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-06-29 21:50:42 +0300
commitadebfb6bccfc75ae2057a538f5b028b45ac2d8b4 (patch)
treeddb9fb2c1147f7e7aedcb403405fcf5d31f01f56 /Software/Embedded_SW/Embedded/Modules/AlarmHandling
parent7707bbff3cf8d37d9cab419353ce8d6f28a482b0 (diff)
downloadTango-adebfb6bccfc75ae2057a538f5b028b45ac2d8b4.tar.gz
Tango-adebfb6bccfc75ae2057a538f5b028b45ac2d8b4.zip
Embedded SW Release note - Version 1.4.6.34 - Pack 2+
============================================================= Validate IFS and cartridge location on manual waste handling - bug #3033 better handling of powerstep01 configuration and motors clocks waste level: logs, fixed reading during waste filling, fix PT100 reading in WHS //important, OK improve diespensers reading in I2C timing //important OK alarm handling: fix report (mid tank empty) diagnostics - waste level in liters Heating and process - avoid activating all heaters at once. tested for flat head. Heating - remove alarms when colling dwn due to change of RML or idle mode Thread - improve feeder tension handling system: hold initalization process after 3 failures to enable code / parameters change and debugging
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/AlarmHandling')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 356f192a3..1c2b6662d 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -652,6 +652,9 @@ JobEndReasonEnum getEndReason(uint32_t AlarmId)
usnprintf(AlarmReasonStr, 100, "Alarm %d type %d caused a job stop",AlarmId,AlarmItem[AlarmId].EventType);
return JOB_OTHER_ALARM;
}
+ case ALARM_SOURCE_TYPE__FluidLevelAlarm:
+ usnprintf(AlarmReasonStr, 100, "Midtank %d is empty",AlarmItem[AlarmId].DeviceId);
+ return JOB_OUT_OF_DYE;
default:
usnprintf(AlarmReasonStr, 100, "Alarm %d type %d caused a job stop",AlarmId,AlarmItem[AlarmId].EventType);
return JOB_OTHER_ALARM;
@@ -993,6 +996,8 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
if (FoundReason != JOB_OK)
{
JobEndReason = getEndReason(AlarmId);
+ if (JobEndReason!=FoundReason)
+ ReportWithPackageFilter(AlarmFilter,"end reason mismatch!!!", __FILE__,AlarmId,JobEndReason, RpMessage, FoundReason, 0);
//AbortJob(AlarmReasonStr);
//PrepareReady(Module_Alarms,ModuleFail);
ReportWithPackageFilter(AlarmFilter,AlarmReasonStr, __FILE__,__LINE__,AlarmId, RpMessage, DEBUG_LOG_CATEGORY__Error, 0);