diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs index a1d602a..9f2de9c 100644 --- a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -63,7 +63,7 @@ namespace ITC81DB_2.Controls private void DefaultSetting() { this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SerialNumber; - this.labelDisplayVer.Text = "2.5.0"; + this.labelDisplayVer.Text = "2.6.0"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_2/DataStore.cs b/ITC81DB_2/DataStore.cs index 8d75911..b32b34e 100644 --- a/ITC81DB_2/DataStore.cs +++ b/ITC81DB_2/DataStore.cs @@ -1225,6 +1225,7 @@ namespace ITC81DB_2 private bool m_IsEmergencyStop; private bool m_IsDoorInterlock; private bool m_IsEntryNotDetected; + private bool m_IsEntryStucked; private DateTime m_StartTime; private DateTime m_StopTime; @@ -1297,6 +1298,11 @@ namespace ITC81DB_2 get { return this.m_IsEntryNotDetected; } set { this.m_IsEntryNotDetected = value; } } + public bool IsEntryStucked + { + get { return this.m_IsEntryStucked; } + set { this.m_IsEntryStucked = value; } + } public DateTime StartTime { @@ -1599,6 +1605,7 @@ namespace ITC81DB_2 this.IsPressureSensingError = false; this.IsDoorInterlock = false; this.IsEntryNotDetected = false; + this.IsEntryStucked = false; this.StartTime = new DateTime(1111, 11, 11, 11, 11, 11); this.StopTime = new DateTime(1111, 11, 11, 11, 11, 11); diff --git a/ITC81DB_2/Forms/FormMain.cs b/ITC81DB_2/Forms/FormMain.cs index caf3537..93d7e1c 100644 --- a/ITC81DB_2/Forms/FormMain.cs +++ b/ITC81DB_2/Forms/FormMain.cs @@ -303,11 +303,15 @@ namespace ITC81DB_2.Forms { } else { } - // 알람 11- + // 알람 11-진입센서걸림 if (sValue3[1] == '0') - { } + data.IsEntryStucked = false; else - { } + { + data.IsEntryStucked = true; + if (this.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Start) + this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + } // 알람 10- if (sValue3[2] == '0') { } @@ -900,7 +904,7 @@ namespace ITC81DB_2.Forms this.SaveCounterFile2(this.CurrentWeightData2, this.SystemConfig.ProductNumber - 1); } - // 운전 시, 진입센서 미감지 Pop up 창 자동 Close + // 운전 시, Pop up 창 자동 Close this.ChildFormMainDisplay.PopUpWarningClose(); if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index f25c9da..608bfd0 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -193,6 +193,8 @@ namespace ITC81DB_2.Forms if (this.AlarmListBool[4] != data2.IsEntrySensorError) flagChange = true; if (this.AlarmListBool[5] != data1.IsEntryNotDetected) flagChange = true; if (this.AlarmListBool[6] != data2.IsEntryNotDetected) flagChange = true; + if (this.AlarmListBool[7] != data1.IsEntryStucked) flagChange = true; + if (this.AlarmListBool[8] != data2.IsEntryStucked) flagChange = true; } this.AlarmListBool.Clear(); @@ -203,6 +205,8 @@ namespace ITC81DB_2.Forms this.AlarmListBool.Add(data2.IsEntrySensorError); this.AlarmListBool.Add(data1.IsEntryNotDetected); this.AlarmListBool.Add(data2.IsEntryNotDetected); + this.AlarmListBool.Add(data1.IsEntryStucked); + this.AlarmListBool.Add(data2.IsEntryStucked); foreach (bool listBool in this.AlarmListBool) { @@ -254,6 +258,22 @@ namespace ITC81DB_2.Forms else this.PopUpWarning("Entry not detected"); } + if (data1.IsEntryStucked == true) + { + this.MainDisplayAlarm.listBoxMessage.Items.Add("#1 Entry Sensor Stucked"); + if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) + this.PopUpWarning("진입센서 이상"); + else + this.PopUpWarning("Entry Sensor Stucked"); + } + if (data2.IsEntryStucked == true) + { + this.MainDisplayAlarm.listBoxMessage.Items.Add("#2 Entry Sensor Stucked"); + if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) + this.PopUpWarning("진입센서 이상"); + else + this.PopUpWarning("Entry Sensor Stucked"); + } if (flagChange == true && this.MainDisplayAlarm.listBoxMessage.Items.Count > 0) { diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index a7279a7..930ffec 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -13,9 +13,21 @@ 2 ⺻ 跮 */ +@ Ver 2.6.0 by CJY + - 2022.12.06 + - Ver 2.5.0 Modify + - MainBoard 2.4.2 ȣȯ + - Լɸ ߰ + 1. ˶ 11 - Լɸ ߰ + 2. Լ ð ̵Ǿ ˶ ߻ + ˶ ߻ , ȣ κ + 3. ˶ ˾ + 3. ˶ : + @ Ver 2.5.0 by CJY - 2022.12.05 - Ver 2.4.0 Modify + - MainBoard 2.3.7 ȣȯ - ǰ ̰ ߰(帶 #2818 ) -> : ð ־ 1. Ͼ 'ǰ ̰' 0.0 ʰ , ۵ diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index e5053f2..b2b1b0a 100644 Binary files a/ITC81DB_2/bin/Release/ITC81DB_2.exe and b/ITC81DB_2/bin/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2/obj/Release/ITC81DB_2.exe b/ITC81DB_2/obj/Release/ITC81DB_2.exe index e5053f2..b2b1b0a 100644 Binary files a/ITC81DB_2/obj/Release/ITC81DB_2.exe and b/ITC81DB_2/obj/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll index d36ecbd..e244053 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll differ