diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs index 88017af..a8e9bc7 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.2.0"; + this.labelDisplayVer.Text = "2.3.0"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index 8fcbdef..ee63a11 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -21,6 +21,8 @@ namespace ITC81DB_2.Forms #region Field private FormMain m_ParentForm; + private List AlarmListBool; + private DataStore.MainDisplayStore CurrentDisplay; public ControlMainDisplayNormal MainDisplayNormal; @@ -144,6 +146,7 @@ namespace ITC81DB_2.Forms this.pictureBoxIconAlarm.Visible = false; this.MainDisplayAlarm.Visible = false; this.MainDisplayAlarm.BringToFront(); + this.AlarmListBool = new List(); if (this.ParentForm.SystemConfig.EquipmentType == 4) this.UpdateControlVisible(true); @@ -161,8 +164,35 @@ namespace ITC81DB_2.Forms private void UpdateDisplayAlarmView(WeightData data1, WeightData data2) { - if (data1.IsLoadCellError == true || data2.IsLoadCellError == true || data1.IsEmergencyStop == true - || data1.IsEntrySensorError == true || data2.IsEntrySensorError == true) + bool flagAlarm = false; + bool flagChange = false; + + if (this.AlarmListBool.Count > 0) + { + if (this.AlarmListBool[0] != data1.IsLoadCellError) flagChange = true; + if (this.AlarmListBool[1] != data2.IsLoadCellError) flagChange = true; + if (this.AlarmListBool[2] != data1.IsEmergencyStop) flagChange = true; + if (this.AlarmListBool[3] != data1.IsEntrySensorError) flagChange = true; + if (this.AlarmListBool[4] != data2.IsEntrySensorError) flagChange = true; + } + + this.AlarmListBool.Clear(); + this.AlarmListBool.Add(data1.IsLoadCellError); + this.AlarmListBool.Add(data2.IsLoadCellError); + this.AlarmListBool.Add(data1.IsEmergencyStop); + this.AlarmListBool.Add(data1.IsEntrySensorError); + this.AlarmListBool.Add(data2.IsEntrySensorError); + + foreach (bool listBool in this.AlarmListBool) + { + if (listBool == true) + { + flagAlarm = true; + break; + } + } + + if (flagAlarm == true) { if (this.pictureBoxIconAlarm.Visible == false) this.pictureBoxIconAlarm.Visible = true; @@ -171,6 +201,7 @@ namespace ITC81DB_2.Forms { this.pictureBoxIconAlarm.Visible = false; this.MainDisplayAlarm.Visible = false; + return; } @@ -186,6 +217,17 @@ namespace ITC81DB_2.Forms this.MainDisplayAlarm.listBoxMessage.Items.Add("#1 Entry Sensor Error"); if (data2.IsEntrySensorError == true) this.MainDisplayAlarm.listBoxMessage.Items.Add("#2 Entry Sensor Error"); + + if (flagChange == true && this.MainDisplayAlarm.listBoxMessage.Items.Count > 0) + { + // 로그 + if (this.ParentForm.IsCommunicationLogOpen == true) + { + for (int i = 0; i < this.MainDisplayAlarm.listBoxMessage.Items.Count; i++) + this.ParentForm.smartFileCommunicationLog.WriteString( + string.Format("Alarm ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, this.MainDisplayAlarm.listBoxMessage.Items[i])); + } + } } private void ProductChange(int productNumber) { diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index daa1029..1b2e448 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -13,6 +13,11 @@ 2¿­ ±âº»Çü ÄÁº£¾î °è·®±â */ +@ Ver 2.3.0 by CJY + - 2021.12.13 + - Ver 2.2.0 Modify + - CommunicationLog - Alarm Ãß°¡ + @ Ver 2.2.0 by CJY - 2021.09.28 - Ver 2.1.2 Modify diff --git a/ITC81DB_2/bin/Debug/ITC81DB_2.exe b/ITC81DB_2/bin/Debug/ITC81DB_2.exe index 043910a..29b601d 100644 Binary files a/ITC81DB_2/bin/Debug/ITC81DB_2.exe and b/ITC81DB_2/bin/Debug/ITC81DB_2.exe differ diff --git a/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll b/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll index 8fdf11f..673f05b 100644 Binary files a/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll and b/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index 064983f..60398d4 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/bin/Release/ITC81DB_2_ImageDll.dll b/ITC81DB_2/bin/Release/ITC81DB_2_ImageDll.dll index 092c74a..3c095ad 100644 Binary files a/ITC81DB_2/bin/Release/ITC81DB_2_ImageDll.dll and b/ITC81DB_2/bin/Release/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt b/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt index 23faa22..5d61a91 100644 --- a/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt +++ b/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt @@ -180,3 +180,63 @@ D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2\obj\Debug\ITC81DB_2.Properties.Resources.resou D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2\obj\Debug\ITC81DB_2.csproj.GenerateResource.Cache D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2\obj\Debug\ITC81DB_2.exe D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2\obj\Debug\ITC81DB_2.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\ITC81DB_2.exe +D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\ITC81DB_2.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\ITC81DB_2_ImageDll.dll +D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\SmartX_IEC1000.dll +D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\SmartXCommon.dll +D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\ITC81DB_2_ImageDll.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ResolveAssemblyReference.cache +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomConfiguration.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomEquipment.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomInformation.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomSystem.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterBasicHelp.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterBasicTime.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterBasicProduct.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterBasicDataBackup.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterBasicDataStatistics.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomBasic.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiCommunication.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiHelp.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiOption.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiOptionBoard.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipEngineer.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipFunctionSetting.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipHelp.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipInitialize.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipTest.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipUpdate.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipUser.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipUserGroupEditor.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterInforAS.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterInforHelp.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterInforSystem.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemCalibration.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemAutoZero.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemExternalOutput.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemHelp.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemIOTest.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemJudgmentSetting.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemSorterSetting.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlUserGroupEditor.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayAlarm.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayDataStatistics.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayList.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayNormal.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayMenu.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayXYChart.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormLogOn.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormPasswordKeyPad1.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormMessage.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormNumKeyPad.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormPasswordKeyPad.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormProductList.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormYesNo.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Forms.FormMain.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Forms.FormMainDisplay.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Forms.FormMenu.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Properties.Resources.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.csproj.GenerateResource.Cache +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.exe +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.pdb diff --git a/ITC81DB_2/obj/Debug/ITC81DB_2.exe b/ITC81DB_2/obj/Debug/ITC81DB_2.exe index 043910a..29b601d 100644 Binary files a/ITC81DB_2/obj/Debug/ITC81DB_2.exe and b/ITC81DB_2/obj/Debug/ITC81DB_2.exe differ diff --git a/ITC81DB_2/obj/Release/ITC81DB_2.exe b/ITC81DB_2/obj/Release/ITC81DB_2.exe index 064983f..60398d4 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/bin/Debug/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Debug/ITC81DB_2_ImageDll.dll index 8fdf11f..673f05b 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Debug/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Debug/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll index 092c74a..3c095ad 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/bin/Release/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt index 6500146..a8e45c6 100644 --- a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt +++ b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt @@ -19,3 +19,10 @@ D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_ D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.csproj.GenerateResource.Cache D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.dll D:\Git\ITC81DB_2_V0.0.0\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\bin\Debug\ITC81DB_2_ImageDll.dll +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\bin\Debug\ITC81DB_2_ImageDll.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ResolveAssemblyReference.cache +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.Resource1.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.csproj.GenerateResource.Cache +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.dll +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.pdb diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll index 8fdf11f..673f05b 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/Refactor/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/Refactor/ITC81DB_2_ImageDll.dll new file mode 100644 index 0000000..4f37733 Binary files /dev/null and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Debug/Refactor/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll index 092c74a..3c095ad 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/ITC81DB_2_ImageDll.dll 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 021041f..8165997 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