diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index ab84783..973ccb4 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "11.4.1"; + this.labelDisplayVer.Text = "11.4.2"; if(this.ParentForm.SystemConfig.EquipmentMode == 7) this.labelTitleMainboardName.Text = "INT68M-2A"; else diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index babd215..66b38f3 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -9971,12 +9971,15 @@ namespace INT69DC_7C.Forms public void IntegratedTransmission(Collection datas) { #region ATPC - bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(this.CollectionWeightData); + if (this.SystemConfig.IsAlarmTotalPassCntEnable == true) + { + bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(datas); - if (result == true) - this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard); + if (result == true) + this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard); - this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt); + this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt); + } #endregion #region COM3 @@ -10014,7 +10017,7 @@ namespace INT69DC_7C.Forms #endregion // DataBackup - this.TrackingInspectionData(this.CollectionWeightData); + this.TrackingInspectionData(datas); } public void IntegratedTransmissionCheck(Collection datas) { @@ -11968,51 +11971,7 @@ namespace INT69DC_7C.Forms { this.timerTimeOutTransmission.Enabled = false; - #region ATPC - bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(this.CollectionWeightData); - - if (result == true) - this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard); - - this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt); - #endregion - - #region COM3 - switch (this.SystemConfig.Serial3Mode) - { - case 2: - this.UartCom3Write(this.Protocol_OPT2_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData)); - break; - case 3: - this.UartCom3Write(this.Protocol_OPT3_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - case 6: - this.UartCom3Write(this.Protocol_OPT5_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - default: - break; - } - #endregion - - #region Ethernet - switch (this.SystemConfig.EthernetMode) - { - case 1: - this.SendEthernetData(this.Protocol_OPT2_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData)); - break; - case 2: - this.SendEthernetData(this.Protocol_OPT3_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - case 4: - this.SendEthernetData(this.Protocol_OPT5_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem)); - break; - default: - break; - } - #endregion - - // DataBackup - this.TrackingInspectionData(this.CollectionWeightData); + this.IntegratedTransmission(this.CollectionWeightData); foreach (WeightData data in this.CollectionWeightData) data.IsUpdate = false; diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 923e104..332f5ed 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,9 +15,16 @@ ¸ÖƼÇü 8,10,12¿­ ÄÁº£¾î/½ºÆ½ °è·®±â */ +@ Ver 11.4.2 by LSJ + - 2024.08.27 + - Ver 11.4.1 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - Á¤·®¾Ë¶÷Ä«¿îÆ® ¹ö±× ¼öÁ¤ (ATPC) + ½ºÆ½2 ¸ðµå À϶§ ±â´É OFF ¾ÈµÇ´Â ¹®Á¦Á¡ ¼öÁ¤ (Ç×»ó ON »óÅÂÀÓ) + @ Ver 11.4.1 by CJY - 2024.08.21 - - Ver 11.3.0 Modify + - Ver 11.4.0 Modify - Framework : SmartX Framework V3.1.1(update: 2019.03.21) - (¹ö±×¼öÁ¤)´Ü¼ø ·Î±×ÀÎ ½Ã, ÀÚµ¿ ·Î±×¾Æ¿ô ±â´É ½ÇÇàµÇ´Â ¹ö±× ¼öÁ¤