From 5d6775aeeb9ee8d5143f45e318a7ab6287469ec1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Fri, 21 Feb 2025 10:20:01 +0900 Subject: [PATCH] =?UTF-8?q?=20-=20=EC=98=81=ED=85=8C=ED=81=AC=ED=8C=A9=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EC=B6=94=EA=B0=80=20=20?= =?UTF-8?q?=20=20V6.3.0=20-=20OPT5=20=EC=B6=94=EA=B0=80=20=20-=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EB=B0=95=EC=8A=A4=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EB=B3=80=EA=B2=BD=20=20=20=20=EC=98=81=EB=AC=B8=20?= =?UTF-8?q?4-13=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=A7=A4=EB=A6=AC?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=EB=A1=9C=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EB=8A=98=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controls/ControlMainDisplayDotGraph2.cs | 2 +- .../Controls/ControlMainDisplayDotGraph3.cs | 2 +- .../Controls/ControlMainDisplayDotGraph4.cs | 2 +- .../Controls/ControlMainDisplayDotGraph5.cs | 2 +- .../Controls/ControlMainDisplayDotGraph6.cs | 2 +- .../Controls/ControlMainDisplayDotGraph7.cs | 2 +- .../Controls/ControlMainDisplayDotGraph8.cs | 2 +- INT69DB_2A/DataStore.cs | 4 +- .../DialogForms/DialogFormMessage.designer.cs | 90 +++---- .../DialogFormUserEditorKeyboard.Designer.cs | 7 +- INT69DB_2A/Forms/FormCommunication.cs | 72 +++++- INT69DB_2A/Forms/FormConfiguration.cs | 4 +- INT69DB_2A/Forms/FormInformation.cs | 2 +- INT69DB_2A/Forms/FormMain.Designer.cs | 6 + INT69DB_2A/Forms/FormMain.cs | 221 +++++++++++++++++- INT69DB_2A/Forms/FormMain.resx | 3 + INT69DB_2A/Forms/FormMainDisplay.cs | 4 +- INT69DB_2A/Forms/FormUserEditor.cs | 3 +- INT69DB_2A/Version.txt | 24 +- 19 files changed, 380 insertions(+), 74 deletions(-) diff --git a/INT69DB_2A/Controls/ControlMainDisplayDotGraph2.cs b/INT69DB_2A/Controls/ControlMainDisplayDotGraph2.cs index e1ec07c..17a0077 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayDotGraph2.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayDotGraph2.cs @@ -105,7 +105,7 @@ namespace INT69DB_2A.Controls chartchPenStyle[0].m_chColor = Color.Yellow; chartchPenStyle[0].m_iPenWidth = 2; - draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); draw.ChartChannelPenStyle = chartchPenStyle; } diff --git a/INT69DB_2A/Controls/ControlMainDisplayDotGraph3.cs b/INT69DB_2A/Controls/ControlMainDisplayDotGraph3.cs index 0a43194..ffca31b 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayDotGraph3.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayDotGraph3.cs @@ -108,7 +108,7 @@ namespace INT69DB_2A.Controls chartchPenStyle[0].m_chColor = Color.Yellow; chartchPenStyle[0].m_iPenWidth = 2; - draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); draw.ChartChannelPenStyle = chartchPenStyle; } diff --git a/INT69DB_2A/Controls/ControlMainDisplayDotGraph4.cs b/INT69DB_2A/Controls/ControlMainDisplayDotGraph4.cs index 4f87867..0de875b 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayDotGraph4.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayDotGraph4.cs @@ -111,7 +111,7 @@ namespace INT69DB_2A.Controls chartchPenStyle[0].m_chColor = Color.Yellow; chartchPenStyle[0].m_iPenWidth = 2; - draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); draw.ChartChannelPenStyle = chartchPenStyle; } diff --git a/INT69DB_2A/Controls/ControlMainDisplayDotGraph5.cs b/INT69DB_2A/Controls/ControlMainDisplayDotGraph5.cs index 6acd413..a890862 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayDotGraph5.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayDotGraph5.cs @@ -114,7 +114,7 @@ namespace INT69DB_2A.Controls chartchPenStyle[0].m_chColor = Color.Yellow; chartchPenStyle[0].m_iPenWidth = 2; - draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); draw.ChartChannelPenStyle = chartchPenStyle; } diff --git a/INT69DB_2A/Controls/ControlMainDisplayDotGraph6.cs b/INT69DB_2A/Controls/ControlMainDisplayDotGraph6.cs index 06ea8a4..fb3b1e1 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayDotGraph6.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayDotGraph6.cs @@ -117,7 +117,7 @@ namespace INT69DB_2A.Controls chartchPenStyle[0].m_chColor = Color.Yellow; chartchPenStyle[0].m_iPenWidth = 2; - draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); draw.ChartChannelPenStyle = chartchPenStyle; } diff --git a/INT69DB_2A/Controls/ControlMainDisplayDotGraph7.cs b/INT69DB_2A/Controls/ControlMainDisplayDotGraph7.cs index 4ebda6c..539928f 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayDotGraph7.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayDotGraph7.cs @@ -120,7 +120,7 @@ namespace INT69DB_2A.Controls chartchPenStyle[0].m_chColor = Color.Yellow; chartchPenStyle[0].m_iPenWidth = 2; - draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); draw.ChartChannelPenStyle = chartchPenStyle; } diff --git a/INT69DB_2A/Controls/ControlMainDisplayDotGraph8.cs b/INT69DB_2A/Controls/ControlMainDisplayDotGraph8.cs index 9156f07..dcf6603 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayDotGraph8.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayDotGraph8.cs @@ -123,7 +123,7 @@ namespace INT69DB_2A.Controls chartchPenStyle[0].m_chColor = Color.Yellow; chartchPenStyle[0].m_iPenWidth = 2; - draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); draw.ChartChannelPenStyle = chartchPenStyle; } diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index d66a65c..ca7c485 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -46,7 +46,7 @@ namespace INT69DB_2A public enum MainDisplayStore { BarGraph, - LineGraph, + DotGraph, Table, }; @@ -346,6 +346,7 @@ namespace INT69DB_2A f3_OPT3, f4_Printer, f5_OPT4, + f6_OPT5, } public enum EthernetMode @@ -356,6 +357,7 @@ namespace INT69DB_2A f3_OPT3, f4_Modbus, f5_OPT4, + f6_OPT5, } public enum UserGroup diff --git a/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs b/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs index 1e9b132..9bb366e 100644 --- a/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs +++ b/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs @@ -30,15 +30,15 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormMessage)); this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBoxExclamation = new System.Windows.Forms.PictureBox(); + this.pictureBoxHand = new System.Windows.Forms.PictureBox(); + this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox(); + this.pictureBoxQuestion = new System.Windows.Forms.PictureBox(); this.labelMessage2 = new System.Windows.Forms.Label(); this.labelMessage1 = new System.Windows.Forms.Label(); this.buttonOK = new System.Windows.Forms.Button(); this.labelErrorCode = new System.Windows.Forms.Label(); this.timerAutoClose = new System.Windows.Forms.Timer(); - this.pictureBoxExclamation = new System.Windows.Forms.PictureBox(); - this.pictureBoxHand = new System.Windows.Forms.PictureBox(); - this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox(); - this.pictureBoxQuestion = new System.Windows.Forms.PictureBox(); this.panel1.SuspendLayout(); this.SuspendLayout(); // @@ -51,30 +51,61 @@ this.panel1.Controls.Add(this.pictureBoxQuestion); this.panel1.Controls.Add(this.labelMessage2); this.panel1.Controls.Add(this.labelMessage1); - this.panel1.Location = new System.Drawing.Point(15, 34); + this.panel1.Location = new System.Drawing.Point(3, 34); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(420, 95); + this.panel1.Size = new System.Drawing.Size(444, 95); + // + // pictureBoxExclamation + // + this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image"))); + this.pictureBoxExclamation.Location = new System.Drawing.Point(5, 20); + this.pictureBoxExclamation.Name = "pictureBoxExclamation"; + this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50); + // + // pictureBoxHand + // + this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image"))); + this.pictureBoxHand.Location = new System.Drawing.Point(5, 20); + this.pictureBoxHand.Name = "pictureBoxHand"; + this.pictureBoxHand.Size = new System.Drawing.Size(50, 50); + this.pictureBoxHand.Visible = false; + // + // pictureBoxAsterisk + // + this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image"))); + this.pictureBoxAsterisk.Location = new System.Drawing.Point(5, 20); + this.pictureBoxAsterisk.Name = "pictureBoxAsterisk"; + this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50); + this.pictureBoxAsterisk.Visible = false; + // + // pictureBoxQuestion + // + this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image"))); + this.pictureBoxQuestion.Location = new System.Drawing.Point(5, 20); + this.pictureBoxQuestion.Name = "pictureBoxQuestion"; + this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50); + this.pictureBoxQuestion.Visible = false; // // labelMessage2 // - this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); - this.labelMessage2.Location = new System.Drawing.Point(67, 50); + this.labelMessage2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage2.Location = new System.Drawing.Point(57, 50); this.labelMessage2.Name = "labelMessage2"; - this.labelMessage2.Size = new System.Drawing.Size(350, 20); + this.labelMessage2.Size = new System.Drawing.Size(387, 20); this.labelMessage2.Text = "COM2 port problem. Please contact a manufacturer."; // // labelMessage1 // - this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); - this.labelMessage1.Location = new System.Drawing.Point(67, 20); + this.labelMessage1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage1.Location = new System.Drawing.Point(57, 20); this.labelMessage1.Name = "labelMessage1"; - this.labelMessage1.Size = new System.Drawing.Size(350, 20); + this.labelMessage1.Size = new System.Drawing.Size(387, 20); this.labelMessage1.Text = "COM2 port problem. Please contact a manufacturer."; // // buttonOK // this.buttonOK.BackColor = System.Drawing.Color.LightGray; - this.buttonOK.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.buttonOK.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.buttonOK.ForeColor = System.Drawing.Color.Black; this.buttonOK.Location = new System.Drawing.Point(335, 135); this.buttonOK.Name = "buttonOK"; @@ -86,7 +117,7 @@ // // labelErrorCode // - this.labelErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelErrorCode.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelErrorCode.Location = new System.Drawing.Point(15, 11); this.labelErrorCode.Name = "labelErrorCode"; this.labelErrorCode.Size = new System.Drawing.Size(350, 20); @@ -97,37 +128,6 @@ this.timerAutoClose.Interval = 1000; this.timerAutoClose.Tick += new System.EventHandler(this.timerAutoClose_Tick); // - // pictureBoxExclamation - // - this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image"))); - this.pictureBoxExclamation.Location = new System.Drawing.Point(11, 20); - this.pictureBoxExclamation.Name = "pictureBoxExclamation"; - this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50); - // - // pictureBoxHand - // - this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image"))); - this.pictureBoxHand.Location = new System.Drawing.Point(11, 20); - this.pictureBoxHand.Name = "pictureBoxHand"; - this.pictureBoxHand.Size = new System.Drawing.Size(50, 50); - this.pictureBoxHand.Visible = false; - // - // pictureBoxAsterisk - // - this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image"))); - this.pictureBoxAsterisk.Location = new System.Drawing.Point(11, 20); - this.pictureBoxAsterisk.Name = "pictureBoxAsterisk"; - this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50); - this.pictureBoxAsterisk.Visible = false; - // - // pictureBoxQuestion - // - this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image"))); - this.pictureBoxQuestion.Location = new System.Drawing.Point(11, 20); - this.pictureBoxQuestion.Name = "pictureBoxQuestion"; - this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50); - this.pictureBoxQuestion.Visible = false; - // // DialogFormMessage // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs index f4cd255..51a391a 100644 --- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs +++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs @@ -46,7 +46,7 @@ // textBox // this.textBox.Font = new System.Drawing.Font("Tahoma", 25F, System.Drawing.FontStyle.Regular); - this.textBox.Location = new System.Drawing.Point(143, 99); + this.textBox.Location = new System.Drawing.Point(143, 80); this.textBox.MaxLength = 20; this.textBox.Name = "textBox"; this.textBox.Size = new System.Drawing.Size(489, 47); @@ -104,17 +104,18 @@ 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("새굴림", 20F, System.Drawing.FontStyle.Bold); + 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.Location = new System.Drawing.Point(143, 16); this.labelTitle.Name = "labelTitle"; this.labelTitle.Size = new System.Drawing.Size(489, 50); this.labelTitle.TabIndex = 183; this.labelTitle.Text = "ìž…ë ¥"; this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitle.Visible = false; this.labelTitle.Wordwrap = false; // // DialogFormUserEditorKeyboard diff --git a/INT69DB_2A/Forms/FormCommunication.cs b/INT69DB_2A/Forms/FormCommunication.cs index 801f544..41956e6 100644 --- a/INT69DB_2A/Forms/FormCommunication.cs +++ b/INT69DB_2A/Forms/FormCommunication.cs @@ -122,6 +122,7 @@ namespace INT69DB_2A.Forms this.comboBoxMode.Items.Add("OPT3"); this.comboBoxMode.Items.Add("Modbus"); this.comboBoxMode.Items.Add("OPT4"); + this.comboBoxMode.Items.Add("OPT5"); this.comboBoxMode.SelectedIndex = 0; this.comboBoxMode.SelectedIndexChanged += new EventHandler(this.comboBoxMode_SelectedIndexChanged); @@ -142,6 +143,7 @@ namespace INT69DB_2A.Forms this.comboBoxSerial3Mode.Items.Add("OPT3"); this.comboBoxSerial3Mode.Items.Add("Printer"); this.comboBoxSerial3Mode.Items.Add("OPT4"); + this.comboBoxSerial3Mode.Items.Add("OPT5"); this.comboBoxSerial3Mode.SelectedIndex = 0; this.comboBoxSerial3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged); } @@ -300,6 +302,13 @@ namespace INT69DB_2A.Forms else if (this.ParentForm.SystemConfig.EquipmentMode == 2) data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]); } + else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5) + { + if (this.ParentForm.SystemConfig.EquipmentMode == 1) + data = this.ParentForm.Protocol_OPT5(this.ParentForm.CollectionWeightData); + else if (this.ParentForm.SystemConfig.EquipmentMode == 2) + data = this.ParentForm.Protocol_OPT5(1, this.ParentForm.CollectionWeightData[0]); + } switch (this.ParentForm.SystemConfig.EthernetOperationMode) { @@ -386,7 +395,14 @@ namespace INT69DB_2A.Forms private void UpdateDisplayCom3() { this.comboBoxSerial3BaudRate.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged); - this.comboBoxSerial3BaudRate.SelectedItem = this.ParentForm.SystemConfig.Serial3BaudRate; + try + { + this.comboBoxSerial3BaudRate.SelectedIndex = this.ParentForm.SystemConfig.Serial3BaudRate; + } + catch + { + this.comboBoxSerial3BaudRate.SelectedIndex = 0; + } this.comboBoxSerial3BaudRate.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3BaudRate_SelectedIndexChanged); this.comboBoxSerial3Mode.SelectedIndexChanged -= new EventHandler(this.comboBoxSerial3Mode_SelectedIndexChanged); @@ -464,6 +480,19 @@ namespace INT69DB_2A.Forms this.labelProtocolDescriptionCOM3_2.Text = "LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; } } + else if (this.comboBoxSerial3Mode.SelectedIndex == 6) + { + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],"; + this.labelProtocolDescriptionCOM3_2.Text = "Total Count[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else if (this.ParentForm.SystemConfig.EquipmentMode == 2) + { + this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],"; + this.labelProtocolDescriptionCOM3_2.Text = "Total Count[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; + } + } else { if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) @@ -537,6 +566,19 @@ namespace INT69DB_2A.Forms this.labelProtocolDescriptionEthernet_2.Text = "LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; } } + else if (this.comboBoxMode.SelectedIndex == (int)DataStore.EthernetMode.f6_OPT5) + { + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],"; + this.labelProtocolDescriptionEthernet_2.Text = "Total Count[9],{GRD[1],WEIGHT[6]} * n,ETX[1]"; + } + else if (this.ParentForm.SystemConfig.EquipmentMode == 2) + { + this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],Pass Count[7],NG Count[7],"; + this.labelProtocolDescriptionEthernet_2.Text = "Total Count[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]"; + } + } else { if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) @@ -1472,7 +1514,7 @@ namespace INT69DB_2A.Forms beforeMode = this.ReturnCommunicationModeName(comboBox, this.ParentForm.SystemConfig.Serial3Mode); beforeBaudrate = this.ParentForm.SystemConfig.Serial3BaudRate.ToString(); - this.ParentForm.SystemConfig.Serial3BaudRate = (int)this.comboBoxSerial3BaudRate.SelectedItem; + this.ParentForm.SystemConfig.Serial3BaudRate = this.comboBoxSerial3BaudRate.SelectedIndex; this.ParentForm.SystemConfig.Serial3Mode = this.comboBoxSerial3Mode.SelectedIndex; afterMode = this.ReturnCommunicationModeName(comboBox, this.ParentForm.SystemConfig.Serial3Mode); @@ -1500,6 +1542,25 @@ namespace INT69DB_2A.Forms this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; break; } + + switch (this.ParentForm.SystemConfig.Serial3BaudRate) + { + case 0: + this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; + break; + case 1: + this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._19200bps; + break; + case 2: + this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._38400bps; + break; + case 3: + this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._115200bps; + break; + default: + this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; + break; + } this.ParentForm.smartSerialPortCom3.Open(); this.buttonSerialSend.Enabled = true; @@ -1548,6 +1609,13 @@ namespace INT69DB_2A.Forms else if (this.ParentForm.SystemConfig.EquipmentMode == 2) this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); } + else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f6_OPT5) + { + if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT5_NotStxEtx(this.ParentForm.CollectionWeightData)); + else if (this.ParentForm.SystemConfig.EquipmentMode == 2) + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT5_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); + } } private void comboBoxSerial3BaudRate_SelectedIndexChanged(object sender, EventArgs e) diff --git a/INT69DB_2A/Forms/FormConfiguration.cs b/INT69DB_2A/Forms/FormConfiguration.cs index 05c96f3..3314fdb 100644 --- a/INT69DB_2A/Forms/FormConfiguration.cs +++ b/INT69DB_2A/Forms/FormConfiguration.cs @@ -572,13 +572,11 @@ namespace INT69DB_2A.Forms string before = "", after = ""; before = this.comboBoxDecimalPlaces.Items.IndexOf(this.ParentForm.SystemConfig.DecimalPlaces).ToString(); this.ParentForm.SystemConfig.DecimalPlaces = this.comboBoxDecimalPlaces.SelectedIndex; + this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); after = this.comboBoxDecimalPlaces.SelectedItem.ToString(); if (this.ParentForm.SystemConfig.IsPart11 == true) this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDecimalpoint, "", before, after); - - if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); } private void labelAlarmContinuousNG_Click(object sender, EventArgs e) diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs index 7fcb503..40e404c 100644 --- a/INT69DB_2A/Forms/FormInformation.cs +++ b/INT69DB_2A/Forms/FormInformation.cs @@ -107,7 +107,7 @@ namespace INT69DB_2A.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "5.2.2"; + this.labelDisplayVer.Text = "5.3.0"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DB_2A/Forms/FormMain.Designer.cs b/INT69DB_2A/Forms/FormMain.Designer.cs index a4a043c..82e1b70 100644 --- a/INT69DB_2A/Forms/FormMain.Designer.cs +++ b/INT69DB_2A/Forms/FormMain.Designer.cs @@ -42,6 +42,7 @@ this.timerUserList = new System.Windows.Forms.Timer(); this.timerTimeOutTransmission = new System.Windows.Forms.Timer(); this.smartSerialPortCom3 = new SmartX.SmartSerialPort(); + this.smartFileCom3Log = new SmartX.SmartFile(); ((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit(); this.SuspendLayout(); // @@ -145,6 +146,10 @@ this.smartSerialPortCom3.STXCodes = null; this.smartSerialPortCom3.TailErrorCodeOffset = 0; // + // smartFileCom3Log + // + this.smartFileCom3Log.FilePathName = null; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -174,6 +179,7 @@ private System.Windows.Forms.Timer timerUserList; public System.Windows.Forms.Timer timerTimeOutTransmission; public SmartX.SmartSerialPort smartSerialPortCom3; + public SmartX.SmartFile smartFileCom3Log; } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index 633dc68..9bbe342 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -1467,6 +1467,205 @@ namespace INT69DB_2A.Forms return sb.ToString(); } + public string Protocol_OPT5(Collection datas) + { + string value = ""; + int toTalAll = 0, toTalPass = 0, totalNg = 0; + StringBuilder sb = new StringBuilder(); + + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + toTalAll += datas[i].TotalCount; + toTalPass += datas[i].PassCount; + totalNg += datas[i].TotalNGCount; + } + + sb.Append((char)0x02); + sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID)); + sb.Append(string.Format("{0:D4}", this.SystemConfig.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, ' ')); + + if (this.SystemConfig.IsWeightViewForward == true) + { + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else + sb.Append("E"); + + value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces); + sb.Append(value.PadLeft(6, ' ')); + } + } + else + { + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else + sb.Append("E"); + + value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces); + sb.Append(value.PadLeft(6, ' ')); + } + } + sb.Append((char)0x03); + + return sb.ToString(); + } + public string Protocol_OPT5(int lane, WeightData data) + { + string value = ""; + StringBuilder sb = new StringBuilder(); + + sb.Append((char)0x02); + sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID)); + sb.Append(string.Format("{0:D4}", this.SystemConfig.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.Over) + sb.Append("O"); + else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else + sb.Append("E"); + + value = Helper.DoubleToString(data.Weight, this.SystemConfig.DecimalPlaces); + sb.Append(value.PadLeft(6, ' ')); + sb.Append((char)0x03); + + return sb.ToString(); + } + public string Protocol_OPT5_NotStxEtx(Collection datas) + { + string value = ""; + int toTalAll = 0, toTalPass = 0, totalNg = 0; + StringBuilder sb = new StringBuilder(); + + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + toTalAll += datas[i].TotalCount; + toTalPass += datas[i].PassCount; + totalNg += datas[i].TotalNGCount; + } + + sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID)); + sb.Append(string.Format("{0:D4}", this.SystemConfig.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, ' ')); + + if (this.SystemConfig.IsWeightViewForward == true) + { + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else + sb.Append("E"); + + value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces); + sb.Append(value.PadLeft(6, ' ')); + } + } + else + { + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under) + sb.Append("U"); + else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over) + sb.Append("O"); + else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else + sb.Append("E"); + + value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces); + sb.Append(value.PadLeft(6, ' ')); + } + } + + return sb.ToString(); + } + public string Protocol_OPT5_NotStxEtx(int lane, WeightData data) + { + string value = ""; + StringBuilder sb = new StringBuilder(); + + sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID)); + sb.Append(string.Format("{0:D4}", this.SystemConfig.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.Over) + sb.Append("O"); + else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double) + sb.Append("D"); + else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass) + sb.Append("P"); + else + sb.Append("E"); + + value = Helper.DoubleToString(data.Weight, this.SystemConfig.DecimalPlaces); + sb.Append(value.PadLeft(6, ' ')); + + return sb.ToString(); + } + public byte[] Protocol_Modbus_Client_Write_Common_Data() { int index = 0; @@ -2938,6 +3137,9 @@ namespace INT69DB_2A.Forms case 5: this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(datas)); break; + case 6: + this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(datas)); + break; default: break; } @@ -3010,6 +3212,7 @@ namespace INT69DB_2A.Forms { try { + this.smartSerialPortCom3.Close(); switch (this.SystemConfig.Serial3BaudRate) { case 0: @@ -3028,8 +3231,7 @@ namespace INT69DB_2A.Forms this.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; break; } - if (this.smartSerialPortCom3.IsOpen == false) - this.smartSerialPortCom3.Open(); + this.smartSerialPortCom3.Open(); } catch { @@ -3047,6 +3249,8 @@ namespace INT69DB_2A.Forms public void UartCom3Write(string data) { this.smartSerialPortCom3.WriteFrame(data, SmartSerialPort.CODETYPES.ASCIICODE); + + //this.smartFileCom3Log.WriteString(string.Format("COM3 Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, data)); } private int UartCom3Write(string command, string id, string address, string data) { @@ -3070,7 +3274,7 @@ namespace INT69DB_2A.Forms return ret; } - private void TreatSerialCommunication(Collection datas) + public void TreatSerialCommunication(Collection datas) { if (this.SystemConfig.Serial3Mode == 0) return; @@ -3089,6 +3293,8 @@ namespace INT69DB_2A.Forms } else if (this.SystemConfig.Serial3Mode == 5) // OPT4 this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(this.CollectionWeightData)); + else if (this.SystemConfig.Serial3Mode == 6) // OPT5 + this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(this.CollectionWeightData)); } private void TreatSerialCommunication(int lane, WeightData data) { @@ -3109,6 +3315,8 @@ namespace INT69DB_2A.Forms } else if (this.SystemConfig.Serial3Mode == 5) // OPT4 this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(lane, data)); + else if (this.SystemConfig.Serial3Mode == 6) // OPT5 + this.UartCom3Write(this.Protocol_OPT5_NotStxEtx(lane, data)); } #endregion #region Ethernet @@ -3151,6 +3359,11 @@ namespace INT69DB_2A.Forms sendData = this.Protocol_OPT4(this.CollectionWeightData); this.SendEthernetData(sendData); } + else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f6_OPT5) + { + sendData = this.Protocol_OPT5(this.CollectionWeightData); + this.SendEthernetData(sendData); + } } private void TreatEthernetCommunication(int lane, WeightData data) { @@ -5519,7 +5732,7 @@ namespace INT69DB_2A.Forms #region 통신 this.TreatSerialCommunication(this.CollectionWeightData); - this.TreatEthernetCommunication(this.CollectionWeightData); + this.TreatEthernetCommunication(this.CollectionWeightData); #endregion #region ACNC(Alarm Continuous Ng Count) diff --git a/INT69DB_2A/Forms/FormMain.resx b/INT69DB_2A/Forms/FormMain.resx index 02b53b2..1f69fd0 100644 --- a/INT69DB_2A/Forms/FormMain.resx +++ b/INT69DB_2A/Forms/FormMain.resx @@ -153,6 +153,9 @@ 494, 56 + + 676, 54 + WEBPAD diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs index 123e82b..68281ca 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.cs @@ -747,7 +747,7 @@ namespace INT69DB_2A.Forms this.UpdateDisplayButton(SmartButton.BUTSTATUS.DOWN, SmartButton.BUTSTATUS.UP, SmartButton.BUTSTATUS.UP); #endregion } - else if (displayForm == DataStore.MainDisplayStore.LineGraph) + else if (displayForm == DataStore.MainDisplayStore.DotGraph) { #region DotGraph switch (this.ParentForm.SystemConfig.EquipmentColumns) @@ -2852,7 +2852,7 @@ namespace INT69DB_2A.Forms if (button == this.buttonBarGraphForm) this.MainDisplay = DataStore.MainDisplayStore.BarGraph; else if (button == this.buttonDotGraphForm) - this.MainDisplay = DataStore.MainDisplayStore.LineGraph; + this.MainDisplay = DataStore.MainDisplayStore.DotGraph; else if (button == this.buttonTableForm) this.MainDisplay = DataStore.MainDisplayStore.Table; else diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs index 4b81e1d..4a24cdf 100644 --- a/INT69DB_2A/Forms/FormUserEditor.cs +++ b/INT69DB_2A/Forms/FormUserEditor.cs @@ -290,7 +290,8 @@ namespace INT69DB_2A.Forms if (this.SelectedUserItem.Group == DataStore.UserGroup.Admin) { - item.ActiveLevel = 9; + if (this.ParentForm.SystemConfig.IsPart11 == true) + item.ActiveLevel = 9; } else { diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index 976e1f9..4e778f9 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -14,15 +14,29 @@ ¸ÖƼÇü 2~6¿­ ½ºÆ½ °è·®±â */ -@ Ver 5.2.2 by LSJ - - 2024.08.28 - - Ver 5.2.1 Modify +@ Ver 5.3.0 by LSJ + - 2025.02.07 + - Ver 5.2.2 Modify - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ¿µÅ×Å©ÆÑ ¿äû»çÇ× Ãß°¡ + V6.3.0 - OPT5 Ãß°¡ + - ¸Þ½ÃÁö ¹Ú½º »çÀÌÁî º¯°æ + ¿µ¹® 4-13 ¸Þ½ÃÁö ©¸®´Â ¹®Á¦·Î »çÀÌÁî ´Ã¸² + +@ Ver 5.2.2 by LSJ + - 2024.12.05 + - Ver 5.2.0 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ¹ö±×¼öÁ¤ + ȯ°æ¼³Á¤-¼Ò¼öÁ¡ º¯°æ½Ã ÀúÀå¾ÈµÇ´Â ¹ö±× ¼öÁ¤ - Part11 °ü·Ã ¼öÁ¤ OtherBackup() ½Ã Çì´õÆÄÀÏ¿¡ ÆĶó¹ÌÅÍ ´©¶ô header.EquipmentType = 103; - - 2024.11.08 - - ·Î±×ÀÎ Admin ºñ¹Ð¹øÈ£ º¯°æ ½Ã Level1·Î º¯°æµÇ´Â ¹®Á¦ ¼öÁ¤ + - XY ±×·¡ÇÁ È­¸é µ¥ÀÌÅÍ °¹¼ö ¼öÁ¤ + draw.SetChartCfg(103, 310, 627, 290, 2, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + -> draw.SetChartCfg(103, 310, 627, 290, 16, SmartX.SmartDraw.CHARTREFRESH.LEFTSCROLL, 1); + 627/2 = 313 + 627/16 = 39 @ Ver 5.2.1 by CJY - 2024.08.21