From 5b220d7f548221c06616854d24ff098dd2ee2ded Mon Sep 17 00:00:00 2001 From: CJY Date: Tue, 23 Dec 2025 09:30:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DB_2A/Controls/ControlEquipmentTest.cs | 2 -- INT69DB_2A/DataStore.cs | 2 -- INT69DB_2A/Forms/FormCommunication.cs | 34 --------------------- INT69DB_2A/Forms/FormMain.cs | 29 ++++++------------ INT69DB_2A/Forms/FormMainDisplay.cs | 14 ++++----- 5 files changed, 16 insertions(+), 65 deletions(-) diff --git a/INT69DB_2A/Controls/ControlEquipmentTest.cs b/INT69DB_2A/Controls/ControlEquipmentTest.cs index 833dd64..849d86f 100644 --- a/INT69DB_2A/Controls/ControlEquipmentTest.cs +++ b/INT69DB_2A/Controls/ControlEquipmentTest.cs @@ -206,8 +206,6 @@ namespace INT69DB_2A.Controls this.labelCH3Mode.Text = "Printer"; else if (item.Serial3Mode == 5) this.labelCH3Mode.Text = "OPT4"; - else if (item.Serial3Mode == 6) - this.labelCH3Mode.Text = "OPT5"; else this.labelCH3Mode.Text = "None"; } diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index 4c8bd6d..8ccac15 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -347,7 +347,6 @@ namespace INT69DB_2A f3_OPT3, f4_Printer, f5_OPT4, - f6_OPT5, } public enum EthernetMode @@ -358,7 +357,6 @@ namespace INT69DB_2A f3_OPT3, f4_Modbus, f5_OPT4, - f6_OPT5, } public enum UserGroup diff --git a/INT69DB_2A/Forms/FormCommunication.cs b/INT69DB_2A/Forms/FormCommunication.cs index 4b48c9b..36cd4fb 100644 --- a/INT69DB_2A/Forms/FormCommunication.cs +++ b/INT69DB_2A/Forms/FormCommunication.cs @@ -316,13 +316,6 @@ namespace INT69DB_2A.Forms else if (this.ParentForm.SystemConfig.EquipmentMode == 2) data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]); } - else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5) - { - if (this.ParentForm.SystemConfig.EquipmentMode == 1) - data = this.ParentForm.Protocol_OPT5(this.ParentForm.CollectionWeightData); - else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - data = this.ParentForm.Protocol_OPT5(1, this.ParentForm.CollectionWeightData[0]); - } switch (this.ParentForm.SystemConfig.EthernetOperationMode) { @@ -381,13 +374,6 @@ namespace INT69DB_2A.Forms else if (this.ParentForm.SystemConfig.EquipmentMode == 2) data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]); } - else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5) - { - if (this.ParentForm.SystemConfig.EquipmentMode == 1) - data = this.ParentForm.Protocol_OPT5(this.ParentForm.CollectionWeightData); - else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - data = this.ParentForm.Protocol_OPT5(1, this.ParentForm.CollectionWeightData[0]); - } switch (this.ParentForm.SystemConfig.EthernetOperationMode) { @@ -579,19 +565,6 @@ namespace INT69DB_2A.Forms this.labelProtocolDescriptionEthernet_2.Text = "LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; } } - else if (this.comboBoxMode.SelectedIndex == (int)DataStore.EthernetMode.f6_OPT5) - { - if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) - { - this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],"; - this.labelProtocolDescriptionEthernet_2.Text = "Total Count[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; - } - else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - { - this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],"; - this.labelProtocolDescriptionEthernet_2.Text = "Total Count[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; - } - } else { this.labelProtocolDescriptionEthernet_1.Text = "-"; @@ -1614,13 +1587,6 @@ namespace INT69DB_2A.Forms else if (this.ParentForm.SystemConfig.EquipmentMode == 2) this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); } - else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f6_OPT5) - { - if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT5_NotStxEtx(this.ParentForm.CollectionWeightData)); - else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT5_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); - } } private void comboBoxSerial3BaudRate_SelectedIndexChanged(object sender, EventArgs e) diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index e31c2f7..c826cf7 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -43,10 +43,13 @@ namespace INT69DB_2A.Forms public string ComPortMainToLCD; // DllSerial Port public bool FlagDllSerial; // DllSerial 사용여부 private string TransferNum; // 수신데이터 ID저장 (재전송 시 사용) +<<<<<<< HEAD public bool FlagThreadMessage1; // 플레그 쓰레드 메시지 11 public int TotalAllCount; // 스틱1 전체 수량 public int TotalPassCount; // 스틱1 전체 Pass 수량 public int TotalNGCount; // 스틱1 전체 NG 수량 +======= +>>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제) // Motor Download 통신용 변수 public int LineNum; @@ -444,10 +447,13 @@ namespace INT69DB_2A.Forms this.ColorLogOff = Color.Red; this.ColorLogOn = Color.Yellow; this.TransferNum = "-"; +<<<<<<< HEAD this.FlagThreadMessage1 = false; this.TotalAllCount = 0; this.TotalNGCount = 0; this.TotalPassCount = 0; +======= +>>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제) this.PathLaunchFolder = "SD Card\\"; this.PathSystemFileFolder1 = this.PathLaunchFolder + "SystemFile1\\"; @@ -1514,6 +1520,7 @@ namespace INT69DB_2A.Forms return sb.ToString(); } +<<<<<<< HEAD public string Protocol_OPT5(Collection datas) { string value = ""; @@ -1697,6 +1704,8 @@ namespace INT69DB_2A.Forms return sb.ToString(); } +======= +>>>>>>> 65f9fe0 ( - 프로토콜 OPT5 삭제) public byte[] Protocol_Modbus_Client_Write_Common_Data() { int index = 0; @@ -3168,9 +3177,6 @@ namespace INT69DB_2A.Forms case 5: this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(datas)); break; - case 6: - this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(datas)); - break; default: break; } @@ -3191,9 +3197,6 @@ namespace INT69DB_2A.Forms case 5: this.SendEthernetData(this.Protocol_OPT4_NotStxEtx(datas)); break; - case 6: - this.SendEthernetData(this.Protocol_OPT5_NotStxEtx(datas)); - break; default: break; } @@ -3329,8 +3332,6 @@ namespace INT69DB_2A.Forms } else if (this.SystemConfig.Serial3Mode == 5) // OPT4 this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(this.CollectionWeightData)); - else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(this.CollectionWeightData)); } private void TreatSerialCommunication(int lane, WeightData data) { @@ -3351,8 +3352,6 @@ namespace INT69DB_2A.Forms } else if (this.SystemConfig.Serial3Mode == 5) // OPT4 this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(lane, data)); - else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(lane, data)); } #endregion #region Ethernet @@ -3395,11 +3394,6 @@ namespace INT69DB_2A.Forms sendData = this.Protocol_OPT4(this.CollectionWeightData); this.SendEthernetData(sendData); } - else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5) - { - sendData = this.Protocol_OPT5(this.CollectionWeightData); - this.SendEthernetData(sendData); - } } private void TreatEthernetCommunication(int lane, WeightData data) { @@ -3437,11 +3431,6 @@ namespace INT69DB_2A.Forms sendData = this.Protocol_OPT4(lane, data); this.SendEthernetData(sendData); } - else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5) - { - sendData = this.Protocol_OPT5(lane, data); - this.SendEthernetData(sendData); - } } private void SendEthernetData(string etherData) { diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs index 4b1f236..4c6dcbf 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.cs @@ -1434,14 +1434,14 @@ namespace INT69DB_2A.Forms public void SetTotalCount() { string totalCNT = "", ngCNT = ""; - int totalUnder = 0, totalOver = 0, totalExNG = 0; + int totalAll = 0, totalPass = 0, totalNG = 0, totalUnder = 0, totalOver = 0, totalExNG = 0; for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) { - this.ParentForm.TotalAllCount += this.ParentForm.CollectionWeightData[i].TotalCount; - this.ParentForm.TotalPassCount += this.ParentForm.CollectionWeightData[i].PassCount; + totalAll += this.ParentForm.CollectionWeightData[i].TotalCount; + totalPass += this.ParentForm.CollectionWeightData[i].PassCount; - this.ParentForm.TotalNGCount += this.ParentForm.CollectionWeightData[i].TotalNGCount; + totalNG += this.ParentForm.CollectionWeightData[i].TotalNGCount; totalUnder += this.ParentForm.CollectionWeightData[i].UnderCount; totalOver += this.ParentForm.CollectionWeightData[i].OverCount; totalExNG += this.ParentForm.CollectionWeightData[i].ExNGCount; @@ -1451,10 +1451,10 @@ namespace INT69DB_2A.Forms switch (this.Mode_TotalCnt) { case DataStore.E_TotalCnt.f0_Total: - totalCNT = this.ParentForm.TotalAllCount.ToString(); + totalCNT = totalAll.ToString(); break; case DataStore.E_TotalCnt.f1_Pass: - totalCNT = this.ParentForm.TotalPassCount.ToString(); + totalCNT = totalPass.ToString(); break; default: break; @@ -1467,7 +1467,7 @@ namespace INT69DB_2A.Forms switch (this.Mode_TotalCntNG) { case DataStore.E_TotalCntNG.f0_NG: - ngCNT = this.ParentForm.TotalNGCount.ToString(); + ngCNT = totalNG.ToString(); break; case DataStore.E_TotalCntNG.f1_Under: ngCNT = totalUnder.ToString();