diff --git a/ITC81DB_2H/Forms/FormMain.cs b/ITC81DB_2H/Forms/FormMain.cs index 626dc06..725bc1e 100644 --- a/ITC81DB_2H/Forms/FormMain.cs +++ b/ITC81DB_2H/Forms/FormMain.cs @@ -25,8 +25,8 @@ namespace ITC81DB_2H.Forms public partial class FormMain : Form { #region Field - public static string DisplayVersion = "3.3.6"; - public static string ReleaseDate = "2025.03.04"; + public static string DisplayVersion = "3.3.7"; + public static string ReleaseDate = "2025.05.20"; private SmartSplash SmartSplashProgramLoad; public bool IsCommunicationLogOpen; @@ -927,9 +927,9 @@ namespace ITC81DB_2H.Forms if (flagAlarm == true) { - if (this.SystemConfig1.IsExternalInputLamp == true && this.IsLampOnDataSend == false) + if (this.IsLampOnDataSend == false) this.OnExternalInputLampSignal(true, true); - if (this.SystemConfig1.IsExternalInputBuzzer == true && this.IsBuzzerOnDataSend == false) + if (this.IsBuzzerOnDataSend == false) this.OnExternalInputBuzzerSignal(true, true); } } diff --git a/ITC81DB_2H/Forms/FormMainDisplay.cs b/ITC81DB_2H/Forms/FormMainDisplay.cs index fb90987..5f6a43a 100644 --- a/ITC81DB_2H/Forms/FormMainDisplay.cs +++ b/ITC81DB_2H/Forms/FormMainDisplay.cs @@ -325,9 +325,9 @@ namespace ITC81DB_2H.Forms this.labelSorterAlarm.Visible = false; this.PopUpWarningClose(); - if (this.ParentForm.SystemConfig1.IsExternalInputLamp == true && this.ParentForm.IsLampOnDataSend == true) + if (this.ParentForm.IsLampOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.LampOnContinuousDisable, CommunicationID.MainBoard); - if (this.ParentForm.SystemConfig1.IsExternalInputBuzzer == true && this.ParentForm.IsBuzzerOnDataSend == true) + if (this.ParentForm.IsBuzzerOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.BuzzerOnContinuousDisable, CommunicationID.MainBoard); this.ParentForm.IsLampOnDataSend = false; @@ -1637,9 +1637,9 @@ namespace ITC81DB_2H.Forms this.MainAlarm.Visible = true; } - if (this.ParentForm.SystemConfig1.IsExternalInputLamp == true && this.ParentForm.IsLampOnDataSend == true) + if (this.ParentForm.IsLampOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.LampOnContinuousDisable, CommunicationID.MainBoard); - if (this.ParentForm.SystemConfig1.IsExternalInputBuzzer == true && this.ParentForm.IsBuzzerOnDataSend == true) + if (this.ParentForm.IsBuzzerOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.BuzzerOnContinuousDisable, CommunicationID.MainBoard); } private void labelSorterAlarm_Click(object sender, EventArgs e) @@ -1649,9 +1649,9 @@ namespace ITC81DB_2H.Forms this.Part11AutomaticLogoutReset(); this.ParentForm.TransferData(CommunicationCommand.AlarmNgClearSorter, CommunicationID.MainBoard); - if (this.ParentForm.SystemConfig1.IsExternalInputLamp == true && this.ParentForm.IsLampOnDataSend == true) + if (this.ParentForm.IsLampOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.LampOnContinuousDisable, CommunicationID.MainBoard); - if (this.ParentForm.SystemConfig1.IsExternalInputBuzzer == true && this.ParentForm.IsBuzzerOnDataSend == true) + if (this.ParentForm.IsBuzzerOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.BuzzerOnContinuousDisable, CommunicationID.MainBoard); this.labelSorterAlarm.Visible = false; } @@ -1663,9 +1663,9 @@ namespace ITC81DB_2H.Forms if (this.MainAlarm.listBoxMessage.Items.Contains("Sorter A Error") || this.MainAlarm.listBoxMessage.Items.Contains("Sorter B Error")) this.ParentForm.TransferData(CommunicationCommand.AlarmNgClearSorter, CommunicationID.MainBoard); - if (this.ParentForm.SystemConfig1.IsExternalInputLamp == true && this.ParentForm.IsLampOnDataSend == true) + if (this.ParentForm.IsLampOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.LampOnContinuousDisable, CommunicationID.MainBoard); - if (this.ParentForm.SystemConfig1.IsExternalInputBuzzer == true && this.ParentForm.IsBuzzerOnDataSend == true) + if (this.ParentForm.IsBuzzerOnDataSend == true) this.ParentForm.TransferData(CommunicationCommand.BuzzerOnContinuousDisable, CommunicationID.MainBoard); this.PopUpWarningClose(); } diff --git a/ITC81DB_2H/Version.txt b/ITC81DB_2H/Version.txt index 46507ce..a96adff 100644 --- a/ITC81DB_2H/Version.txt +++ b/ITC81DB_2H/Version.txt @@ -13,6 +13,12 @@ ±âº»Çü ÄÁº£¾î °íÁ¤¹Ð¼¾¼­ °è·®±â */ +@ Ver 3.3.7 by CJY + - 2025.05.19 + - Ver 3.3.6 Modify + - (¹ö±×¼öÁ¤)¹ÙÀÌÆÐ½º ¹ö±× ¼öÁ¤ + - (¹ö±×¼öÁ¤)¾Ë¶÷ ¹ß»ý ½Ã, 'CAE' Åë½Å Àü¼Û ¾ÈÇÏ´Â ¹ö±× ¼öÁ¤ + @ Ver 3.3.6 by CJY - 2025.03.04 - Ver 3.3.5 Modify diff --git a/ITC81DB_2H/bin/Release/ITC81DB_2H.exe b/ITC81DB_2H/bin/Release/ITC81DB_2H.exe index cfaaeed..bb7093e 100644 Binary files a/ITC81DB_2H/bin/Release/ITC81DB_2H.exe and b/ITC81DB_2H/bin/Release/ITC81DB_2H.exe differ diff --git a/ITC81DB_2H/obj/Release/ITC81DB_2H.exe b/ITC81DB_2H/obj/Release/ITC81DB_2H.exe index cfaaeed..bb7093e 100644 Binary files a/ITC81DB_2H/obj/Release/ITC81DB_2H.exe and b/ITC81DB_2H/obj/Release/ITC81DB_2H.exe differ