diff --git a/INT63DC_2C.suo b/INT63DC_2C.suo index 4a870f7..0090a1d 100644 Binary files a/INT63DC_2C.suo and b/INT63DC_2C.suo differ diff --git a/INT63DC_2C/Forms/FormInformation.cs b/INT63DC_2C/Forms/FormInformation.cs index 7a05763..55a1fd4 100644 --- a/INT63DC_2C/Forms/FormInformation.cs +++ b/INT63DC_2C/Forms/FormInformation.cs @@ -153,7 +153,7 @@ namespace INT63DC_2C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "8.2.3"; + this.labelDisplayVer.Text = "8.3.0"; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; this.textBoxSerialNo.Location = new Point(395, 225); this.textBoxSerialNo.Visible = false; diff --git a/INT63DC_2C/Forms/FormMain.cs b/INT63DC_2C/Forms/FormMain.cs index e9ed0a2..9a572d8 100644 --- a/INT63DC_2C/Forms/FormMain.cs +++ b/INT63DC_2C/Forms/FormMain.cs @@ -27,7 +27,7 @@ namespace INT63DC_2C.Forms public bool IsBootingComplete; public bool IsAdcLogOpen; private bool FlagADCValueWrite; - public int BufferSmartUart; // Buffer size 정의 + public int BufferSmartUart; // Buffer size 정의 public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11 private int ProductChangNumber; // 변경할 품번 private int FlagTimeoutCount; // 품번 변경 실패 시 재시도 횟수 @@ -36,7 +36,7 @@ namespace INT63DC_2C.Forms private int FlagComRetry3th; // 3회 재전송 횟수 public Queue QueueOverRun = new Queue(); private int IndexOverRun = 0; - public bool IsServoOrigin; // 비상정지 시 false 처리 + public bool IsServoOrigin; // 비상정지 시 false 처리 private string ComPortMainToLCD; diff --git a/INT63DC_2C/Forms/FormMainDisplay.cs b/INT63DC_2C/Forms/FormMainDisplay.cs index d5fb2a5..8b7bb56 100644 --- a/INT63DC_2C/Forms/FormMainDisplay.cs +++ b/INT63DC_2C/Forms/FormMainDisplay.cs @@ -2115,10 +2115,31 @@ namespace INT63DC_2C.Forms if (alarm.IsAlignError == true) this.smartListBox1.AddItem("Product discharge error"); - this.panelAlarmMessageBox2.BringToFront(); - this.panelAlarmMessageBox2.Visible = true; + // bypass 설정 체크 + bool isBypass = false; + if (alarm.IsLoadcellError == true) + { + foreach(WeightData data in this.ParentForm.CollectionWeightData) + { + if (data.IsBypassMode == true) + { + isBypass = true; + continue; + } + } + } + + if (alarm.IsLoadcellError == true) + { + if (isBypass == true) + return; + } + if (this.ParentForm.CurrentAlarmList.IsBuzzerStatus == false) { + this.panelAlarmMessageBox2.BringToFront(); + this.panelAlarmMessageBox2.Visible = true; + this.ParentForm.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); this.ParentForm.TransferData(CommunicationCommand.BuzzerOn, CommunicationID.MainBoard); this.ParentForm.CurrentAlarmList.IsBuzzerStatus = true; @@ -2281,6 +2302,7 @@ namespace INT63DC_2C.Forms if (this.ParentForm.IsServoOrigin == false) this.panelAlarmMessageBox4.Visible = false; + // Bypass Display switch (this.ParentForm.SystemConfig.EquipmentColumns) { case 2: diff --git a/INT63DC_2C/Version.txt b/INT63DC_2C/Version.txt index 60d8ae1..23eb8a3 100644 Binary files a/INT63DC_2C/Version.txt and b/INT63DC_2C/Version.txt differ