From ceccbd9f54fdfc30431f6350cd16278c16860465 Mon Sep 17 00:00:00 2001
From: 천호석 <hosuk1418@naver.com>
Date: 월, 27 6월 2022 10:32:18 +0900
Subject: [PATCH] 기존 Heavy alarm 발생 후 alarm clear 시 R3(장비 상태 복구중) 으로 변경 -> Heavy alarm 발생 후 buzzer off 시 R3 (장비 상태 복구중), Alarm clear 시 W4(기타 정지중)으로 상태 변경
---
SHARP_CLAS_UI/500.Equipment/Equipment.cs | 22 +++++++++++++++++++++-
SHARP_CLAS_UI/300.Etc_Screen/Form_Alarm_List.cs | 12 ++++++++++--
SHARP_CLAS_UI/500.Equipment/200.Alarm/Alarm_Manager.cs | 2 +-
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/SHARP_CLAS_UI/300.Etc_Screen/Form_Alarm_List.cs b/SHARP_CLAS_UI/300.Etc_Screen/Form_Alarm_List.cs
index 5f930a0..59804ef 100644
--- a/SHARP_CLAS_UI/300.Etc_Screen/Form_Alarm_List.cs
+++ b/SHARP_CLAS_UI/300.Etc_Screen/Form_Alarm_List.cs
@@ -94,8 +94,8 @@
_Parent._equip.cim_client.Send_Alarm("E12345678", false, Occurred_Alarm);
}
- if(AlarmList.Exists(x=> x.Heavy == true))
- _Parent._equip.Set_Equipment_Status_Code(En_Equipment_Status_Code.T3);
+ if (Alarm_Manager.Instance.Alarm_Status == En_Alarm_Status.HEAVY)
+ _Parent._equip.Set_Equipment_Status_Code(En_Equipment_Status_Code.W4);
}
}
@@ -107,6 +107,14 @@
private void btn_Buzzer_Stop_Click(object sender, EventArgs e)
{
+ if (_Parent._equip.cim_mode == En_Cim_Mode.Online)
+ {
+ if (AlarmList.Exists(x => x.Heavy == true))
+ {
+ _Parent._equip.Set_Equipment_Status_Code(En_Equipment_Status_Code.T3);
+ }
+ }
+
_Parent._equip.Board_Control.IO_manager.Set_Output(OutputData.Buzzer_1_Relay, false);
}
diff --git a/SHARP_CLAS_UI/500.Equipment/200.Alarm/Alarm_Manager.cs b/SHARP_CLAS_UI/500.Equipment/200.Alarm/Alarm_Manager.cs
index e22c7bf..07d6487 100644
--- a/SHARP_CLAS_UI/500.Equipment/200.Alarm/Alarm_Manager.cs
+++ b/SHARP_CLAS_UI/500.Equipment/200.Alarm/Alarm_Manager.cs
@@ -332,7 +332,7 @@
{
sm.Set_Bit(sa, false);
}
-
+
Occured_List.Clear();
Alarm_Status = En_Alarm_Status.NONE;
}
diff --git a/SHARP_CLAS_UI/500.Equipment/Equipment.cs b/SHARP_CLAS_UI/500.Equipment/Equipment.cs
index 0cdb73a..e05e9b7 100644
--- a/SHARP_CLAS_UI/500.Equipment/Equipment.cs
+++ b/SHARP_CLAS_UI/500.Equipment/Equipment.cs
@@ -547,7 +547,7 @@
private User_Info _user;
private SequenceTimer _modeChangeTime = new SequenceTimer();
- private string _programVersion = "001.001.004";
+ private string _programVersion = "001.001.005";
#endregion
#region Construct
@@ -724,6 +724,16 @@
{
Set_Load_Tray_Buzzer(false);
Board_Control.IO_manager.Set_Output(OutputData.Buzzer_1_Relay, false);
+
+ if(cim_mode == En_Cim_Mode.Online)
+ {
+ if (Alarm_Manager.Instance.Alarm_Status == En_Alarm_Status.HEAVY)
+ {
+ Set_Equipment_Status_Code(En_Equipment_Status_Code.T3);
+ Set_Equipment_Status_Code(En_Equipment_Status_Code.W4);
+ }
+ }
+
Alarm_Manager.Instance.Alarm_Clear();
}
}
@@ -744,6 +754,16 @@
{
Set_Unload_Tray_Buzzer(false);
Board_Control.IO_manager.Set_Output(OutputData.Buzzer_1_Relay, false);
+
+ if (cim_mode == En_Cim_Mode.Online)
+ {
+ if (Alarm_Manager.Instance.Alarm_Status == En_Alarm_Status.HEAVY)
+ {
+ Set_Equipment_Status_Code(En_Equipment_Status_Code.T3);
+ Set_Equipment_Status_Code(En_Equipment_Status_Code.W4);
+ }
+ }
+
Alarm_Manager.Instance.Alarm_Clear();
unloader.LiftNg.Shuttle.Forward();
}
--
Gitblit v1.9.3