From 0310cf23e1e3469e48f59e3560b4f2daf3e11308 Mon Sep 17 00:00:00 2001 From: sj84 Date: Fri, 7 Mar 2025 09:58:15 +0900 Subject: [PATCH] =?UTF-8?q?@=20Ver=2012.2.2=20by=20LSJ=20=20-=202025.02.04?= =?UTF-8?q?=20=20-=20Ver=2012.2.1=20Modify=20=20-=20Framework=20:=20SmartX?= =?UTF-8?q?=20Framework=20V3.2.4(update:=202021.01.20)=20=20-=20=EC=98=81?= =?UTF-8?q?=EB=AC=B8=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20=20=20=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=84=A4=EC=A0=95=20-=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=84=A4=EC=A0=95=20=ED=8C=9D=EC=97=85=20'?= =?UTF-8?q?=EC=9E=85=EB=A0=A5'=20=ED=95=9C=EA=B8=80=20=EB=B2=84=EA=B7=B8?= =?UTF-8?q?=20=20=20=20=EC=9C=A0=EC=A0=80=EA=B7=B8=EB=A3=B9=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20-=20=EC=A0=80=EC=9E=A5=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=ED=95=9C=EA=B8=80=20=EB=B2=84=EA=B7=B8=20=20-=20=EC=98=81?= =?UTF-8?q?=ED=85=8C=ED=81=AC=ED=8C=A9=20=EC=9A=94=EC=B2=AD=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=86=A0=EC=BD=9C=20=EC=B6=94=EA=B0=80=20=20=20=20?= =?UTF-8?q?=EC=88=98=EB=9F=89=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80(totalPass,=20totalNG,=20totalAll)=20=20=20=20OPT6=20:?= =?UTF-8?q?=20STX[1],ID[5],NO[4],PASS=20CNT[7],NG=20CNT[7],TOTAL=20CNT[9],?= =?UTF-8?q?{GRD[1],WEIGHT[6]}=20*=20n,ETX[1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DialogFormUserEditorKeyboard.designer.cs | 26 +- INT69DC_7C/Forms/FormCommunication.cs | 541 +++++++++------ INT69DC_7C/Forms/FormInformation.cs | 2 +- INT69DC_7C/Forms/FormMain.cs | 616 +++++++++++++++--- .../Forms/FormOptionSetting.Designer.cs | 4 +- INT69DC_7C/Forms/FormUserGroupEditor.cs | 54 +- INT69DC_7C/Version.txt | 11 + 7 files changed, 948 insertions(+), 306 deletions(-) diff --git a/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs index 7087c01..59cf8a0 100644 --- a/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs +++ b/INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs @@ -32,14 +32,13 @@ this.textBox = new System.Windows.Forms.TextBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.smartKeyboard = new SmartX.SmartKeyboard(); - this.labelTitle = new SmartX.SmartLabel(); this.pictureBoxImage = new System.Windows.Forms.PictureBox(); this.SuspendLayout(); // // textBox // this.textBox.Font = new System.Drawing.Font("Arial", 25F, System.Drawing.FontStyle.Regular); - this.textBox.Location = new System.Drawing.Point(143, 99); + this.textBox.Location = new System.Drawing.Point(143, 82); this.textBox.MaxLength = 20; this.textBox.Name = "textBox"; this.textBox.Size = new System.Drawing.Size(489, 45); @@ -89,27 +88,6 @@ this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick); this.smartKeyboard.KeyDown += new System.Windows.Forms.KeyEventHandler(this.smartKeyboard_KeyDown); // - // labelTitle - // - this.labelTitle.BackColor = System.Drawing.Color.White; - this.labelTitle.BackPictureBox = null; - this.labelTitle.BackPictureBox1 = null; - this.labelTitle.BackPictureBox2 = null; - this.labelTitle.BorderColor = System.Drawing.Color.Black; - this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); - this.labelTitle.ForeColor = System.Drawing.Color.Gray; - this.labelTitle.InitVisible = true; - this.labelTitle.LineSpacing = 0F; - this.labelTitle.Location = new System.Drawing.Point(143, 43); - this.labelTitle.Name = "labelTitle"; - this.labelTitle.Size = new System.Drawing.Size(489, 50); - this.labelTitle.TabIndex = 180; - this.labelTitle.Text = "입력"; - this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitle.Wordwrap = false; - // // pictureBoxImage // this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image"))); @@ -125,7 +103,6 @@ this.ClientSize = new System.Drawing.Size(710, 470); this.ControlBox = false; this.Controls.Add(this.pictureBoxImage); - this.Controls.Add(this.labelTitle); this.Controls.Add(this.smartKeyboard); this.Controls.Add(this.textBox); this.Controls.Add(this.pictureBox1); @@ -141,7 +118,6 @@ private System.Windows.Forms.TextBox textBox; private System.Windows.Forms.PictureBox pictureBox1; private SmartX.SmartKeyboard smartKeyboard; - private SmartX.SmartLabel labelTitle; private System.Windows.Forms.PictureBox pictureBoxImage; } } \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormCommunication.cs b/INT69DC_7C/Forms/FormCommunication.cs index 48c62cd..af78189 100644 --- a/INT69DC_7C/Forms/FormCommunication.cs +++ b/INT69DC_7C/Forms/FormCommunication.cs @@ -159,6 +159,7 @@ namespace INT69DC_7C.Forms this.comboBoxMode.Items.Add("OPT3"); this.comboBoxMode.Items.Add("Modbus"); this.comboBoxMode.Items.Add("OPT5"); + this.comboBoxMode.Items.Add("OPT6"); this.comboBoxMode.SelectedIndex = 0; this.comboBoxMode.SelectedIndexChanged += new EventHandler(this.comboBoxMode_SelectedIndexChanged); @@ -180,6 +181,7 @@ namespace INT69DC_7C.Forms this.comboBoxSerial3Mode.Items.Add("OPT4"); this.comboBoxSerial3Mode.Items.Add("Printer"); this.comboBoxSerial3Mode.Items.Add("OPT5"); + this.comboBoxSerial3Mode.Items.Add("OPT6"); this.comboBoxSerial3Mode.SelectedIndex = 0; this.comboBoxSerial3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); } @@ -330,6 +332,8 @@ namespace INT69DC_7C.Forms data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem); else if (this.ParentForm.SystemConfig.EthernetMode == 4) data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem); + else if(this.ParentForm.SystemConfig.EthernetMode == 5) + data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData); switch (this.ParentForm.SystemConfig.EthernetOperationMode) { @@ -359,6 +363,8 @@ namespace INT69DC_7C.Forms data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem); else if (this.ParentForm.SystemConfig.EthernetMode == 4) data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem); + else if (this.ParentForm.SystemConfig.EthernetMode == 5) + data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane); switch (this.ParentForm.SystemConfig.EthernetOperationMode) { @@ -378,158 +384,6 @@ namespace INT69DC_7C.Forms break; } } - private void UpdateProtocolDescriptionCom3Display() - { - if (this.comboBoxSerial3Mode.SelectedIndex == 1) - { - #region OPT1 - this.labelProtocolDescriptionCOM3_1.Text = "Private use"; - this.labelProtocolDescriptionCOM3_2.Text = ""; - #endregion - } - else if (this.comboBoxSerial3Mode.SelectedIndex == 2) - { - #region OPT2 - if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 - || this.ParentForm.SystemConfig.EquipmentMode == 7) - { - if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; - this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],"; - this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]"; - } - } - else - { - if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],"; - this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; - this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; - } - } - #endregion - } - else if (this.comboBoxSerial3Mode.SelectedIndex == 3) - { - #region OPT3 - if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 - || this.ParentForm.SystemConfig.EquipmentMode == 7) - { - if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],"; - this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],"; - this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]"; - } - } - else - { - if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],"; - this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],"; - this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; - } - } - #endregion - } - else if (this.comboBoxSerial3Mode.SelectedIndex == 4) - { - #region OPT4 - if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 - || this.ParentForm.SystemConfig.EquipmentMode == 7) - { - if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; - this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],"; - this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]"; - } - } - else - { - if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],"; - this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; - this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]"; - } - } - #endregion - } - else if (this.comboBoxSerial3Mode.SelectedIndex == 5) - { - #region Printer - this.labelProtocolDescriptionCOM3_1.Text = "NO[4], LANE[2], GRADE[1], WEIGHT[6],"; - this.labelProtocolDescriptionCOM3_2.Text = "COUNT[9]"; - #endregion - } - else if (this.comboBoxSerial3Mode.SelectedIndex == 6) - { - #region OPT5 - if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 - || this.ParentForm.SystemConfig.EquipmentMode == 7) - { - if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; - this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; - this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]"; - } - } - else - { - if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; - this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]"; - } - else - { - this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; - this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]"; - } - } - #endregion - } - else - { - #region None - this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description"; - this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description"; - #endregion - } - } private void LocalIPEnable(bool enable) { Color tempColor; @@ -639,35 +493,6 @@ namespace INT69DC_7C.Forms break; } } - private void UpdateDisplayFormat(int index) - { - if (index == 1) - { - #region OPT2 - this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],"; - this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; - #endregion - } - else if (index == 2) - { - #region OPT3 - this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],"; - this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; - #endregion - } - else if (index == 4) - { - #region OPT5 - this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; - this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]"; - #endregion - } - else - { - this.labelProtocolDescriptionEthernet_1.Text = ""; - this.labelProtocolDescriptionEthernet_2.Text = ""; - } - } public void DisplayLabelLocalPort(bool bValue) { if (bValue == false) @@ -687,6 +512,327 @@ namespace INT69DC_7C.Forms this.labelClientStatus.Text = value; } + private void UpdateProtocolDescriptionEthernetDisplay(int index) + { + if (index == 1) + { + #region OPT2 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],"; + this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],"; + this.labelProtocolDescriptionEthernet_2.Text = "WEIGHT[6],ETX[1]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],"; + this.labelProtocolDescriptionEthernet_2.Text = "WEIGHT[6],ETX[1]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],"; + this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else if (index == 2) + { + #region OPT3 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],"; + this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],"; + this.labelProtocolDescriptionEthernet_2.Text = "GRD[1],WEIGHT[6],ETX[1]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],"; + this.labelProtocolDescriptionEthernet_2.Text = "GRD[1],WEIGHT[6],ETX[1]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],"; + this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else if (index == 4) + { + #region OPT5 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else if (index == 5) + { + #region OPT6 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else + { + this.labelProtocolDescriptionEthernet_1.Text = ""; + this.labelProtocolDescriptionEthernet_2.Text = ""; + } + } + private void UpdateProtocolDescriptionCom3Display() + { + if (this.comboBoxSerial3Mode.SelectedIndex == 1) + { + #region OPT1 + this.labelProtocolDescriptionCOM3_1.Text = "Private use"; + this.labelProtocolDescriptionCOM3_2.Text = ""; + #endregion + } + else if (this.comboBoxSerial3Mode.SelectedIndex == 2) + { + #region OPT2 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; + this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],"; + this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],"; + this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; + this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else if (this.comboBoxSerial3Mode.SelectedIndex == 3) + { + #region OPT3 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],"; + this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],"; + this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],"; + this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],"; + this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else if (this.comboBoxSerial3Mode.SelectedIndex == 4) + { + #region OPT4 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; + this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],"; + this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],"; + this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],"; + this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else if (this.comboBoxSerial3Mode.SelectedIndex == 5) + { + #region Printer + this.labelProtocolDescriptionCOM3_1.Text = "NO[4], LANE[2], GRADE[1], WEIGHT[6],"; + this.labelProtocolDescriptionCOM3_2.Text = "COUNT[9]"; + #endregion + } + else if (this.comboBoxSerial3Mode.SelectedIndex == 6) + { + #region OPT5 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],"; + this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else if (this.comboBoxSerial3Mode.SelectedIndex == 7) + { + #region OPT6 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; + } + } + else + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; + } + else + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],"; + this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + } + #endregion + } + else + { + #region None + this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description"; + this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description"; + #endregion + } + } + public void DisplayRefresh() { string value = ""; @@ -699,7 +845,7 @@ namespace INT69DC_7C.Forms // Local IP this.UpdateLocalIPAddressDisplay(); // Format - this.UpdateDisplayFormat(this.ParentForm.SystemConfig.EthernetMode); + this.UpdateProtocolDescriptionEthernetDisplay(this.ParentForm.SystemConfig.EthernetMode); // Setting Data visible this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode); @@ -948,7 +1094,7 @@ namespace INT69DC_7C.Forms this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode); - this.UpdateDisplayFormat(this.ParentForm.SystemConfig.EthernetMode); + this.UpdateProtocolDescriptionEthernetDisplay(this.ParentForm.SystemConfig.EthernetMode); after = this.comboBoxMode.SelectedItem.ToString(); @@ -1590,8 +1736,9 @@ namespace INT69DC_7C.Forms } else if (this.ParentForm.SystemConfig.Serial3Mode == 6) { + #region OPT5 if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 - || this.ParentForm.SystemConfig.EquipmentMode == 7) + || this.ParentForm.SystemConfig.EquipmentMode == 7) { if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) this.ParentForm.SerialCH3OPT5(this.ParentForm.CollectionWeightData); @@ -1607,7 +1754,31 @@ namespace INT69DC_7C.Forms this.ParentForm.SerialCH3OPT5(1, this.ParentForm.CollectionWeightData[0]); else this.ParentForm.SerialCH3OPT5(this.ParentForm.CollectionWeightData); - } + } + #endregion + } + else if (this.ParentForm.SystemConfig.Serial3Mode == 7) + { + #region OPT6 + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 + || this.ParentForm.SystemConfig.EquipmentMode == 7) + { + if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) + this.ParentForm.SerialCH3OPT6(this.ParentForm.CollectionWeightData); + else + { + for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) + this.ParentForm.SerialCH3OPT6(i + 1, this.ParentForm.CollectionWeightData[i]); + } + } + else if (this.ParentForm.SystemConfig.EquipmentMode == 2) + { + if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false) + this.ParentForm.SerialCH3OPT6(1, this.ParentForm.CollectionWeightData[0]); + else + this.ParentForm.SerialCH3OPT6(this.ParentForm.CollectionWeightData); + } + #endregion } } private void buttonSerialSave_Click(object sender, EventArgs e) diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index c461f49..89adf88 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -142,7 +142,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "12.2.1"; + this.labelDisplayVer.Text = "12.2.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 befe7a7..db0803d 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -1146,7 +1146,8 @@ namespace INT69DC_7C.Forms this.ChildFormEquipmentTest.UpdateEquipmentStatusDisplay(this.EquipmentStatus); this.ChildFormSystemSetting.UpdateEquipmentStatusDisplay(this.EquipmentStatus); - this.ModbusCommonDataSend(); + if(this.SystemConfig.EthernetMode == 3) // Modbus일 때 + this.ModbusCommonDataSend(); #endregion break; case "CBT": @@ -1957,13 +1958,29 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[0], 1); + else + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[this.CollectionWeightData.Count - 1], this.CollectionWeightData.Count); + + this.SendEthernetData(etherStringData); + #endregion + } + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -1994,7 +2011,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개발 전송 @@ -2008,7 +2025,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 (기준값 포함) { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개발 전송 @@ -2022,7 +2039,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(1, this.CollectionWeightData[0]); else @@ -2031,7 +2048,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -2046,7 +2063,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2057,7 +2074,21 @@ namespace INT69DC_7C.Forms #endregion } #endregion - } + } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개발 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(1, this.CollectionWeightData[0]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count, this.CollectionWeightData[this.CollectionWeightData.Count - 1]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -2237,13 +2268,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[1], 2); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -2274,7 +2312,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2288,7 +2326,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2302,7 +2340,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(2, this.CollectionWeightData[1]); else @@ -2311,7 +2349,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -2326,7 +2364,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2338,6 +2376,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(2, this.CollectionWeightData[1]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 1, this.CollectionWeightData[this.CollectionWeightData.Count - 2]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -2517,13 +2569,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[2], 3); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -2554,7 +2613,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2566,9 +2625,9 @@ namespace INT69DC_7C.Forms } #endregion } - else if (this.SystemConfig.Serial3Mode == 3) // OPT2 - 중량 데이터 피드백 + else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2582,7 +2641,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(3, this.CollectionWeightData[2]); else @@ -2591,7 +2650,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -2606,7 +2665,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2618,6 +2677,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(3, this.CollectionWeightData[2]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 2, this.CollectionWeightData[this.CollectionWeightData.Count - 3]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -2797,13 +2870,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[3], 4); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -2834,7 +2914,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2848,7 +2928,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2862,7 +2942,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(4, this.CollectionWeightData[3]); else @@ -2871,7 +2951,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -2886,7 +2966,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -2898,6 +2978,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(4, this.CollectionWeightData[3]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 3, this.CollectionWeightData[this.CollectionWeightData.Count - 4]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -3077,13 +3171,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[4], 5); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -3114,7 +3215,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3128,7 +3229,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3142,7 +3243,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(5, this.CollectionWeightData[4]); else @@ -3151,7 +3252,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -3166,7 +3267,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3178,6 +3279,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(5, this.CollectionWeightData[4]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 4, this.CollectionWeightData[this.CollectionWeightData.Count - 5]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -3357,13 +3472,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[5], 6); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -3394,7 +3516,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3408,7 +3530,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3422,7 +3544,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(6, this.CollectionWeightData[5]); else @@ -3431,7 +3553,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -3446,7 +3568,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3458,6 +3580,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(6, this.CollectionWeightData[5]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 5, this.CollectionWeightData[this.CollectionWeightData.Count - 6]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -3637,13 +3773,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[6], 7); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -3674,7 +3817,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3688,7 +3831,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3702,7 +3845,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(7, this.CollectionWeightData[6]); else @@ -3711,7 +3854,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -3726,7 +3869,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3738,6 +3881,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(7, this.CollectionWeightData[6]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 6, this.CollectionWeightData[this.CollectionWeightData.Count - 7]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -3915,13 +4072,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[7], 8); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -3952,7 +4116,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3966,7 +4130,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -3980,7 +4144,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(8, this.CollectionWeightData[7]); else @@ -3989,7 +4153,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -4004,7 +4168,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4016,6 +4180,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(8, this.CollectionWeightData[7]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 7, this.CollectionWeightData[this.CollectionWeightData.Count - 8]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -4190,13 +4368,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[8], 9); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -4227,7 +4412,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4241,7 +4426,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4255,7 +4440,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(9, this.CollectionWeightData[8]); else @@ -4264,7 +4449,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -4279,7 +4464,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4291,6 +4476,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(9, this.CollectionWeightData[8]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 8, this.CollectionWeightData[this.CollectionWeightData.Count - 9]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -4464,13 +4663,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[9], 10); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -4501,7 +4707,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4515,7 +4721,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4529,7 +4735,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(10, this.CollectionWeightData[9]); else @@ -4538,7 +4744,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -4553,7 +4759,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4565,6 +4771,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(10, this.CollectionWeightData[9]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 9, this.CollectionWeightData[this.CollectionWeightData.Count - 10]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -4736,13 +4956,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[10], 11); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -4773,7 +5000,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4787,7 +5014,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4801,7 +5028,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(11, this.CollectionWeightData[10]); else @@ -4810,7 +5037,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -4825,7 +5052,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -4837,6 +5064,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(11, this.CollectionWeightData[10]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 10, this.CollectionWeightData[this.CollectionWeightData.Count - 11]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -5007,13 +5248,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData[11], 12); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 if (this.SystemConfig.EquipmentMode == 2) { if (this.timerTimeoutOPT1.Enabled == false) @@ -5044,7 +5292,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - #region Serial3 Mode2 + #region OPT2 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -5058,7 +5306,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -5072,7 +5320,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 피드백 시스템1 { - #region Serial3 Mode4 + #region OPT4 if (this.SystemConfig.IsWeightViewForward == true) this.SerialCH3OPT4(12, this.CollectionWeightData[11]); else @@ -5081,7 +5329,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsWeightViewForward == true) { if (this.SystemConfig.IsPrintPerProductEnable == true) @@ -5094,9 +5342,9 @@ namespace INT69DC_7C.Forms } #endregion } - else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 + else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode6 + #region OPT5 if (this.SystemConfig.IsIntegratedTransmission == false) { #region 개별 전송 @@ -5108,6 +5356,20 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIntegratedTransmission == false) + { + #region 개별 전송 + if (this.SystemConfig.IsWeightViewForward == true) + this.SerialCH3OPT6(12, this.CollectionWeightData[11]); + else + this.SerialCH3OPT6(this.CollectionWeightData.Count - 11, this.CollectionWeightData[this.CollectionWeightData.Count - 12]); + #endregion + } + #endregion + } #endregion if (this.SystemConfig.IsIntegratedTransmission == true) @@ -5336,13 +5598,20 @@ namespace INT69DC_7C.Forms this.SendEthernetData(etherStringData); #endregion } + else if (this.SystemConfig.EthernetMode == 5) + { + #region OPT6 + etherStringData = this.Protocol_OPT6(this.SystemConfig, this.CollectionWeightData); + this.SendEthernetData(etherStringData); + #endregion + } } #endregion #region Serial3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - ABFood 통신 피드백 { - #region Serial3 Mode1 + #region OPT1 // sensor error 이면 STOP foreach (WeightData data in this.CollectionWeightData) { @@ -5361,7 +5630,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - 중량 데이터 피드백 { - # region Serial3 Mode2 + # region OPT2 if (this.SystemConfig.IsIndividualTransmission == false) this.SerialCH3OPT2(this.CollectionWeightData); else @@ -5373,7 +5642,7 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT3 if (this.SystemConfig.IsIndividualTransmission == false) this.SerialCH3OPT3(this.CollectionWeightData); else @@ -5385,14 +5654,14 @@ namespace INT69DC_7C.Forms } else if (this.SystemConfig.Serial3Mode == 4) // OPT4 - 중량 데이터 피드백 { - #region Serial3 Mode3 + #region OPT4 for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) this.SerialCH3OPT4(i + 1, this.CollectionWeightData[i]); #endregion } else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { - #region Serial3 Mode5 + #region Printer if (this.SystemConfig.IsPrintPerProductEnable == true) { for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) @@ -5400,9 +5669,9 @@ namespace INT69DC_7C.Forms } #endregion } - else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 + else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) { - #region Serial3 Mode3 + #region OPT5 if (this.SystemConfig.IsIndividualTransmission == false) this.SerialCH3OPT5(this.CollectionWeightData); else @@ -5412,6 +5681,18 @@ namespace INT69DC_7C.Forms } #endregion } + else if (this.SystemConfig.Serial3Mode == 7) // OPT6 - 중량 데이터 피드백 (수량 포함) + { + #region OPT6 + if (this.SystemConfig.IsIndividualTransmission == false) + this.SerialCH3OPT6(this.CollectionWeightData); + else + { + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + this.SerialCH3OPT6(i + 1, this.CollectionWeightData[i]); + } + #endregion + } #endregion #region ACNC(Alarm Continuous Ng Count) @@ -8426,7 +8707,163 @@ namespace INT69DC_7C.Forms return sb.ToString(); } - + + private string Protocol_OPT6_NotStxEtx(SystemConfigurationItem system, Collection datas) + { + string value = ""; + int toTalAll = 0, toTalPass = 0, totalNg = 0; + StringBuilder sb = new StringBuilder(); + + for (int i = 0; i < system.EquipmentColumns; i++) + { + toTalAll += datas[i].TotalCount; + toTalPass += datas[i].PassCount; + totalNg += datas[i].TotalNGCount; + } + + sb.Append(string.Format("IN{0:D3}", system.EquipmentID)); + sb.Append(string.Format("{0:D4}", system.ProductNumber)); + + value = toTalPass.ToString(); + sb.Append(value.PadLeft(7, ' ')); + value = totalNg.ToString(); + sb.Append(value.PadLeft(7, ' ')); + value = toTalAll.ToString(); + sb.Append(value.PadLeft(9, ' ')); + + for (int i = 0; i < system.EquipmentColumns; i++) + { + if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else + sb.Append("E"); + + sb.Append(Helper.StringBlankFillDigits6(Helper.DoubleToString(datas[i].Weight, system.DecimalPlaces))); + } + + return sb.ToString(); + } + private string Protocol_OPT6_NotStxEtx_1(SystemConfigurationItem system, Collection datas) + { + string value = ""; + int toTalAll = 0, toTalPass = 0, totalNg = 0; + StringBuilder sb = new StringBuilder(); + + for (int i = 0; i < system.EquipmentColumns; i++) + { + toTalAll += datas[i].TotalCount; + toTalPass += datas[i].PassCount; + totalNg += datas[i].TotalNGCount; + } + + sb.Append(string.Format("IN{0:D3}", system.EquipmentID)); + sb.Append(string.Format("{0:D4}", system.ProductNumber)); + + value = toTalPass.ToString(); + sb.Append(value.PadLeft(7, ' ')); + value = totalNg.ToString(); + sb.Append(value.PadLeft(7, ' ')); + value = toTalAll.ToString(); + sb.Append(value.PadLeft(9, ' ')); + + for (int i = 0; i < system.EquipmentColumns; i++) + { + if (system.EquipmentMode == 2) + { + if (datas[i].IsUpdate == true) + { + if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else + sb.Append("E"); + } + else + sb.Append("E"); + } + else + { + if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else + sb.Append("E"); + } + + sb.Append(Helper.StringBlankFillDigits6(Helper.DoubleToString(datas[i].Weight, system.DecimalPlaces))); + } + + return sb.ToString(); + } + public string Protocol_OPT6(SystemConfigurationItem system, Collection datas) + { + StringBuilder sb = new StringBuilder(); + + sb.Append((char)0x02); + sb.Append(this.Protocol_OPT6_NotStxEtx(system, datas)); + sb.Append((char)0x03); + + return sb.ToString(); + } + private string Protocol_OPT6_NotStxEtx(SystemConfigurationItem system, WeightData data, int lane) + { + string value = ""; + StringBuilder sb = new StringBuilder(); + + sb.Append(string.Format("IN{0:D3}", system.EquipmentID)); + sb.Append(string.Format("{0:D4}", system.ProductNumber)); + + value = data.PassCount.ToString(); + sb.Append(value.PadLeft(7, ' ')); + value = data.TotalNGCount.ToString(); + sb.Append(value.PadLeft(7, ' ')); + value = data.TotalCount.ToString(); + sb.Append(value.PadLeft(9, ' ')); + + sb.Append(string.Format("{0:D2}", lane)); + + if (data.JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else if (data.JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else + sb.Append("E"); + + sb.Append(Helper.StringBlankFillDigits6(Helper.DoubleToString(data.Weight, system.DecimalPlaces))); + + return sb.ToString(); + } + public string Protocol_OPT6(SystemConfigurationItem system, WeightData data, int lane) + { + StringBuilder sb = new StringBuilder(); + + sb.Append((char)0x02); + sb.Append(this.Protocol_OPT6_NotStxEtx(system, data, lane)); + sb.Append((char)0x03); + + return sb.ToString(); + } + public byte[] Protocol_Modbus_Client_Write_Common_Data() { int index = 0; @@ -10896,6 +11333,17 @@ namespace INT69DC_7C.Forms } #endregion + #region OPT6 - 중량 데이터 피드백 (수량 포함) + public void SerialCH3OPT6(int lane, WeightData data) + { + this.SerialCom3Write(this.Protocol_OPT6_NotStxEtx(this.SystemConfig, data, lane)); + } + public void SerialCH3OPT6(Collection datas) + { + this.SerialCom3Write(this.Protocol_OPT6_NotStxEtx_1(this.SystemConfig, datas)); + } + #endregion + #endregion #region Ethernet private void SendEthernetData(string etherData) diff --git a/INT69DC_7C/Forms/FormOptionSetting.Designer.cs b/INT69DC_7C/Forms/FormOptionSetting.Designer.cs index 5125fe0..a5df730 100644 --- a/INT69DC_7C/Forms/FormOptionSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormOptionSetting.Designer.cs @@ -162,7 +162,7 @@ this.smartLabel6.LineSpacing = 0F; this.smartLabel6.Location = new System.Drawing.Point(503, 340); this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.Size = new System.Drawing.Size(420, 25); + this.smartLabel6.Size = new System.Drawing.Size(450, 25); this.smartLabel6.TabIndex = 233; this.smartLabel6.Text = "※ Print ON : activate [Data Statistics]"; this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -233,7 +233,7 @@ this.smartLabel3.LineSpacing = 0F; this.smartLabel3.Location = new System.Drawing.Point(503, 387); this.smartLabel3.Name = "smartLabel3"; - this.smartLabel3.Size = new System.Drawing.Size(420, 25); + this.smartLabel3.Size = new System.Drawing.Size(450, 25); this.smartLabel3.TabIndex = 230; this.smartLabel3.Text = "※ Part11 ON : activate [Login], [Data backup], [Statistics]"; this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; diff --git a/INT69DC_7C/Forms/FormUserGroupEditor.cs b/INT69DC_7C/Forms/FormUserGroupEditor.cs index 1f2dc83..8f6b3af 100644 --- a/INT69DC_7C/Forms/FormUserGroupEditor.cs +++ b/INT69DC_7C/Forms/FormUserGroupEditor.cs @@ -58,17 +58,53 @@ namespace INT69DC_7C.Forms { ImageDll images = new ImageDll(); - if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) + switch (this.ParentForm.SystemConfig.Language) { - this.labelTitle.Text = "Group Editor"; + case DataStore.LanguageID.Korean: + this.labelTitle.Text = "그룹 에디터"; + break; + case DataStore.LanguageID.English: + this.labelTitle.Text = "Group Editor"; - this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDisable)); - this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDown)); - this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackUp)); - } - else - { - this.labelTitle.Text = "그룹 에디터"; + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engSaveUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackUp)); + break; + case DataStore.LanguageID.Chinese: + this.labelTitle.Text = "组编辑"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackUp)); + break; + case DataStore.LanguageID.Czech: + this.labelTitle.Text = "Group Editor"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeSaveUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackUp)); + break; + case DataStore.LanguageID.German: + this.labelTitle.Text = "Group Editor"; + + this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerSaveDisable)); + this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerSaveDown)); + this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerSaveUp)); + this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDisable)); + this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown)); + this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp)); + break; + default: + break; } } private void DefaultSetting() diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index b0ca689..f5bb848 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -23,6 +23,17 @@ Ƽ 8,10,12 /ƽ 跮 */ +@ Ver 12.2.2 by LSJ + - 2025.02.04 + - Ver 12.2.1 Modify + - Framework : SmartX Framework V3.2.4(update: 2021.01.20) + - + - ׽Ʈ ˾ 'Է' ѱ + ׷켳 - ư ѱ + - ũ û ߰ + ߰(totalPass, totalNG, totalAll) + OPT6 : STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1] + @ Ver 12.2.1 by LSJ - 2025.01.02 - Ver 12.2.0 Modify