diff --git a/INT63DC_2C/DataStore.cs b/INT63DC_2C/DataStore.cs index 0253971..4fa0ef2 100644 --- a/INT63DC_2C/DataStore.cs +++ b/INT63DC_2C/DataStore.cs @@ -394,6 +394,8 @@ namespace INT63DC_2C public static readonly string Start = "Cbs00"; // 정지 public static readonly string Stop = "Cbt00"; + // 소거 + public static readonly string Clear = "Cbe00"; // 영점 public static readonly string Zero = "Cbz00"; // NG Signal diff --git a/INT63DC_2C/Forms/FormInformation.cs b/INT63DC_2C/Forms/FormInformation.cs index 20b13bf..ea7b24d 100644 --- a/INT63DC_2C/Forms/FormInformation.cs +++ b/INT63DC_2C/Forms/FormInformation.cs @@ -154,7 +154,7 @@ namespace INT63DC_2C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "8.8.0"; + this.labelDisplayVer.Text = "8.8.1"; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; this.textBoxSerialNo.Location = new Point(395, 225); this.textBoxSerialNo.Visible = false; diff --git a/INT63DC_2C/Forms/FormMainDisplay.cs b/INT63DC_2C/Forms/FormMainDisplay.cs index 1110f17..c4688de 100644 --- a/INT63DC_2C/Forms/FormMainDisplay.cs +++ b/INT63DC_2C/Forms/FormMainDisplay.cs @@ -2197,7 +2197,7 @@ namespace INT63DC_2C.Forms if (alarm.IsEmergencyStop == true) { this.MainDisplayAlarmList.listBoxMessage.AddItem("Emergency Stop"); - isAlarmMessageView = true; + //isAlarmMessageView = true; } if (alarm.IsServoAlarm == true) { @@ -2277,8 +2277,8 @@ namespace INT63DC_2C.Forms { this.smartListBox1.ClearAll(); - if (alarm.IsEmergencyStop == true) - this.smartListBox1.AddItem("Emergency Stop"); + //if (alarm.IsEmergencyStop == true) + // this.smartListBox1.AddItem("Emergency Stop"); if (alarm.IsLoadcellError == true) this.smartListBox1.AddItem("LoadCell Error"); if (alarm.IsPressureError == true) @@ -2291,7 +2291,7 @@ namespace INT63DC_2C.Forms this.smartListBox1.AddItem("Entry Sensor Error"); if (alarm.IsAlignError == true) this.smartListBox1.AddItem("Product discharge error"); - if(alarm.IsSorter1Error == true) + if (alarm.IsSorter1Error == true) this.smartListBox1.AddItem("Sorter1 error"); if (alarm.IsSorter2Error == true) this.smartListBox1.AddItem("Sorter2 error"); @@ -2299,8 +2299,8 @@ namespace INT63DC_2C.Forms // bypass 설정 체크 bool isBypass = false; if (alarm.IsLoadcellError == true) - { - foreach(WeightData data in this.ParentForm.CollectionWeightData) + { + foreach (WeightData data in this.ParentForm.CollectionWeightData) { if (data.IsBypassMode == true) { @@ -3032,6 +3032,8 @@ namespace INT63DC_2C.Forms DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 8); if (myDlg.ShowDialog() == DialogResult.Yes) { + this.ParentForm.TransferData(CommunicationCommand.Clear, CommunicationID.SubBoardAll); + switch (this.ParentForm.SystemConfig.EquipmentColumns) { case 2: diff --git a/INT63DC_2C/Forms/FormOptionSetting.cs b/INT63DC_2C/Forms/FormOptionSetting.cs index 0f073d4..eaf90ae 100644 --- a/INT63DC_2C/Forms/FormOptionSetting.cs +++ b/INT63DC_2C/Forms/FormOptionSetting.cs @@ -160,12 +160,6 @@ namespace INT63DC_2C.Forms } private void InitializeControl() { - //// 피드백 보드 사용 유무 - //if (this.ParentForm.SystemConfig.IsOptFeedbackBoardUse == true) - // this.buttonFeedbackUse.ButtonDown(); - //else - // this.buttonFeedbackUse.ButtonUp(); - // 데이터 통계 기능 사용 유무 if (this.ParentForm.SystemConfig.IsOptDataStatistics == true) this.buttonDataStatistics.ButtonDown(); @@ -177,6 +171,12 @@ namespace INT63DC_2C.Forms this.buttonSorter4Location.ButtonUp(); else this.buttonSorter4Location.ButtonDown(); + + // 선별부 동작 감지 사용 여부 + if (this.ParentForm.SystemConfig.IsSorterCheckEnable == true) + this.buttonSorterCheckEnable.ButtonDown(); + else + this.buttonSorterCheckEnable.ButtonUp(); } public void DisplayRefresh() diff --git a/INT63DC_2C/Version.txt b/INT63DC_2C/Version.txt index 35bc6e5..73a90c0 100644 Binary files a/INT63DC_2C/Version.txt and b/INT63DC_2C/Version.txt differ diff --git a/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.dll b/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.dll index 32b5ce5..4c5de4b 100644 Binary files a/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.dll and b/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.dll differ diff --git a/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.pdb b/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.pdb index c72a774..746add7 100644 Binary files a/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.pdb and b/INT63DC_ImageDll/bin/Debug/INT63DC_ImageDll.pdb differ diff --git a/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.csproj.GenerateResource.Cache b/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.csproj.GenerateResource.Cache index af2067f..e29a99b 100644 Binary files a/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.csproj.GenerateResource.Cache and b/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.csproj.GenerateResource.Cache differ diff --git a/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.dll b/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.dll index 32b5ce5..4c5de4b 100644 Binary files a/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.dll and b/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.dll differ diff --git a/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.pdb b/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.pdb index c72a774..746add7 100644 Binary files a/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.pdb and b/INT63DC_ImageDll/obj/Debug/INT63DC_ImageDll.pdb differ