diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-05-18 17:19:06 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-05-18 17:19:06 +0300 |
| commit | 049be36c736eb88d9030c2ce720863375ce134cc (patch) | |
| tree | 43669f67594784cae0612977ee76f6c4bc62a660 /Software/Embedded_SW/Embedded/Modules/AlarmHandling | |
| parent | 9f6741e51a0145b684b182cb8a01ca32ee77d0a5 (diff) | |
| download | Tango-049be36c736eb88d9030c2ce720863375ce134cc.tar.gz Tango-049be36c736eb88d9030c2ce720863375ce134cc.zip | |
cleaning job bug, prevent reporting dispenser homing for auto homing. drier fan / whs fan alarms
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/AlarmHandling')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c | 72 |
1 files changed, 51 insertions, 21 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index 01d372aae..392be6177 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -1407,35 +1407,65 @@ uint32_t AlarmHandlingLoop(uint32_t tick) } break; case DRYER_FAN : - value = Read_Dryer_Fan_Tacho(); - if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical ) - if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value == DRYER_FAN_STOP)) - { - Status = true; - //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0); - } - else if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Warning) + if (IsDryerStopped()==STOP) { - if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value < DRYER_FAN_MIN_RPM)) + Status = false; + //ReportWithPackageFilter(AlarmFilter,"----------- DRYER_FAN skip-----------", __FILE__,IsDryerStopped(),Alarm_i, RpMessage, Status, 0); + } + else + { + value = Read_Dryer_Fan_Tacho(); + if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical ) + if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value == DRYER_FAN_STOP)) + { + Status = true; + //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0); + } + else if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Warning) { - Status = true; - //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0); + if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value < DRYER_FAN_MIN_RPM)) + { + Status = true; + //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0); + } } + //ReportWithPackageFilter(AlarmFilter,"----------- DRYER_FAN----------------", __FILE__,value,Alarm_i, RpMessage, Status, 0); } break; - } + default: - //ReportWithPackageFilter(AlarmFilter,"------------FANS_RPM[Alarm_i]----------------", __FILE__,__LINE__,Alarm_i, RpMessage, value, 0); - - if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical ) - { - if (AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) - { - if (value < AlarmItem[Alarm_i].AlarmValue) + //ReportWithPackageFilter(AlarmFilter,"------------FANS_RPM[Alarm_i]----------------", __FILE__,__LINE__,Alarm_i, RpMessage, value, 0); + if (AlarmItem[Alarm_i].DeviceId >= WHS_FAN_1 ) { - Status = true; + value = WHS_Get_fan_tach(AlarmItem[Alarm_i].DeviceId - WHS_FAN_1+1); + if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical ) + if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value == DRYER_FAN_STOP)) + { + Status = true; + //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0); + } + else if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Warning) + { + if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value < DRYER_FAN_MIN_RPM)) + { + Status = true; + //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0); + } + } + if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical ) + { + if (AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) + { + if (value < AlarmItem[Alarm_i].AlarmValue) + { + Status = true; + } + } + } } - } + else + Status = false; + break; } } break; |