chojy
/
INT69DC_7C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'SJ_Branch' 

# Conflicts:
#	INT69DC_7C/Forms/FormInformation.cs
#	INT69DC_7C/Version.txt
master
sj84 2025-03-07 10:00:38 +09:00
parent fb65aad5b2 0310cf23e1
commit ad573d0324
7 changed files with 948 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
INT69DC_7C/DialogForms/DialogFormUserEditorKeyboard.designer.cs generated
View File

@ -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;
}
}

541
INT69DC_7C/Forms/FormCommunication.cs
View File

@ -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)

1
INT69DC_7C/Forms/FormInformation.cs
View File

@ -143,6 +143,7 @@ namespace INT69DC_7C.Forms
private void DefaultSetting()
{
this.labelDisplayVer.Text = "12.3.0";
if(this.ParentForm.SystemConfig.EquipmentMode == 7)
this.labelTitleMainboardName.Text = "INT68M-2A";
else

616
INT69DC_7C/Forms/FormMain.cs
View File

File diff suppressed because it is too large Load Diff

4
INT69DC_7C/Forms/FormOptionSetting.Designer.cs generated
View File

@ -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;

54
INT69DC_7C/Forms/FormUserGroupEditor.cs
View File

@ -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()

11
INT69DC_7C/Version.txt
View File

@ -31,6 +31,17 @@
Serial callback 수정(string)
serialRcvPacketStrMsgCallback
serialRcvErrPacketStrMsgCallback
@ 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