diff --git a/ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs b/ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs
index 873e0d2..723f17d 100644
--- a/ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs
+++ b/ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs
@@ -1225,6 +1225,8 @@ namespace ITC81DB_0H.Controls
if (this.timerServer.Enabled != true)
this.timerServer.Enabled = true;
+
+ this.ParentForm.ParentForm.ChildFormMainDisplay.TimerDetectConnected(false);
}
}
else if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 2)
@@ -1244,6 +1246,8 @@ namespace ITC81DB_0H.Controls
if (this.labelServerStatus.Text != ">Stop")
this.labelServerStatus.Text = ">Stop";
+
+ this.ParentForm.ParentForm.ChildFormMainDisplay.TimerDetectConnected(false);
}
else if (this.ParentForm.ParentForm.SystemConfig2.EthernetOperationMode == 2)
{
@@ -1264,13 +1268,11 @@ namespace ITC81DB_0H.Controls
{
this.ParentForm.ParentForm.SystemConfig2.IsEthernetPingTimer = true;
this.buttonPingTimer.Text = "Ping Close";
- this.ParentForm.ParentForm.IsUsingTimerEthernetPing(true);
}
else
{
this.ParentForm.ParentForm.SystemConfig2.IsEthernetPingTimer = false;
this.buttonPingTimer.Text = "Ping Open";
- this.ParentForm.ParentForm.IsUsingTimerEthernetPing(false);
}
}
diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs
index c31304f..ded6080 100644
--- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs
+++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipEngineer.cs
@@ -436,6 +436,7 @@ namespace ITC81DB_0H.Controls
this.ParentForm.ParentForm.SystemConfig1.IsBLDCON = false;
this.ParentForm.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.ParentForm.SystemConfig1);
+ this.ParentForm.ParentForm.ChildFormMenu.CenterInforSystem3.DisplayGroupBox();
}
private void labelMotorNum_Click(object sender, EventArgs e)
{
diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.Designer.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.Designer.cs
index ea578c0..61b666f 100644
--- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.Designer.cs
+++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.Designer.cs
@@ -98,7 +98,7 @@
this.buttonNext.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold);
this.buttonNext.GroupID = 0;
this.buttonNext.InitVisible = true;
- this.buttonNext.Location = new System.Drawing.Point(655, 410);
+ this.buttonNext.Location = new System.Drawing.Point(653, 410);
this.buttonNext.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonNext.Name = "buttonNext";
this.buttonNext.NestedClickEventPrevent = false;
diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.Designer.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.Designer.cs
index 1ae5c6f..c38b830 100644
--- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.Designer.cs
+++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.Designer.cs
@@ -709,7 +709,7 @@
this.buttonNext.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold);
this.buttonNext.GroupID = 0;
this.buttonNext.InitVisible = true;
- this.buttonNext.Location = new System.Drawing.Point(655, 410);
+ this.buttonNext.Location = new System.Drawing.Point(653, 410);
this.buttonNext.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonNext.Name = "buttonNext";
this.buttonNext.NestedClickEventPrevent = false;
diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.cs
index f0e7420..6e3b40f 100644
--- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.cs
+++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem2.cs
@@ -539,48 +539,48 @@ namespace ITC81DB_0H
}
private void CheckCompareBoardLCD9519Value(SystemInformation2 item)
{
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut1Mode != item.ExternalOutput1Mode)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut1Mode) != int.Parse(item.ExternalOutput1Mode))
this.labelExternalOutput1Mode.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut1DelayTime != item.ExternalOutput1Delay)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut1DelayTime) != int.Parse(item.ExternalOutput1Delay))
this.labelExternalOutput1Delay.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut1RunTime != item.ExternalOutput1Operation)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut1RunTime) != int.Parse(item.ExternalOutput1Operation))
this.labelExternalOutput1Operation.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut2Mode != item.ExternalOutput2Mode)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut2Mode) != int.Parse(item.ExternalOutput2Mode))
this.labelExternalOutput2Mode.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut2DelayTime != item.ExternalOutput2Delay)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut2DelayTime) != int.Parse(item.ExternalOutput2Delay))
this.labelExternalOutput2Delay.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut2RunTime != item.ExternalOutput2Operation)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut2RunTime) != int.Parse(item.ExternalOutput2Operation))
this.labelExternalOutput2Operation.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut3Mode != item.ExternalOutput3Mode)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut3Mode) != int.Parse(item.ExternalOutput3Mode))
this.labelExternalOutput3Mode.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut3DelayTime != item.ExternalOutput3Delay)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut3DelayTime) != int.Parse(item.ExternalOutput3Delay))
this.labelExternalOutput3Delay.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut3RunTime != item.ExternalOutput3Operation)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut3RunTime) != int.Parse(item.ExternalOutput3Operation))
this.labelExternalOutput3Operation.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut4Mode != item.ExternalOutput4Mode)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut4Mode) != int.Parse(item.ExternalOutput4Mode))
this.labelExternalOutput4Mode.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut4DelayTime != item.ExternalOutput4Delay)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut4DelayTime) != int.Parse(item.ExternalOutput4Delay))
this.labelExternalOutput4Delay.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut4RunTime != item.ExternalOutput4Operation)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut4RunTime) != int.Parse(item.ExternalOutput4Operation))
this.labelExternalOutput4Operation.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut5Mode != item.ExternalOutput5Mode)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut5Mode) != int.Parse(item.ExternalOutput5Mode))
this.labelExternalOutput5Mode.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut5DelayTime != item.ExternalOutput5Delay)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut5DelayTime) != int.Parse(item.ExternalOutput5Delay))
this.labelExternalOutput5Delay.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut5RunTime != item.ExternalOutput5Operation)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut5RunTime) != int.Parse(item.ExternalOutput5Operation))
this.labelExternalOutput5Operation.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut6Mode != item.ExternalOutput6Mode)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut6Mode) != int.Parse(item.ExternalOutput6Mode))
this.labelExternalOutput6Mode.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut6DelayTime != item.ExternalOutput6Delay)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut6DelayTime) != int.Parse(item.ExternalOutput6Delay))
this.labelExternalOutput6Delay.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut6RunTime != item.ExternalOutput6Operation)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter3.ExternalOut6RunTime) != int.Parse(item.ExternalOutput6Operation))
this.labelExternalOutput6Operation.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroIsAutoZeroUsing.ToString() != item.IsAutoZeroUsing.ToString())
+ if (Convert.ToInt16(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroIsAutoZeroUsing) != int.Parse(item.IsAutoZeroUsing))
this.labelIsAutoZeroUsing.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroPlusRange != item.AutoZeroPlusRange)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroPlusRange) != int.Parse(item.AutoZeroPlusRange))
this.labelPlusRange.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroMinusRange != item.AutoZeroMinusRange)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroMinusRange) != int.Parse(item.AutoZeroMinusRange))
this.labelMinusRange.ForeColor = Color.Red;
if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroVariate) != int.Parse(item.AutoZeroVariate))
this.labelVariate.ForeColor = Color.Red;
@@ -641,11 +641,11 @@ namespace ITC81DB_0H
#endregion
#region Judgment
- this.labelFilter.Text = item.Filter;
- this.labelJudgmentDelay.Text = item.JudgmentDelay;
- this.labelDoubleDelay.Text = item.DoubleDelay;
- this.labelJudgmentNumeber.Text = item.JudgmentNumber;
- this.labelSpeed.Text = item.Speed;
+ this.labelFilter.Text = Helper.RemoveZeroNumberString(item.Filter);
+ this.labelJudgmentDelay.Text = Helper.RemoveZeroNumberString(item.JudgmentDelay);
+ this.labelDoubleDelay.Text = Helper.RemoveZeroNumberString(item.DoubleDelay);
+ this.labelJudgmentNumeber.Text = Helper.RemoveZeroNumberString(item.JudgmentNumber);
+ this.labelSpeed.Text = Helper.RemoveZeroNumberString(item.Speed);
this.labelDynamic.Text = Helper.StringToDecimalPlaces(item.Dynamic, 6);
#endregion
@@ -658,11 +658,11 @@ namespace ITC81DB_0H
#region Sorter
this.labelSorterAMode.Text = this.ReturnSorterModeName(item.SorterAMode);
- this.labelSorterADelay.Text = item.SorterADelay;
- this.labelSorterAOperation.Text = item.SorterAOperation;
+ this.labelSorterADelay.Text = Helper.RemoveZeroNumberString(item.SorterADelay);
+ this.labelSorterAOperation.Text = Helper.RemoveZeroNumberString(item.SorterAOperation);
this.labelSorterBMode.Text = this.ReturnSorterModeName(item.SorterBMode);
- this.labelSorterBDelay.Text = item.SorterBDelay;
- this.labelSorterBOperation.Text = item.SorterBOperation;
+ this.labelSorterBDelay.Text = Helper.RemoveZeroNumberString(item.SorterBDelay);
+ this.labelSorterBOperation.Text = Helper.RemoveZeroNumberString(item.SorterBOperation);
this.labelDoubleEntry.Text = this.ReturnSorterOptionName(item.DoubleEntry);
this.labelExternalInput.Text = this.ReturnSorterOptionName(item.ExternalInput);
this.labelETCNG.Text = this.ReturnSorterOptionName(item.ETCNG);
@@ -676,23 +676,23 @@ namespace ITC81DB_0H
#region 외부출력
this.labelExternalOutput1Mode.Text = this.ReturnExternalOutputName(item.ExternalOutput1Mode);
- this.labelExternalOutput1Delay.Text = item.ExternalOutput1Delay;
- this.labelExternalOutput1Operation.Text = item.ExternalOutput1Operation;
+ this.labelExternalOutput1Delay.Text = Helper.RemoveZeroNumberString(item.ExternalOutput1Delay);
+ this.labelExternalOutput1Operation.Text = Helper.RemoveZeroNumberString(item.ExternalOutput1Operation);
this.labelExternalOutput2Mode.Text = this.ReturnExternalOutputName(item.ExternalOutput2Mode);
- this.labelExternalOutput2Delay.Text = item.ExternalOutput2Delay;
- this.labelExternalOutput2Operation.Text = item.ExternalOutput2Operation;
+ this.labelExternalOutput2Delay.Text = Helper.RemoveZeroNumberString(item.ExternalOutput2Delay);
+ this.labelExternalOutput2Operation.Text = Helper.RemoveZeroNumberString(item.ExternalOutput2Operation);
this.labelExternalOutput3Mode.Text = this.ReturnExternalOutputName(item.ExternalOutput3Mode);
- this.labelExternalOutput3Delay.Text = item.ExternalOutput3Delay;
- this.labelExternalOutput3Operation.Text = item.ExternalOutput3Operation;
+ this.labelExternalOutput3Delay.Text = Helper.RemoveZeroNumberString(item.ExternalOutput3Delay);
+ this.labelExternalOutput3Operation.Text = Helper.RemoveZeroNumberString(item.ExternalOutput3Operation);
this.labelExternalOutput4Mode.Text = this.ReturnExternalOutputName(item.ExternalOutput4Mode);
- this.labelExternalOutput4Delay.Text = item.ExternalOutput4Delay;
- this.labelExternalOutput4Operation.Text = item.ExternalOutput4Operation;
+ this.labelExternalOutput4Delay.Text = Helper.RemoveZeroNumberString(item.ExternalOutput4Delay);
+ this.labelExternalOutput4Operation.Text = Helper.RemoveZeroNumberString(item.ExternalOutput4Operation);
this.labelExternalOutput5Mode.Text = this.ReturnExternalOutputName(item.ExternalOutput5Mode);
- this.labelExternalOutput5Delay.Text = item.ExternalOutput5Delay;
- this.labelExternalOutput5Operation.Text = item.ExternalOutput5Operation;
+ this.labelExternalOutput5Delay.Text = Helper.RemoveZeroNumberString(item.ExternalOutput5Delay);
+ this.labelExternalOutput5Operation.Text = Helper.RemoveZeroNumberString(item.ExternalOutput5Operation);
this.labelExternalOutput6Mode.Text = this.ReturnExternalOutputName(item.ExternalOutput6Mode);
- this.labelExternalOutput6Delay.Text = item.ExternalOutput6Delay;
- this.labelExternalOutput6Operation.Text = item.ExternalOutput6Operation;
+ this.labelExternalOutput6Delay.Text = Helper.RemoveZeroNumberString(item.ExternalOutput6Delay);
+ this.labelExternalOutput6Operation.Text = Helper.RemoveZeroNumberString(item.ExternalOutput6Operation);
#endregion
#region Auto zero
@@ -709,8 +709,8 @@ namespace ITC81DB_0H
this.labelIsAutoZeroUsing.Text = "OFF";
break;
}
- this.labelPlusRange.Text = item.AutoZeroPlusRange;
- this.labelMinusRange.Text = item.AutoZeroMinusRange;
+ this.labelPlusRange.Text = Helper.RemoveZeroNumberString(item.AutoZeroPlusRange);
+ this.labelMinusRange.Text = Helper.RemoveZeroNumberString(item.AutoZeroMinusRange);
temp = int.Parse(item.AutoZeroVariate);
switch (temp)
{
diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.Designer.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.Designer.cs
index 2d98c22..ab630fc 100644
--- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.Designer.cs
+++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.Designer.cs
@@ -75,7 +75,7 @@
this.labelOperatingMode = new SmartX.SmartLabel();
this.smartLabel33 = new SmartX.SmartLabel();
this.labelTitleOperatingMode = new SmartX.SmartLabel();
- this.groupBoxOPT2 = new SmartX.SmartGroupBox();
+ this.groupBoxBLDCMotor = new SmartX.SmartGroupBox();
this.smartSeparatorLine6 = new SmartX.SmartSeparatorLine();
this.smartSeparatorLine5 = new SmartX.SmartSeparatorLine();
this.smartSeparatorLine4 = new SmartX.SmartSeparatorLine();
@@ -116,6 +116,10 @@
this.labelPoleCount1 = new SmartX.SmartLabel();
this.labelTitlePoleCount1 = new SmartX.SmartLabel();
this.groupBoxEquipment = new SmartX.SmartGroupBox();
+ this.labelBLDCMotorCount = new SmartX.SmartLabel();
+ this.labelTitleBLDCMotorCount = new SmartX.SmartLabel();
+ this.labelBLDCUsing = new SmartX.SmartLabel();
+ this.labelTitleBLDCUsing = new SmartX.SmartLabel();
this.labelStatFormat = new SmartX.SmartLabel();
this.labelTitleStatFormat = new SmartX.SmartLabel();
this.labelFormat = new SmartX.SmartLabel();
@@ -134,14 +138,10 @@
this.labelTitleChattering = new SmartX.SmartLabel();
this.labelBuzzerOn = new SmartX.SmartLabel();
this.labelTitleBuzzerOn = new SmartX.SmartLabel();
- this.labelBLDCUsing = new SmartX.SmartLabel();
- this.labelTitleBLDCUsing = new SmartX.SmartLabel();
- this.labelBLDCMotorCount = new SmartX.SmartLabel();
- this.labelTitleBLDCMotorCount = new SmartX.SmartLabel();
this.smartGroupBox1.SuspendLayout();
this.groupBoxSerial.SuspendLayout();
this.groupBoxEthernet.SuspendLayout();
- this.groupBoxOPT2.SuspendLayout();
+ this.groupBoxBLDCMotor.SuspendLayout();
this.groupBoxEquipment.SuspendLayout();
this.SuspendLayout();
//
@@ -155,7 +155,7 @@
this.smartGroupBox1.Controls.Add(this.buttonLoad);
this.smartGroupBox1.Controls.Add(this.buttonPrevious);
this.smartGroupBox1.Controls.Add(this.groupBoxEthernet);
- this.smartGroupBox1.Controls.Add(this.groupBoxOPT2);
+ this.smartGroupBox1.Controls.Add(this.groupBoxBLDCMotor);
this.smartGroupBox1.Controls.Add(this.groupBoxEquipment);
this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198)))));
this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black;
@@ -198,7 +198,7 @@
this.groupBoxSerial.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
this.groupBoxSerial.Image = null;
this.groupBoxSerial.InitVisible = true;
- this.groupBoxSerial.Location = new System.Drawing.Point(389, 276);
+ this.groupBoxSerial.Location = new System.Drawing.Point(179, 277);
this.groupBoxSerial.Name = "groupBoxSerial";
this.groupBoxSerial.RoundRadius = 5;
this.groupBoxSerial.Size = new System.Drawing.Size(315, 128);
@@ -654,7 +654,7 @@
this.groupBoxEthernet.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
this.groupBoxEthernet.Image = null;
this.groupBoxEthernet.InitVisible = true;
- this.groupBoxEthernet.Location = new System.Drawing.Point(389, 3);
+ this.groupBoxEthernet.Location = new System.Drawing.Point(180, 6);
this.groupBoxEthernet.Name = "groupBoxEthernet";
this.groupBoxEthernet.RoundRadius = 5;
this.groupBoxEthernet.Size = new System.Drawing.Size(315, 267);
@@ -1169,64 +1169,64 @@
this.labelTitleOperatingMode.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleOperatingMode.Wordwrap = false;
//
- // groupBoxOPT2
+ // groupBoxBLDCMotor
//
- this.groupBoxOPT2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
- this.groupBoxOPT2.BackPictureBox = null;
- this.groupBoxOPT2.BackPictureBox1 = null;
- this.groupBoxOPT2.Controls.Add(this.smartSeparatorLine6);
- this.groupBoxOPT2.Controls.Add(this.smartSeparatorLine5);
- this.groupBoxOPT2.Controls.Add(this.smartSeparatorLine4);
- this.groupBoxOPT2.Controls.Add(this.smartLabel28);
- this.groupBoxOPT2.Controls.Add(this.labelSpeed4);
- this.groupBoxOPT2.Controls.Add(this.labelTitleSpeed4);
- this.groupBoxOPT2.Controls.Add(this.labelMotorDirection4);
- this.groupBoxOPT2.Controls.Add(this.labelReductionRatio4);
- this.groupBoxOPT2.Controls.Add(this.labelTitleMotorDirection4);
- this.groupBoxOPT2.Controls.Add(this.labelTitleReductionRatio4);
- this.groupBoxOPT2.Controls.Add(this.labelPoleCount4);
- this.groupBoxOPT2.Controls.Add(this.labelTitlePoleCount4);
- this.groupBoxOPT2.Controls.Add(this.smartLabel19);
- this.groupBoxOPT2.Controls.Add(this.labelSpeed3);
- this.groupBoxOPT2.Controls.Add(this.labelTitleSpeed3);
- this.groupBoxOPT2.Controls.Add(this.labelMotorDirection3);
- this.groupBoxOPT2.Controls.Add(this.labelReductionRatio3);
- this.groupBoxOPT2.Controls.Add(this.labelTitleMotorDirection3);
- this.groupBoxOPT2.Controls.Add(this.labelTitleReductionRatio3);
- this.groupBoxOPT2.Controls.Add(this.labelPoleCount3);
- this.groupBoxOPT2.Controls.Add(this.labelTitlePoleCount3);
- this.groupBoxOPT2.Controls.Add(this.smartLabel10);
- this.groupBoxOPT2.Controls.Add(this.labelSpeed2);
- this.groupBoxOPT2.Controls.Add(this.labelTitleSpeed2);
- this.groupBoxOPT2.Controls.Add(this.labelMotorDirection2);
- this.groupBoxOPT2.Controls.Add(this.labelReductionRatio2);
- this.groupBoxOPT2.Controls.Add(this.labelTitleMotorDirection2);
- this.groupBoxOPT2.Controls.Add(this.labelTitleReductionRatio2);
- this.groupBoxOPT2.Controls.Add(this.labelPoleCount2);
- this.groupBoxOPT2.Controls.Add(this.labelTitlePoleCount2);
- this.groupBoxOPT2.Controls.Add(this.smartLabel9);
- this.groupBoxOPT2.Controls.Add(this.labelSpeed1);
- this.groupBoxOPT2.Controls.Add(this.labelTitleSpeed1);
- this.groupBoxOPT2.Controls.Add(this.labelMotorDirection1);
- this.groupBoxOPT2.Controls.Add(this.labelReductionRatio1);
- this.groupBoxOPT2.Controls.Add(this.labelTitleMotorDirection1);
- this.groupBoxOPT2.Controls.Add(this.labelTitleReductionRatio1);
- this.groupBoxOPT2.Controls.Add(this.labelPoleCount1);
- this.groupBoxOPT2.Controls.Add(this.labelTitlePoleCount1);
- this.groupBoxOPT2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
- this.groupBoxOPT2.FrameLineColor1 = System.Drawing.Color.White;
- this.groupBoxOPT2.FrameLineColor2 = System.Drawing.Color.White;
- this.groupBoxOPT2.FrameLineThickness = 1;
- this.groupBoxOPT2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
- this.groupBoxOPT2.Image = null;
- this.groupBoxOPT2.InitVisible = true;
- this.groupBoxOPT2.Location = new System.Drawing.Point(181, 3);
- this.groupBoxOPT2.Name = "groupBoxOPT2";
- this.groupBoxOPT2.RoundRadius = 5;
- this.groupBoxOPT2.Size = new System.Drawing.Size(209, 401);
- this.groupBoxOPT2.TabIndex = 18;
- this.groupBoxOPT2.Text = "BLDC 모터";
- this.groupBoxOPT2.TextColor = System.Drawing.Color.White;
+ this.groupBoxBLDCMotor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+ this.groupBoxBLDCMotor.BackPictureBox = null;
+ this.groupBoxBLDCMotor.BackPictureBox1 = null;
+ this.groupBoxBLDCMotor.Controls.Add(this.smartSeparatorLine6);
+ this.groupBoxBLDCMotor.Controls.Add(this.smartSeparatorLine5);
+ this.groupBoxBLDCMotor.Controls.Add(this.smartSeparatorLine4);
+ this.groupBoxBLDCMotor.Controls.Add(this.smartLabel28);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelSpeed4);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleSpeed4);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelMotorDirection4);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelReductionRatio4);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleMotorDirection4);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleReductionRatio4);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelPoleCount4);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitlePoleCount4);
+ this.groupBoxBLDCMotor.Controls.Add(this.smartLabel19);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelSpeed3);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleSpeed3);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelMotorDirection3);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelReductionRatio3);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleMotorDirection3);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleReductionRatio3);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelPoleCount3);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitlePoleCount3);
+ this.groupBoxBLDCMotor.Controls.Add(this.smartLabel10);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelSpeed2);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleSpeed2);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelMotorDirection2);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelReductionRatio2);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleMotorDirection2);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleReductionRatio2);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelPoleCount2);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitlePoleCount2);
+ this.groupBoxBLDCMotor.Controls.Add(this.smartLabel9);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelSpeed1);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleSpeed1);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelMotorDirection1);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelReductionRatio1);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleMotorDirection1);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitleReductionRatio1);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelPoleCount1);
+ this.groupBoxBLDCMotor.Controls.Add(this.labelTitlePoleCount1);
+ this.groupBoxBLDCMotor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.groupBoxBLDCMotor.FrameLineColor1 = System.Drawing.Color.White;
+ this.groupBoxBLDCMotor.FrameLineColor2 = System.Drawing.Color.White;
+ this.groupBoxBLDCMotor.FrameLineThickness = 1;
+ this.groupBoxBLDCMotor.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle;
+ this.groupBoxBLDCMotor.Image = null;
+ this.groupBoxBLDCMotor.InitVisible = true;
+ this.groupBoxBLDCMotor.Location = new System.Drawing.Point(493, 5);
+ this.groupBoxBLDCMotor.Name = "groupBoxBLDCMotor";
+ this.groupBoxBLDCMotor.RoundRadius = 5;
+ this.groupBoxBLDCMotor.Size = new System.Drawing.Size(209, 401);
+ this.groupBoxBLDCMotor.TabIndex = 18;
+ this.groupBoxBLDCMotor.Text = "BLDC 모터";
+ this.groupBoxBLDCMotor.TextColor = System.Drawing.Color.White;
//
// smartSeparatorLine6
//
@@ -2071,6 +2071,90 @@
this.groupBoxEquipment.Text = "기능설정";
this.groupBoxEquipment.TextColor = System.Drawing.Color.White;
//
+ // labelBLDCMotorCount
+ //
+ this.labelBLDCMotorCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+ this.labelBLDCMotorCount.BackPictureBox = null;
+ this.labelBLDCMotorCount.BackPictureBox1 = null;
+ this.labelBLDCMotorCount.BackPictureBox2 = null;
+ this.labelBLDCMotorCount.BorderColor = System.Drawing.Color.Black;
+ this.labelBLDCMotorCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelBLDCMotorCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.labelBLDCMotorCount.ForeColor = System.Drawing.Color.White;
+ this.labelBLDCMotorCount.InitVisible = true;
+ this.labelBLDCMotorCount.LineSpacing = 0F;
+ this.labelBLDCMotorCount.Location = new System.Drawing.Point(96, 230);
+ this.labelBLDCMotorCount.Name = "labelBLDCMotorCount";
+ this.labelBLDCMotorCount.Size = new System.Drawing.Size(65, 15);
+ this.labelBLDCMotorCount.TabIndex = 51;
+ this.labelBLDCMotorCount.Text = "-";
+ this.labelBLDCMotorCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelBLDCMotorCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelBLDCMotorCount.Wordwrap = false;
+ //
+ // labelTitleBLDCMotorCount
+ //
+ this.labelTitleBLDCMotorCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+ this.labelTitleBLDCMotorCount.BackPictureBox = null;
+ this.labelTitleBLDCMotorCount.BackPictureBox1 = null;
+ this.labelTitleBLDCMotorCount.BackPictureBox2 = null;
+ this.labelTitleBLDCMotorCount.BorderColor = System.Drawing.Color.Black;
+ this.labelTitleBLDCMotorCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitleBLDCMotorCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.labelTitleBLDCMotorCount.ForeColor = System.Drawing.Color.White;
+ this.labelTitleBLDCMotorCount.InitVisible = true;
+ this.labelTitleBLDCMotorCount.LineSpacing = 0F;
+ this.labelTitleBLDCMotorCount.Location = new System.Drawing.Point(15, 230);
+ this.labelTitleBLDCMotorCount.Name = "labelTitleBLDCMotorCount";
+ this.labelTitleBLDCMotorCount.Size = new System.Drawing.Size(75, 15);
+ this.labelTitleBLDCMotorCount.TabIndex = 50;
+ this.labelTitleBLDCMotorCount.Text = "모터개수";
+ this.labelTitleBLDCMotorCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTitleBLDCMotorCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitleBLDCMotorCount.Wordwrap = false;
+ //
+ // labelBLDCUsing
+ //
+ this.labelBLDCUsing.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+ this.labelBLDCUsing.BackPictureBox = null;
+ this.labelBLDCUsing.BackPictureBox1 = null;
+ this.labelBLDCUsing.BackPictureBox2 = null;
+ this.labelBLDCUsing.BorderColor = System.Drawing.Color.Black;
+ this.labelBLDCUsing.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelBLDCUsing.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.labelBLDCUsing.ForeColor = System.Drawing.Color.White;
+ this.labelBLDCUsing.InitVisible = true;
+ this.labelBLDCUsing.LineSpacing = 0F;
+ this.labelBLDCUsing.Location = new System.Drawing.Point(96, 209);
+ this.labelBLDCUsing.Name = "labelBLDCUsing";
+ this.labelBLDCUsing.Size = new System.Drawing.Size(65, 15);
+ this.labelBLDCUsing.TabIndex = 49;
+ this.labelBLDCUsing.Text = "-";
+ this.labelBLDCUsing.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelBLDCUsing.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelBLDCUsing.Wordwrap = false;
+ //
+ // labelTitleBLDCUsing
+ //
+ this.labelTitleBLDCUsing.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+ this.labelTitleBLDCUsing.BackPictureBox = null;
+ this.labelTitleBLDCUsing.BackPictureBox1 = null;
+ this.labelTitleBLDCUsing.BackPictureBox2 = null;
+ this.labelTitleBLDCUsing.BorderColor = System.Drawing.Color.Black;
+ this.labelTitleBLDCUsing.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitleBLDCUsing.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
+ this.labelTitleBLDCUsing.ForeColor = System.Drawing.Color.White;
+ this.labelTitleBLDCUsing.InitVisible = true;
+ this.labelTitleBLDCUsing.LineSpacing = 0F;
+ this.labelTitleBLDCUsing.Location = new System.Drawing.Point(15, 209);
+ this.labelTitleBLDCUsing.Name = "labelTitleBLDCUsing";
+ this.labelTitleBLDCUsing.Size = new System.Drawing.Size(75, 15);
+ this.labelTitleBLDCUsing.TabIndex = 48;
+ this.labelTitleBLDCUsing.Text = "BLDC사용";
+ this.labelTitleBLDCUsing.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTitleBLDCUsing.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitleBLDCUsing.Wordwrap = false;
+ //
// labelStatFormat
//
this.labelStatFormat.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
@@ -2449,90 +2533,6 @@
this.labelTitleBuzzerOn.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleBuzzerOn.Wordwrap = false;
//
- // labelBLDCUsing
- //
- this.labelBLDCUsing.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
- this.labelBLDCUsing.BackPictureBox = null;
- this.labelBLDCUsing.BackPictureBox1 = null;
- this.labelBLDCUsing.BackPictureBox2 = null;
- this.labelBLDCUsing.BorderColor = System.Drawing.Color.Black;
- this.labelBLDCUsing.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelBLDCUsing.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
- this.labelBLDCUsing.ForeColor = System.Drawing.Color.White;
- this.labelBLDCUsing.InitVisible = true;
- this.labelBLDCUsing.LineSpacing = 0F;
- this.labelBLDCUsing.Location = new System.Drawing.Point(96, 209);
- this.labelBLDCUsing.Name = "labelBLDCUsing";
- this.labelBLDCUsing.Size = new System.Drawing.Size(65, 15);
- this.labelBLDCUsing.TabIndex = 49;
- this.labelBLDCUsing.Text = "-";
- this.labelBLDCUsing.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelBLDCUsing.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelBLDCUsing.Wordwrap = false;
- //
- // labelTitleBLDCUsing
- //
- this.labelTitleBLDCUsing.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
- this.labelTitleBLDCUsing.BackPictureBox = null;
- this.labelTitleBLDCUsing.BackPictureBox1 = null;
- this.labelTitleBLDCUsing.BackPictureBox2 = null;
- this.labelTitleBLDCUsing.BorderColor = System.Drawing.Color.Black;
- this.labelTitleBLDCUsing.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelTitleBLDCUsing.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
- this.labelTitleBLDCUsing.ForeColor = System.Drawing.Color.White;
- this.labelTitleBLDCUsing.InitVisible = true;
- this.labelTitleBLDCUsing.LineSpacing = 0F;
- this.labelTitleBLDCUsing.Location = new System.Drawing.Point(15, 209);
- this.labelTitleBLDCUsing.Name = "labelTitleBLDCUsing";
- this.labelTitleBLDCUsing.Size = new System.Drawing.Size(75, 15);
- this.labelTitleBLDCUsing.TabIndex = 48;
- this.labelTitleBLDCUsing.Text = "BLDC사용";
- this.labelTitleBLDCUsing.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelTitleBLDCUsing.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitleBLDCUsing.Wordwrap = false;
- //
- // labelBLDCMotorCount
- //
- this.labelBLDCMotorCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
- this.labelBLDCMotorCount.BackPictureBox = null;
- this.labelBLDCMotorCount.BackPictureBox1 = null;
- this.labelBLDCMotorCount.BackPictureBox2 = null;
- this.labelBLDCMotorCount.BorderColor = System.Drawing.Color.Black;
- this.labelBLDCMotorCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelBLDCMotorCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
- this.labelBLDCMotorCount.ForeColor = System.Drawing.Color.White;
- this.labelBLDCMotorCount.InitVisible = true;
- this.labelBLDCMotorCount.LineSpacing = 0F;
- this.labelBLDCMotorCount.Location = new System.Drawing.Point(96, 230);
- this.labelBLDCMotorCount.Name = "labelBLDCMotorCount";
- this.labelBLDCMotorCount.Size = new System.Drawing.Size(65, 15);
- this.labelBLDCMotorCount.TabIndex = 51;
- this.labelBLDCMotorCount.Text = "-";
- this.labelBLDCMotorCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelBLDCMotorCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelBLDCMotorCount.Wordwrap = false;
- //
- // labelTitleBLDCMotorCount
- //
- this.labelTitleBLDCMotorCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
- this.labelTitleBLDCMotorCount.BackPictureBox = null;
- this.labelTitleBLDCMotorCount.BackPictureBox1 = null;
- this.labelTitleBLDCMotorCount.BackPictureBox2 = null;
- this.labelTitleBLDCMotorCount.BorderColor = System.Drawing.Color.Black;
- this.labelTitleBLDCMotorCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelTitleBLDCMotorCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
- this.labelTitleBLDCMotorCount.ForeColor = System.Drawing.Color.White;
- this.labelTitleBLDCMotorCount.InitVisible = true;
- this.labelTitleBLDCMotorCount.LineSpacing = 0F;
- this.labelTitleBLDCMotorCount.Location = new System.Drawing.Point(15, 230);
- this.labelTitleBLDCMotorCount.Name = "labelTitleBLDCMotorCount";
- this.labelTitleBLDCMotorCount.Size = new System.Drawing.Size(75, 15);
- this.labelTitleBLDCMotorCount.TabIndex = 50;
- this.labelTitleBLDCMotorCount.Text = "모터개수";
- this.labelTitleBLDCMotorCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelTitleBLDCMotorCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitleBLDCMotorCount.Wordwrap = false;
- //
// ControlCenterInforSystem3
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -2543,7 +2543,7 @@
this.smartGroupBox1.ResumeLayout(false);
this.groupBoxSerial.ResumeLayout(false);
this.groupBoxEthernet.ResumeLayout(false);
- this.groupBoxOPT2.ResumeLayout(false);
+ this.groupBoxBLDCMotor.ResumeLayout(false);
this.groupBoxEquipment.ResumeLayout(false);
this.ResumeLayout(false);
@@ -2559,7 +2559,7 @@
private SmartX.SmartLabel labelTitleChattering;
private SmartX.SmartLabel labelBuzzerOn;
private SmartX.SmartLabel labelTitleBuzzerOn;
- private SmartX.SmartGroupBox groupBoxOPT2;
+ private SmartX.SmartGroupBox groupBoxBLDCMotor;
private SmartX.SmartGroupBox groupBoxEthernet;
private SmartX.SmartLabel smartLabel104;
private SmartX.SmartSeparatorLine smartSeparatorLine3;
diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.cs
index 657d443..143b286 100644
--- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.cs
+++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.cs
@@ -85,9 +85,9 @@ namespace ITC81DB_0H
}
private void DefaultSetting()
{
-
+ this.DisplayGroupBox();
}
-
+
private string ReturnBaudrateName(int num)
{
switch (num)
@@ -268,11 +268,11 @@ namespace ITC81DB_0H
}
private void CheckCompareBoardLCD9520Value(SystemInformation3 item)
{
- if (this.ParentForm.ParentForm.CurrentSystemParameter1.BuzzerOnTime != item.BuzzerONTime)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter1.BuzzerOnTime) != int.Parse(item.BuzzerONTime))
this.labelBuzzerOn.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter1.Chattering != item.Chattering)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter1.Chattering) != int.Parse(item.Chattering))
this.labelChattering.ForeColor = Color.Red;
- if (this.ParentForm.ParentForm.CurrentSystemParameter1.RelayOnTime != item.Relay)
+ if (int.Parse(this.ParentForm.ParentForm.CurrentSystemParameter1.RelayOnTime) != int.Parse(item.Relay))
this.labelRelay.ForeColor = Color.Red;
if (this.ParentForm.ParentForm.SystemConfig2.BLDCTotalMotorNum >= 1)
@@ -324,14 +324,21 @@ namespace ITC81DB_0H
}
}
+ public void DisplayGroupBox()
+ {
+ if (this.ParentForm.ParentForm.SystemConfig1.IsBLDCON == true)
+ this.groupBoxBLDCMotor.Visible = true;
+ else
+ this.groupBoxBLDCMotor.Visible = false;
+ }
public void UpdateParameter9520Display(SystemInformation3 item, SystemConfigurationItem1 system1, SystemConfigurationItem2 system2)
{
#region Equipment setting
this.labelEquipmentID.Text = system1.EquipmentID.ToString();
- this.labelBuzzerOn.Text = item.BuzzerONTime;
- this.labelChattering.Text = item.Chattering;
- this.labelRelay.Text = item.Relay;
+ this.labelBuzzerOn.Text = Helper.RemoveZeroNumberString(item.BuzzerONTime);
+ this.labelChattering.Text = Helper.RemoveZeroNumberString(item.Chattering);
+ this.labelRelay.Text = Helper.RemoveZeroNumberString(item.Relay);
this.labelLanguage.Text = system1.Language.ToString();
this.labelLogin.Text = this.ReturnBoolValue(system1.IsLogin);
this.labelExtension.Text = system2.FileNameExtension.ToString();
@@ -342,6 +349,7 @@ namespace ITC81DB_0H
#endregion
#region BLDC
+
this.labelSpeed1.Text = item.BLDCMotorSpeed1;
this.labelPoleCount1.Text = item.BLDCMotorPole1;
this.labelReductionRatio1.Text = item.BLDCMotorReductionRatio1;
diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs
index 34ced67..5d9f4ca 100644
--- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs
+++ b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs
@@ -392,7 +392,7 @@ namespace ITC81DB_0H.Controls
if (myKeyPad.ShowDialog() == DialogResult.OK)
{
- if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > Helper.StringToWeight("99999", this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces))
+ if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 700.0)
{
// 입력범위를 확인하세요
DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig1.Language);
@@ -404,7 +404,7 @@ namespace ITC81DB_0H.Controls
this.labelBalanceWeight.Text = myKeyPad.StringValue;
value = Helper.StringZeroFillDigits7(this.labelBalanceWeight.Text.Replace(".", ""));
- this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress.BalanceWeight, value);
+ this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.BalanceWeight, value);
}
}
}
diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemJudgmentManual.cs b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemJudgmentManual.cs
index f8b836a..02b6204 100644
--- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemJudgmentManual.cs
+++ b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemJudgmentManual.cs
@@ -305,6 +305,10 @@ namespace ITC81DB_0H.Controls
{
string value = "";
+ value = item.Filter.ToString();
+ if (this.labelFilter.Text != value)
+ this.labelFilter.Text = value;
+
value = item.DescendDelayTime.ToString();
if (this.labelDescendDelayTime.Text != value)
this.labelDescendDelayTime.Text = value;
@@ -416,8 +420,8 @@ namespace ITC81DB_0H.Controls
}
this.IsAutoMode(false);
- // Read Calibration Constant
- this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ReadConstant, "");
+ //// Read Calibration Constant
+ //this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ReadConstant, "");
}
#endregion
diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemAutoZero.cs b/ITC81DB_0H/Controls/Etc/ControlCenterSystemAutoZero.cs
similarity index 94%
rename from ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemAutoZero.cs
rename to ITC81DB_0H/Controls/Etc/ControlCenterSystemAutoZero.cs
index a9e0731..de699b5 100644
--- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemAutoZero.cs
+++ b/ITC81DB_0H/Controls/Etc/ControlCenterSystemAutoZero.cs
@@ -123,12 +123,17 @@ namespace ITC81DB_0H.Controls
#region Event Handler
private void buttonIsAutoZeroUsing_Click(object sender, EventArgs e)
{
+ string value = "";
+
if (this.buttonIsAutoZeroUsing.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroIsAutoZeroUsing = true;
else
this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroIsAutoZeroUsing = false;
this.ParentForm.ParentForm.SaveSystemParameter4File(this.ParentForm.ParentForm.CurrentSystemParameter4);
+
+ value = Helper.StringZeroFillDigits4(Convert.ToInt16(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroIsAutoZeroUsing));
+ this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.AutoZeroIsUsing, value);
}
private void labelPlusRange_Click(object sender, EventArgs e)
{
@@ -149,7 +154,7 @@ namespace ITC81DB_0H.Controls
this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroPlusRange = myKeyPad.StringValue.Replace(".","");
this.ParentForm.ParentForm.SaveSystemParameter4File(this.ParentForm.ParentForm.CurrentSystemParameter4);
- value = Helper.StringZeroFillDigits4(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroPlusRange);
+ value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroPlusRange);
this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.AutoZeroPlusRange, value);
}
}
@@ -173,7 +178,7 @@ namespace ITC81DB_0H.Controls
this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroMinusRange = myKeyPad.StringValue.Replace(".", "");
this.ParentForm.ParentForm.SaveSystemParameter4File(this.ParentForm.ParentForm.CurrentSystemParameter4);
- value = Helper.StringZeroFillDigits4(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroMinusRange);
+ value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentSystemParameter4.LCDAutoZeroMinusRange);
this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.AutoZeroMinusRange, value);
}
}
diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemAutoZero.designer.cs b/ITC81DB_0H/Controls/Etc/ControlCenterSystemAutoZero.designer.cs
similarity index 100%
rename from ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemAutoZero.designer.cs
rename to ITC81DB_0H/Controls/Etc/ControlCenterSystemAutoZero.designer.cs
diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemAutoZero.resx b/ITC81DB_0H/Controls/Etc/ControlCenterSystemAutoZero.resx
similarity index 100%
rename from ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemAutoZero.resx
rename to ITC81DB_0H/Controls/Etc/ControlCenterSystemAutoZero.resx
diff --git a/ITC81DB_0H/DataStore.cs b/ITC81DB_0H/DataStore.cs
index a62bf4d..9f96210 100644
--- a/ITC81DB_0H/DataStore.cs
+++ b/ITC81DB_0H/DataStore.cs
@@ -2291,6 +2291,7 @@ namespace ITC81DB_0H
private int m_BLDCTotalMotorNum;
+ private bool m_IsPingTimerUsing;
private bool m_IsEthernetPingTimer;
private int m_HitachiRoomNumberEthernet;
@@ -2531,6 +2532,11 @@ namespace ITC81DB_0H
set { this.m_FileNameExtension = value; }
}
+ public bool IsPingTimerUsing
+ {
+ get { return this.m_IsPingTimerUsing; }
+ set { this.m_IsPingTimerUsing = value; }
+ }
public bool IsEthernetPingTimer
{
get { return this.m_IsEthernetPingTimer; }
@@ -2755,6 +2761,7 @@ namespace ITC81DB_0H
this.IsBypassOnce = true;
this.IsCommunicationOption = false;
+ this.IsPingTimerUsing = true;
this.IsEthernetPingTimer = false;
this.ModbusTCPStartAddress = 10;
this.ModbusRTUStartAddressCOM1 = 10;
@@ -2777,7 +2784,7 @@ namespace ITC81DB_0H
public bool IsAlarm2BuzzerOn;
public bool IsAlarm2ExternalOutput;
- public bool DummyBool1;
+ public bool IsPingTimerUsing;
public bool IsCommunicationOption;
public bool IsBypassOnce;
public bool IsBypassDirectionPass;
diff --git a/ITC81DB_0H/DialogForms/DialogFormMessage.cs b/ITC81DB_0H/DialogForms/DialogFormMessage.cs
index 8891a3b..edc13c8 100644
--- a/ITC81DB_0H/DialogForms/DialogFormMessage.cs
+++ b/ITC81DB_0H/DialogForms/DialogFormMessage.cs
@@ -22,6 +22,26 @@ namespace ITC81DB_0H.DialogForms
{
InitializeComponent();
}
+ public DialogFormMessage(int code)
+ {
+ InitializeComponent();
+
+ this.labelErrorCode.Text = "";
+ this.labelMessage1.Text = "";
+ this.labelMessage2.Text = "";
+
+ switch (code)
+ {
+ case 1:
+ this.labelErrorCode.Text = "Error 00";
+ this.labelMessage1.Text = "오류 발생! 재부팅 해 주십시오";
+ this.labelMessage2.Text = "Warning! Please restart this equipment";
+ this.buttonOK.Visible = false;
+ break;
+ default:
+ break;
+ }
+ }
public DialogFormMessage(string str, DataStore.LanguageID language)
{
InitializeComponent();
diff --git a/ITC81DB_0H/Forms/FormMain.Designer.cs b/ITC81DB_0H/Forms/FormMain.Designer.cs
index 797cdd3..1107a3f 100644
--- a/ITC81DB_0H/Forms/FormMain.Designer.cs
+++ b/ITC81DB_0H/Forms/FormMain.Designer.cs
@@ -44,6 +44,7 @@
this.timeOut = new System.Windows.Forms.Timer();
this.smartTimerUpdate = new SmartX.SmartTimer(this.components);
this.timerEthernetPing = new System.Windows.Forms.Timer();
+ this.timerWaitResponse = new System.Windows.Forms.Timer();
((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit();
this.SuspendLayout();
//
@@ -190,9 +191,14 @@
//
// timerEthernetPing
//
- this.timerEthernetPing.Interval = 3000;
+ this.timerEthernetPing.Interval = 2000;
this.timerEthernetPing.Tick += new System.EventHandler(this.timerEthernetPing_Tick);
//
+ // timerWaitResponse
+ //
+ this.timerWaitResponse.Interval = 150;
+ this.timerWaitResponse.Tick += new System.EventHandler(this.timerWaitResponse_Tick);
+ //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -224,6 +230,7 @@
private System.Windows.Forms.Timer timeOut;
private SmartX.SmartTimer smartTimerUpdate;
private System.Windows.Forms.Timer timerEthernetPing;
+ private System.Windows.Forms.Timer timerWaitResponse;
}
}
diff --git a/ITC81DB_0H/Forms/FormMain.cs b/ITC81DB_0H/Forms/FormMain.cs
index 37f3c33..79da726 100644
--- a/ITC81DB_0H/Forms/FormMain.cs
+++ b/ITC81DB_0H/Forms/FormMain.cs
@@ -43,6 +43,14 @@ namespace ITC81DB_0H.Forms
public int UpdateValue; // Modbus - Update 될 때마다 +1
public bool IsOPCModbusUsing;
+ private int PingFalseCount;
+ private byte[] ClientSendDatabyteArray;
+ private string ClientSendDataString;
+ private int PingTrueCount;
+ private int ResponseFailCount;
+ private bool IsTimerPingEnableTrue;
+ private bool IsTimerWaitResponseEnableTrue;
+
#region 통신관련
// OPT2
private SerialOPT2 CurrentOPT2COM1;
@@ -181,6 +189,10 @@ namespace ITC81DB_0H.Forms
private delegate void TextStatusCallback(string strtext);
private delegate void UIControlCallback(bool bEnable);
private delegate void UIServerStatusCallback(bool bEnable);
+
+ // Ethernet Connect단 Thread 처리
+ ThreadStart ThreadDelegate;
+ Thread ThreadEthernetPing;
#endregion
#region Constructor
@@ -273,6 +285,32 @@ namespace ITC81DB_0H.Forms
#endregion
#region Method
+ public static void Exception(Exception ex)
+ {
+ try
+ {
+ string fileName = "SD Card\\DataBackup\\" + string.Format("{0:yyyyMMdd_HHmmss}_Exception.txt", DateTime.Now);
+ FileStream fs = new FileStream(fileName, FileMode.OpenOrCreate);
+ StreamWriter sw = new StreamWriter(fs);
+
+ sw.Write(ex.ToString());
+
+ sw.Close();
+ fs.Close();
+ }
+ catch
+ {
+ string fileName = "Flash Disk\\" + string.Format("{0:yyyyMMdd_HHmmss}_Exception.txt", DateTime.Now);
+ FileStream fs = new FileStream(fileName, FileMode.OpenOrCreate);
+ StreamWriter sw = new StreamWriter(fs);
+
+ sw.Write(ex.ToString());
+
+ sw.Close();
+ fs.Close();
+ }
+ }
+
private void DefaultSetting1()
{
this.IsCommunicationLogOpen = false;
@@ -298,6 +336,14 @@ namespace ITC81DB_0H.Forms
this.UpdateValue = 0;
this.IsOPCModbusUsing = false;
+ this.PingFalseCount = 0;
+ this.PingTrueCount = 0;
+ this.ResponseFailCount = 0;
+ this.IsTimerPingEnableTrue = false;
+ this.IsTimerWaitResponseEnableTrue = false;
+
+ this.ThreadDelegate = new ThreadStart(this.EthernetPing);
+
this.Modbus = new Modbus();
this.Current30000ModbusData = new _30000_ModbusData();
this.Current40000ModbusData = new _40000_ModbusData();
@@ -464,6 +510,9 @@ namespace ITC81DB_0H.Forms
{
if (string.Compare(this.smartConfigs.IPSettings.DeviceIP, "0.0.0.0") != 0)
this.EthernetServerStart();
+
+ if (this.SystemConfig2.EthernetOperationMode == 1 && this.smartTCPMultiServer.IsStart == true)
+ this.ChildFormMainDisplay.TimerDetectConnected(true);
}
catch
{
@@ -1286,8 +1335,8 @@ namespace ITC81DB_0H.Forms
#region Test 용 통신 로그
fullPath = this.PathDataBackupFolder + "Communicationlog.txt";
this.smartFileCommunicationLog.FilePathName = fullPath;
- //this.smartFileCommunicationLog.Open();
- //this.IsCommunicationLogOpen = true;
+ this.smartFileCommunicationLog.Open();
+ this.IsCommunicationLogOpen = true;
#endregion
#region Error Check 용 통신 로그
@@ -2202,6 +2251,19 @@ namespace ITC81DB_0H.Forms
break;
case "3901":
break;
+ case "4907":
+ #region Value Assign
+ this.CurrentSystemParameter4.MainAutoZeroIsAutoZeroUsing = Convert.ToBoolean(int.Parse(receiveData.Substring(0, 4)));
+ this.CurrentSystemParameter4.MainAutoZeroPlusRange = receiveData.Substring(4, 7).Trim();
+ this.CurrentSystemParameter4.MainAutoZeroMinusRange = receiveData.Substring(11, 7).Trim();
+ this.CurrentSystemParameter4.MainAutoZeroVariate = receiveData.Substring(18, 4).Trim();
+ #endregion
+ if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemAutoZero)
+ {
+ if (this.ChildFormMenu.CenterSystemAutoZero != null)
+ this.ChildFormMenu.CenterSystemAutoZero.UpdateZeroParameterDisplay(this.CurrentSystemParameter4);
+ }
+ break;
case "5057":
#region Value Assign
this.SensorDetectingTime = int.Parse(receiveData.Substring(0, 4).Trim());
@@ -2465,19 +2527,6 @@ namespace ITC81DB_0H.Forms
}
#endregion
break;
- case "4907":
- #region Value Assign
- this.CurrentSystemParameter4.MainAutoZeroIsAutoZeroUsing = bool.Parse(receiveData.Substring(0, 4).Trim());
- this.CurrentSystemParameter4.MainAutoZeroPlusRange = receiveData.Substring(4, 7).Trim();
- this.CurrentSystemParameter4.MainAutoZeroMinusRange = receiveData.Substring(11, 7).Trim();
- this.CurrentSystemParameter4.MainAutoZeroVariate = receiveData.Substring(18, 4).Trim();
- #endregion
- if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemAutoZero)
- {
- if (this.ChildFormMenu.CenterSystemAutoZero != null)
- this.ChildFormMenu.CenterSystemAutoZero.UpdateZeroParameterDisplay(this.CurrentSystemParameter4);
- }
- break;
case "9006":
if (response == DataStore.ResponseData.ACK)
this.TransferProductParameter(this.SystemConfig1.ProductNumber);
@@ -2762,6 +2811,14 @@ namespace ITC81DB_0H.Forms
this.TransferSerialCOM1(this.SendChar(DataStore.CharValue.ACK)); // ACK
}
break;
+ case (int)DataStore.SerialMode.f22_Modbus_RTU: // Modbus RTU(Master 사용 시 - Write multiple register)
+ if (this.SystemConfig2.ModbusRTUSelectFunction == (int)DataStore.ModbusFunction._16_WriteMultipleRegister)
+ {
+ byte[] sendData = this.Modbus.MakeRTUSendAllData(this.Transfer_22_Modbus_Write(), this.SystemConfig2.ModbusRTUSlaveIDCOM1, this.SystemConfig2.ModbusRTUStartAddressCOM1);
+
+ this.TransferSerialCOM1(sendData);
+ }
+ break;
case (int)DataStore.SerialMode.f23_STD2:
this.TransferSerialCOM1(this.Transfer_23_STD2(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem));
break;
@@ -2857,6 +2914,14 @@ namespace ITC81DB_0H.Forms
this.TransferSerialCOM3(this.SendChar(DataStore.CharValue.ACK)); // ACK
}
break;
+ case (int)DataStore.SerialMode.f22_Modbus_RTU: // Modbus RTU(Master 사용 시 - Write multiple register)
+ if (this.SystemConfig2.ModbusRTUSelectFunction == (int)DataStore.ModbusFunction._16_WriteMultipleRegister)
+ {
+ byte[] sendData = this.Modbus.MakeRTUSendAllData(this.Transfer_22_Modbus_Write(), this.SystemConfig2.ModbusRTUSlaveIDCOM3, this.SystemConfig2.ModbusRTUStartAddressCOM3);
+
+ this.TransferSerialCOM3(sendData);
+ }
+ break;
case (int)DataStore.SerialMode.f23_STD2:
this.TransferSerialCOM3(this.Transfer_23_STD2(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem));
break;
@@ -2952,6 +3017,14 @@ namespace ITC81DB_0H.Forms
this.TransferSerialCOM4(this.SendChar(DataStore.CharValue.ACK)); // ACK
}
break;
+ case (int)DataStore.SerialMode.f22_Modbus_RTU: // Modbus RTU(Master 사용 시 - Write multiple register)
+ if (this.SystemConfig2.ModbusRTUSelectFunction == (int)DataStore.ModbusFunction._16_WriteMultipleRegister)
+ {
+ byte[] sendData = this.Modbus.MakeRTUSendAllData(this.Transfer_22_Modbus_Write(), this.SystemConfig2.ModbusRTUSlaveIDCOM4, this.SystemConfig2.ModbusRTUStartAddressCOM4);
+
+ this.TransferSerialCOM4(sendData);
+ }
+ break;
case (int)DataStore.SerialMode.f23_STD2:
this.TransferSerialCOM4(this.Transfer_23_STD2(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem));
break;
@@ -3056,6 +3129,14 @@ namespace ITC81DB_0H.Forms
this.EthernetServerSendMessage(client, this.SendChar(DataStore.CharValue.ACK)); // ACK
}
break;
+ case (int)DataStore.EthernetMode.f22_Modbus_TCP: // 22, Modbus TCP
+ if (this.SystemConfig2.ModbusTCPSelectFunction == (int)DataStore.ModbusFunction._16_WriteMultipleRegister)
+ {
+ byte[] sendData = this.Modbus.MakeTCPSendAllData(this.Transfer_22_Modbus_Write(), this.SystemConfig2.ModbusTCPStartAddress);
+
+ this.EthernetServerSendMessage(client, sendData);
+ }
+ break;
case (int)DataStore.EthernetMode.f23_STD2:
this.EthernetServerSendMessage(client,
this.Transfer_23_STD2(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem));
@@ -3075,14 +3156,19 @@ namespace ITC81DB_0H.Forms
switch (this.SystemConfig2.EthernetCommMode)
{
case 1:
- this.EthernetWeightData(this.Transfer_1_STD1(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem));
+ this.ClientSendDataString = this.Transfer_1_STD1(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
case 2:
- this.EthernetWeightData(this.Transfer_2_Remote(this.CurrentWeightData, this.CurrentProductItem));
+ this.ClientSendDataString = this.Transfer_2_Remote(this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
case 3:
if (this.SystemConfig1.IsPrintPerProductEnable == true)
- this.EthernetWeightData(this.Transfer_3_Print(this.CurrentWeightData, this.CurrentProductItem));
+ {
+ this.ClientSendDataString = this.Transfer_3_Print(this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDataString);
+ }
break;
case 4:
if (this.CurrentWeightData.JudgmentStatus == DataStore.JudgmentStatus.Pass)
@@ -3102,34 +3188,44 @@ namespace ITC81DB_0H.Forms
break;
case 5:
this.HMCOM1_Step = 1;
- this.EthernetWeightData(this.SendChar(DataStore.CharValue.ENQ));
+ this.ClientSendDataString = this.SendChar(DataStore.CharValue.ENQ);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
case 6:
- this.EthernetWeightData(this.Transfer_6_OPT0(this.CurrentWeightData));
+ this.ClientSendDataString = this.Transfer_6_OPT0(this.CurrentWeightData);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
case 7:
- this.EthernetWeightData(this.Transfer_7_imaje9410OPT2(this.CurrentWeightData));
+ this.ClientSendDatabyteArray = this.Transfer_7_imaje9410OPT2(this.CurrentWeightData);
+ this.EthernetWeightData(this.ClientSendDatabyteArray);
break;
case 8:
- this.EthernetWeightData(this.Transfer_8_imaje9028OPT2(this.CurrentWeightData));
+ this.ClientSendDatabyteArray = this.Transfer_8_imaje9028OPT2(this.CurrentWeightData);
+ this.EthernetWeightData(this.ClientSendDatabyteArray);
break;
case 9:
- this.EthernetWeightData(this.Transfer_9_Hitachi(this.CurrentWeightData, DataStore.SerialCOM.COM1));
+ this.ClientSendDataString = this.Transfer_9_Hitachi(this.CurrentWeightData, DataStore.SerialCOM.COM1);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
case 10:
- this.EthernetWeightData(this.Transfer_10_MACSA(this.CurrentWeightData, this.CurrentProductItem));
+ this.ClientSendDatabyteArray = this.Transfer_10_MACSA(this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDatabyteArray);
break;
case 11:
- this.EthernetWeightData(this.Transfer_11_Markoprint(this.CurrentWeightData, this.CurrentProductItem));
+ this.ClientSendDatabyteArray = this.Transfer_11_Markoprint(this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDatabyteArray);
break;
case 12:
- this.EthernetWeightData(this.Transfer_12_alphaJET(this.CurrentWeightData, this.CurrentProductItem));
+ this.ClientSendDatabyteArray = this.Transfer_12_alphaJET(this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDatabyteArray);
break;
case 13:
- this.EthernetWeightData(this.Transfer_13_Marking_VJ1510(this.CurrentWeightData));
+ this.ClientSendDataString = this.Transfer_13_Marking_VJ1510(this.CurrentWeightData);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
case 17:
- this.EthernetWeightData(this.Transfer_17_OPT3(this.CurrentWeightData, this.CurrentProductItem));
+ this.ClientSendDataString = this.Transfer_17_OPT3(this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
case 18:
this.EthernetWeightData(this.Transfer_18_HP200(this.CurrentWeightData, 1));
@@ -3137,7 +3233,10 @@ namespace ITC81DB_0H.Forms
break;
case 19:
if (this.CurrentWeightData.JudgmentStatus == DataStore.JudgmentStatus.Pass)
- this.EthernetWeightData(this.Transfer_19_SmartJet(this.CurrentWeightData));
+ {
+ this.ClientSendDataString = this.Transfer_19_SmartJet(this.CurrentWeightData);
+ this.EthernetWeightData(this.ClientSendDataString);
+ }
break;
case 20:
if (this.CurrentWeightData.JudgmentStatus == DataStore.JudgmentStatus.Pass)
@@ -3155,8 +3254,17 @@ namespace ITC81DB_0H.Forms
this.EthernetWeightData(this.SendChar(DataStore.CharValue.ACK)); // ACK
}
break;
+ case (int)DataStore.EthernetMode.f22_Modbus_TCP: // 22, Modbus TCP
+ if (this.SystemConfig2.ModbusTCPSelectFunction == (int)DataStore.ModbusFunction._16_WriteMultipleRegister)
+ {
+ this.ClientSendDatabyteArray = this.Modbus.MakeTCPSendAllData(this.Transfer_22_Modbus_Write(), this.SystemConfig2.ModbusTCPStartAddress);
+
+ this.EthernetWeightDataForModbus(this.ClientSendDatabyteArray);
+ }
+ break;
case (int)DataStore.EthernetMode.f23_STD2:
- this.EthernetWeightData(this.Transfer_23_STD2(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem));
+ this.ClientSendDataString = this.Transfer_23_STD2(this.SystemConfig1, this.CurrentWeightData, this.CurrentProductItem);
+ this.EthernetWeightData(this.ClientSendDataString);
break;
default:
break;
@@ -7689,14 +7797,63 @@ namespace ITC81DB_0H.Forms
#endregion
#region Ethernet
- public void IsUsingTimerEthernetPing(bool bValue)
+ public void ThreadCloseClientIP(string address)
{
- if (this.SystemConfig2.IsEthernetPingTimer == true)
+ this.smartTCPMultiServer.CloseClientIP(address);
+ }
+ public void TimerPingEnabled(int interval, bool bValue)
+ {
+ if (this.SystemConfig2.IsPingTimerUsing == false)
+ return;
+
+ if (bValue == true)
{
- this.timerEthernetPing.Enabled = bValue;
+ if (this.IsTimerPingEnableTrue == false)
+ {
+ this.timerEthernetPing.Enabled = false;
+ this.timerEthernetPing.Interval = interval;
+ if (this.PingFalseCount > 0)
+ this.PingFalseCount = 0;
+ this.timerEthernetPing.Enabled = true;
+
+ this.IsTimerPingEnableTrue = true;
+ }
}
else
+ {
+ this.TimerPingDisabled();
+ }
+ }
+ public void TimerPingDisabled()
+ {
+ if (this.SystemConfig2.IsPingTimerUsing == false)
+ return;
+
+ if (this.IsTimerPingEnableTrue == true)
+ {
this.timerEthernetPing.Enabled = false;
+ this.IsTimerPingEnableTrue = false;
+ }
+ }
+ public void TimerWaitResponseEnabled(bool bValue)
+ {
+ if (this.SystemConfig2.IsPingTimerUsing == false)
+ return;
+
+ if (bValue == true)
+ {
+ if (this.IsTimerWaitResponseEnableTrue == false)
+ {
+ this.timerWaitResponse.Enabled = false;
+ this.timerWaitResponse.Enabled = true;
+ this.IsTimerWaitResponseEnableTrue = true;
+ }
+ }
+ else
+ {
+ this.timerWaitResponse.Enabled = false;
+ this.IsTimerWaitResponseEnableTrue = false;
+ }
}
#region Client
@@ -7723,8 +7880,6 @@ namespace ITC81DB_0H.Forms
cpClientThread.IsBackground = true;
cpClientThread.Start();
-
- this.IsUsingTimerEthernetPing(true);
}
catch
{
@@ -7733,8 +7888,6 @@ namespace ITC81DB_0H.Forms
}
public void EthernetClientDisconnect()
{
- this.IsUsingTimerEthernetPing(false);
-
this.IsEthernetThreadStop = true;
this.DelegateUISeverStatus(false);
if (null != this.EthernetStmReader)
@@ -7748,6 +7901,9 @@ namespace ITC81DB_0H.Forms
if (null != this.EthernetTcpClient)
this.EthernetTcpClient.Close();
+
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client ({0:yyyy-MM-dd HH:mm:ss}): Disconnect", DateTime.Now));
}
private void EthernetClientReceiveThread()
@@ -7784,6 +7940,15 @@ namespace ITC81DB_0H.Forms
{
string strRecvMsg = this.EthernetStmReader.ReadLine();
+ this.TimerWaitResponseEnabled(false);
+ this.TimerPingDisabled();
+
+ if (this.ResponseFailCount > 0)
+ this.ResponseFailCount = 0;
+
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strRecvMsg));
+
if (null == strRecvMsg)
{
this.DelegateTextStatusOut(">Server Out");
@@ -7823,7 +7988,7 @@ namespace ITC81DB_0H.Forms
{
this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(status);
}
- private void DelegateUISeverStatus(bool status)
+ public void DelegateUISeverStatus(bool status)
{
this.Invoke(new UIServerStatusCallback(this.UIServerStatus), status);
}
@@ -7897,7 +8062,10 @@ namespace ITC81DB_0H.Forms
if (this.IsEthernetThreadStop == true)
this.EthernetClientConnect();
else
+ {
this.EthernetSendMessage((string)this.EthernetTransferData);
+ this.TimerWaitResponseEnabled(true);
+ }
}
public void EthernetWeightData(byte[] bytes)
{
@@ -7907,7 +8075,10 @@ namespace ITC81DB_0H.Forms
if (this.IsEthernetThreadStop == true)
this.EthernetClientConnect();
else
+ {
this.EthernetSendMessage((byte[])this.EthernetTransferData);
+ this.TimerWaitResponseEnabled(true);
+ }
}
public void EthernetWeightData(byte temp)
{
@@ -7917,7 +8088,23 @@ namespace ITC81DB_0H.Forms
if (this.IsEthernetThreadStop == true)
this.EthernetClientConnect();
else
+ {
this.EthernetSendMessage((byte)this.EthernetTransferData);
+ this.TimerWaitResponseEnabled(true);
+ }
+ }
+ public void EthernetWeightDataForModbus(byte[] bytes)
+ {
+ this.IsEthernetTransferData = true;
+ this.EthernetTransferData = bytes;
+
+ if (this.IsEthernetThreadStop == true)
+ this.EthernetClientConnect();
+ else
+ {
+ this.EthernetSendMessage(bytes);
+ this.TimerWaitResponseEnabled(true);
+ }
}
#endregion
@@ -7926,7 +8113,6 @@ namespace ITC81DB_0H.Forms
{
if (this.smartTCPMultiServer.IsStart == false)
{
- this.IsUsingTimerEthernetPing(true);
this.ChildFormMenu.CenterConfiEthernet.DisplayLabelLocalPort(false);
this.smartTCPMultiServer.Port = this.SystemConfig2.EthernetLocalPort;
this.smartTCPMultiServer.Start();
@@ -7936,7 +8122,6 @@ namespace ITC81DB_0H.Forms
{
if (this.smartTCPMultiServer.IsStart == true)
{
- this.IsUsingTimerEthernetPing(false);
this.ChildFormMenu.CenterConfiEthernet.DisplayLabelLocalPort(true);
this.smartTCPMultiServer.Stop();
}
@@ -8445,7 +8630,7 @@ namespace ITC81DB_0H.Forms
structItem.IsAlarm2BuzzerOn = this.SystemConfig2.IsCountingOutput2BuzzerOn;
structItem.IsAlarm2ExternalOutput = this.SystemConfig2.IsCountingOutput2ExternalOutput;
- structItem.DummyBool1 = false;
+ structItem.IsPingTimerUsing = this.SystemConfig2.IsPingTimerUsing;
structItem.IsCommunicationOption = this.SystemConfig2.IsCommunicationOption;
structItem.IsBypassOnce = this.SystemConfig2.IsBypassOnce;
structItem.IsBypassDirectionPass = this.SystemConfig2.IsBypassDirectionPass;
@@ -8470,10 +8655,10 @@ namespace ITC81DB_0H.Forms
structItem.DummyInt2 = 0;
structItem.DummyInt3 = 0;
structItem.DummyInt4 = 0;
- structItem.ModbusTCPStartAddress = 0;
- structItem.ModbusRTUStartAddressCOM1 = 0;
- structItem.ModbusRTUStartAddressCOM3 = 0;
- structItem.ModbusRTUStartAddressCOM4 = 0;
+ structItem.ModbusTCPStartAddress = this.SystemConfig2.ModbusTCPStartAddress;
+ structItem.ModbusRTUStartAddressCOM1 = this.SystemConfig2.ModbusRTUStartAddressCOM1;
+ structItem.ModbusRTUStartAddressCOM3 = this.SystemConfig2.ModbusRTUStartAddressCOM3;
+ structItem.ModbusRTUStartAddressCOM4 = this.SystemConfig2.ModbusRTUStartAddressCOM4;
structItem.ModbusTCPSelectFunction = this.SystemConfig2.ModbusTCPSelectFunction;
structItem.BLDCTotalMotorNum = this.SystemConfig2.BLDCTotalMotorNum;
structItem.ModbusRTUSelectFunction = this.SystemConfig2.ModbusRTUSelectFunction;
@@ -8550,7 +8735,7 @@ namespace ITC81DB_0H.Forms
structItem.IsAlarm2BuzzerOn = item.IsCountingOutput2BuzzerOn;
structItem.IsAlarm2ExternalOutput = item.IsCountingOutput2ExternalOutput;
- structItem.DummyBool1 = false;
+ structItem.IsPingTimerUsing = item.IsPingTimerUsing;
structItem.IsCommunicationOption = item.IsCommunicationOption;
structItem.IsBypassOnce = item.IsBypassOnce;
structItem.IsBypassDirectionPass = item.IsBypassDirectionPass;
@@ -8575,10 +8760,10 @@ namespace ITC81DB_0H.Forms
structItem.DummyInt2 = 0;
structItem.DummyInt3 = 0;
structItem.DummyInt4 = 0;
- structItem.ModbusTCPStartAddress = 0;
- structItem.ModbusRTUStartAddressCOM1 = 0;
- structItem.ModbusRTUStartAddressCOM3 = 0;
- structItem.ModbusRTUStartAddressCOM4 = 0;
+ structItem.ModbusTCPStartAddress = item.ModbusTCPStartAddress;
+ structItem.ModbusRTUStartAddressCOM1 = item.ModbusRTUStartAddressCOM1;
+ structItem.ModbusRTUStartAddressCOM3 = item.ModbusRTUStartAddressCOM3;
+ structItem.ModbusRTUStartAddressCOM4 = item.ModbusRTUStartAddressCOM4;
structItem.ModbusTCPSelectFunction = item.ModbusTCPSelectFunction;
structItem.BLDCTotalMotorNum = item.BLDCTotalMotorNum;
structItem.ModbusRTUSelectFunction = item.ModbusRTUSelectFunction;
@@ -8691,6 +8876,7 @@ namespace ITC81DB_0H.Forms
this.SystemConfig2.Barcode = structItem.Barcode;
this.SystemConfig2.FileNameExtension = structItem.FileNameExtension;
+ this.SystemConfig2.IsPingTimerUsing = structItem.IsPingTimerUsing;
this.SystemConfig2.EthernetPort = structItem.EthernetPort;
this.SystemConfig2.EthernetCommMode = structItem.EthernetCommMode;
@@ -8708,6 +8894,11 @@ namespace ITC81DB_0H.Forms
this.SystemConfig2.ModbusRTUSlaveIDCOM3 = structItem.ModbusRTUSlaveIDCOM3;
this.SystemConfig2.ModbusRTUSlaveIDCOM4 = structItem.ModbusRTUSlaveIDCOM4;
+ this.SystemConfig2.ModbusRTUStartAddressCOM1 = structItem.ModbusRTUStartAddressCOM1;
+ this.SystemConfig2.ModbusRTUStartAddressCOM3 = structItem.ModbusRTUStartAddressCOM3;
+ this.SystemConfig2.ModbusRTUStartAddressCOM4 = structItem.ModbusRTUStartAddressCOM4;
+ this.SystemConfig2.ModbusTCPStartAddress = structItem.ModbusTCPStartAddress;
+
this.SystemConfig2.ConveyorLength = structItem.ConveyorLength;
this.SystemConfig2.SortingPointLength = structItem.SortingPointLength;
this.SystemConfig2.BLDCTotalMotorNum = structItem.BLDCTotalMotorNum;
@@ -9295,7 +9486,7 @@ namespace ITC81DB_0H.Forms
this.LoadSystemParameter4File(ref sItem);
- sb.Append(Helper.StringZeroFillDigits4(sItem.LCDAutoZeroIsAutoZeroUsing.ToString())); // 자동영점사용여부(4)
+ sb.Append(Helper.StringZeroFillDigits4(Convert.ToInt16(sItem.LCDAutoZeroIsAutoZeroUsing).ToString())); // 자동영점사용여부(4)
sb.Append(Helper.StringZeroFillDigits7(sItem.LCDAutoZeroPlusRange)); // 자동영점+범위(7)
sb.Append(Helper.StringZeroFillDigits7(sItem.LCDAutoZeroMinusRange)); // 자동영점-범위(7)
sb.Append(Helper.StringZeroFillDigits4(sItem.LCDAutoZeroVariate)); // 자동영점변량(4)
@@ -11863,6 +12054,101 @@ namespace ITC81DB_0H.Forms
this.smartFileIO.Close();
}
#endregion
+
+ #region Thread
+ private void EthernetPing()
+ {
+ bool disconnect = false;
+ string address = "";
+
+ try
+ {
+ CIPSetting.PINGRESULTINFO pingResultInfo = new CIPSetting.PINGRESULTINFO();
+ if (this.SystemConfig2.EthernetOperationMode == 1) // 중량선별기 : Server
+ {
+ #region Server
+ address = this.smartTCPMultiServer.ClientInfoList[0].strIPAddress;
+ bool bValue = this.smartConfigs.IPSettings.PingIP(address, ref pingResultInfo);
+ if (bValue == false)
+ {
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("EthernetPing 'Server' ({0:yyyy-MM-dd HH:mm:ss}): {1}_Count {2}", DateTime.Now, bValue.ToString(), this.PingFalseCount.ToString()));
+
+ if (this.PingFalseCount >= 2)
+ {
+ this.PingFalseCount = 0;
+
+ if (address != "")
+ disconnect = this.smartTCPMultiServer.CloseClientIP(address);
+
+ this.DelegateUISeverStatus(false);
+ this.ChildFormMenu.CenterConfiEthernet.DelegateConnectedIPStatusOut("-");
+ }
+ else
+ {
+ this.PingFalseCount++;
+ }
+ }
+ else
+ this.PingFalseCount = 0;
+ #endregion
+ }
+ else // 중량선별기 : Client
+ {
+ #region Client
+ bool bValue = this.smartConfigs.IPSettings.PingIP(this.SystemConfig2.EthernetAddress, ref pingResultInfo);
+ if (bValue == true)
+ {
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("EthernetPing 'Client' ({0:yyyy-MM-dd HH:mm:ss}): {1}_Count {2}", DateTime.Now, bValue.ToString(), this.PingTrueCount.ToString()));
+
+ if (this.PingTrueCount >= 2)
+ {
+ this.TimerPingDisabled();
+ this.EthernetClientConnect();
+ this.PingTrueCount = 0;
+ }
+ else
+ {
+ this.PingTrueCount++;
+ }
+ }
+ else
+ {
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("EthernetPing 'Client' ({0:yyyy-MM-dd HH:mm:ss}): Ping False", DateTime.Now));
+
+ this.DelegateUISeverStatus(false);
+ this.ChildFormMenu.CenterConfiEthernet.DelegateConnectedIPStatusOut("-");
+
+ this.PingTrueCount = 0;
+ }
+ #endregion
+ }
+ }
+ catch
+ {
+ #region Catch
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("EthernetPing ({0:yyyy-MM-dd HH:mm:ss}): Catch", DateTime.Now));
+
+ this.DelegateUISeverStatus(false);
+ this.ChildFormMenu.CenterConfiEthernet.DelegateConnectedIPStatusOut("-");
+
+ if (this.SystemConfig2.EthernetOperationMode == 1) // 중량선별기 : Server
+ this.TimerPingDisabled();
+ else // 중량선별기 : Client
+ this.EthernetClientDisconnect();
+ #endregion
+ }
+
+ this.ThreadEthernetPing.Join();
+ }
+ #endregion
#endregion
#region Override Member
@@ -13251,85 +13537,34 @@ namespace ITC81DB_0H.Forms
this.CollectionBufferWeightData.Clear();
}
}
+ private void timerWaitResponse_Tick(object sender, EventArgs e)
+ {
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Respons fail ({0:yyyy-MM-dd HH:mm:ss}): Count_{1}", DateTime.Now, this.ResponseFailCount));
+
+ if (this.ResponseFailCount >= 2)
+ {
+ this.ResponseFailCount = 0;
+ this.TimerWaitResponseEnabled(false);
+ this.EthernetClientDisconnect();
+ this.TimerPingEnabled(1000, true);
+ }
+ else
+ {
+ this.ResponseFailCount++;
+
+ if (this.SystemConfig2.EthernetCommMode == (int)DataStore.EthernetMode.f22_Modbus_TCP)
+ this.EthernetWeightDataForModbus(this.ClientSendDatabyteArray);
+ else
+ this.EthernetWeightData(this.ClientSendDataString);
+ }
+ }
private void timerEthernetPing_Tick(object sender, EventArgs e)
{
- try
- {
- CIPSetting.PINGRESULTINFO pingResultInfo = new CIPSetting.PINGRESULTINFO();
- if (this.SystemConfig2.EthernetOperationMode == 1) // 중량선별기 : Server
- {
- try
- {
- //if (string.IsNullOrEmpty(this.smartTCPMultiServer.ClientInfoList[0].strIPAddress))
- //{
- // if (this.IsCommunicationLogOpen == true)
- // {
- // this.smartFileCommunicationLog.WriteString(string.Format("Connection ({0:yyyy-MM-dd HH:mm:ss}): null ", DateTime.Now));
- // this.smartFileCommunicationLog.WriteString(string.Format("ClientInfoList ({0:yyyy-MM-dd HH:mm:ss}): {1}_{2}", DateTime.Now, this.smartTCPMultiServer.ClientInfoList[0].strIPAddress));
- // }
-
- // return;
- //}
-
- //if (this.IsCommunicationLogOpen == true)
- // this.smartFileCommunicationLog.WriteString(string.Format("ClientInfoList ({0:yyyy-MM-dd HH:mm:ss}): {1}_{2}", DateTime.Now, this.smartTCPMultiServer.ClientInfoList[0].strIPAddress));
- bool bValue = this.smartConfigs.IPSettings.PingIP(this.smartTCPMultiServer.ClientInfoList[0].strIPAddress, ref pingResultInfo);
- if (bValue == false)
- {
- this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(false);
- this.ChildFormMenu.CenterConfiEthernet.DelegateConnectedIPStatusOut("-");
- bool disconnect = this.smartTCPMultiServer.CloseClientIP(this.smartTCPMultiServer.ClientInfoList[0].strIPAddress);
-
- // 로그
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("CloseClientIP ({0:yyyy-MM-dd HH:mm:ss}): {1}_{2}", DateTime.Now, disconnect.ToString()));
-
- this.EthernetServerStart();
- }
-
- // 로그
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Connection ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, bValue.ToString()));
- }
- catch
- {
- this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(false);
- this.ChildFormMenu.CenterConfiEthernet.DelegateConnectedIPStatusOut("-");
-
- // 로그
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Error ({0:yyyy-MM-dd HH:mm:ss}): Catch", DateTime.Now));
- }
- }
- else // 중량선별기 : Client
- {
- try
- {
- if (this.smartConfigs.IPSettings.PingIP(this.SystemConfig2.EthernetAddress, ref pingResultInfo) == false)
- {
- this.EthernetClientDisconnect();
- this.EthernetClientConnect();
- }
- }
- catch
- {
- this.DelegateUISeverStatus(false);
- this.ChildFormMenu.CenterConfiEthernet.DelegateConnectedIPStatusOut("-");
- }
- }
- }
- catch
- {
- if (this.SystemConfig2.EthernetOperationMode == 1) // 중량선별기 : Server
- {
- this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(false);
- }
- else // 중량선별기 : Client
- {
- this.DelegateUISeverStatus(false);
- this.EthernetClientDisconnect();
- }
- }
+ this.ThreadEthernetPing = new Thread(this.ThreadDelegate);
+ this.ThreadEthernetPing.Priority = ThreadPriority.Highest;
+ this.ThreadEthernetPing.Start();
}
// 전송지연시간 관련
diff --git a/ITC81DB_0H/Forms/FormMain.resx b/ITC81DB_0H/Forms/FormMain.resx
index edce1dc..2b054c5 100644
--- a/ITC81DB_0H/Forms/FormMain.resx
+++ b/ITC81DB_0H/Forms/FormMain.resx
@@ -159,6 +159,9 @@
399, 58
+
+ 580, 59
+
WEBPAD
diff --git a/ITC81DB_0H/Forms/FormMainDisplay.Designer.cs b/ITC81DB_0H/Forms/FormMainDisplay.Designer.cs
index 2192d65..d89d35d 100644
--- a/ITC81DB_0H/Forms/FormMainDisplay.Designer.cs
+++ b/ITC81DB_0H/Forms/FormMainDisplay.Designer.cs
@@ -56,14 +56,14 @@
this.labelUserLevel = new SmartX.SmartLabel();
this.labelUserID = new SmartX.SmartLabel();
this.panel1 = new System.Windows.Forms.Panel();
+ this.buttonModbus = new SmartX.SmartButton();
this.buttonFeedback = new SmartX.SmartButton();
this.labelBarcode = new SmartX.SmartLabel();
this.buttonMemory = new System.Windows.Forms.Button();
this.labelSorterAlarm = new SmartX.SmartLabel();
- this.timerServer = new System.Windows.Forms.Timer();
+ this.timerClientConnectCheck = new System.Windows.Forms.Timer();
this.buttonConveyorUpDown = new SmartX.SmartButton();
this.buttonHiddenMenu = new SmartX.SmartButton();
- this.buttonModbus = new SmartX.SmartButton();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -632,6 +632,38 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(710, 65);
//
+ // buttonModbus
+ //
+ this.buttonModbus.BackPictureBox = null;
+ this.buttonModbus.BackPictureBox1 = null;
+ this.buttonModbus.BackPictureBox2 = null;
+ this.buttonModbus.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonModbus.ButtonImageAutoSize = true;
+ this.buttonModbus.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonModbus.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonModbus.DisableImage")));
+ this.buttonModbus.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonModbus.DownImage")));
+ this.buttonModbus.GroupID = 0;
+ this.buttonModbus.InitVisible = true;
+ this.buttonModbus.Location = new System.Drawing.Point(456, 0);
+ this.buttonModbus.Mode = SmartX.SmartButton.BUTTONMODE.RADIO;
+ this.buttonModbus.Name = "buttonModbus";
+ this.buttonModbus.NestedClickEventPrevent = false;
+ this.buttonModbus.OutlinePixel = 1;
+ this.buttonModbus.RepeatInterval = 200;
+ this.buttonModbus.RepeatIntervalAccelerate = null;
+ this.buttonModbus.SafeInterval = 200;
+ this.buttonModbus.Size = new System.Drawing.Size(65, 65);
+ this.buttonModbus.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonModbus.TabIndex = 553;
+ this.buttonModbus.TextColor = System.Drawing.Color.Black;
+ this.buttonModbus.TextDownColor = System.Drawing.Color.White;
+ this.buttonModbus.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonModbus.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonModbus.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonModbus.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonModbus.UpImage")));
+ this.buttonModbus.Visible = false;
+ this.buttonModbus.Click += new System.EventHandler(this.buttonModbus_Click);
+ //
// buttonFeedback
//
this.buttonFeedback.BackPictureBox = null;
@@ -718,10 +750,10 @@
this.labelSorterAlarm.Wordwrap = false;
this.labelSorterAlarm.Click += new System.EventHandler(this.labelSorterAlarm_Click);
//
- // timerServer
+ // timerClientConnectCheck
//
- this.timerServer.Interval = 1000;
- this.timerServer.Tick += new System.EventHandler(this.timerServer_Tick);
+ this.timerClientConnectCheck.Interval = 1000;
+ this.timerClientConnectCheck.Tick += new System.EventHandler(this.timerClientConnectCheck_Tick);
//
// buttonConveyorUpDown
//
@@ -787,38 +819,6 @@
this.buttonHiddenMenu.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonHiddenMenu.UpImage")));
this.buttonHiddenMenu.Click += new System.EventHandler(this.buttonHiddenMenu_Click);
//
- // buttonModbus
- //
- this.buttonModbus.BackPictureBox = null;
- this.buttonModbus.BackPictureBox1 = null;
- this.buttonModbus.BackPictureBox2 = null;
- this.buttonModbus.ButtonColor = System.Drawing.Color.Gray;
- this.buttonModbus.ButtonImageAutoSize = true;
- this.buttonModbus.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonModbus.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonModbus.DisableImage")));
- this.buttonModbus.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonModbus.DownImage")));
- this.buttonModbus.GroupID = 0;
- this.buttonModbus.InitVisible = true;
- this.buttonModbus.Location = new System.Drawing.Point(456, 0);
- this.buttonModbus.Mode = SmartX.SmartButton.BUTTONMODE.RADIO;
- this.buttonModbus.Name = "buttonModbus";
- this.buttonModbus.NestedClickEventPrevent = false;
- this.buttonModbus.OutlinePixel = 1;
- this.buttonModbus.RepeatInterval = 200;
- this.buttonModbus.RepeatIntervalAccelerate = null;
- this.buttonModbus.SafeInterval = 200;
- this.buttonModbus.Size = new System.Drawing.Size(65, 65);
- this.buttonModbus.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.buttonModbus.TabIndex = 553;
- this.buttonModbus.TextColor = System.Drawing.Color.Black;
- this.buttonModbus.TextDownColor = System.Drawing.Color.White;
- this.buttonModbus.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.buttonModbus.TextLocation = new System.Drawing.Point(0, 0);
- this.buttonModbus.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.buttonModbus.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonModbus.UpImage")));
- this.buttonModbus.Visible = false;
- this.buttonModbus.Click += new System.EventHandler(this.buttonModbus_Click);
- //
// FormMainDisplay
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -888,7 +888,7 @@
private SmartX.SmartLabel labelSorterAlarm;
public SmartX.SmartLabel labelBarcode;
private System.Windows.Forms.Button buttonMemory;
- public System.Windows.Forms.Timer timerServer;
+ public System.Windows.Forms.Timer timerClientConnectCheck;
private SmartX.SmartButton buttonFeedback;
private SmartX.SmartButton buttonConveyorUpDown;
private SmartX.SmartButton buttonHiddenMenu;
diff --git a/ITC81DB_0H/Forms/FormMainDisplay.cs b/ITC81DB_0H/Forms/FormMainDisplay.cs
index 97552c4..5d8ac32 100644
--- a/ITC81DB_0H/Forms/FormMainDisplay.cs
+++ b/ITC81DB_0H/Forms/FormMainDisplay.cs
@@ -21,6 +21,10 @@ namespace ITC81DB_0H.Forms
#region Field
private FormMain m_ParentForm;
+ // Ethernet Connect단 Thread 처리
+ ThreadStart ThreadDelegate;
+ Thread ThreadClientConnected;
+
private DataStore.MainDisplayStore CurrentDisplay;
public ControlMainDisplayWeightBigScreen MainDisplayWeightBigScreen;
@@ -219,6 +223,8 @@ namespace ITC81DB_0H.Forms
this.MainDisplayAlarm.Visible = false;
this.MainDisplayAlarm.BringToFront();
+ this.ThreadDelegate = new ThreadStart(this.ClientConnectCheck);
+
this.buttonPrint.Visible = this.ParentForm.SystemConfig1.IsPrinterEnable;
if (this.ParentForm.SystemConfig1.IsPrintPerProductEnable == true)
this.buttonPrint.ButtonDown();
@@ -386,6 +392,18 @@ namespace ITC81DB_0H.Forms
this.ParentForm.TransferData(CommunicationCommand.Clear, CommunicationID.SubBoard1);
}
+ public void TimerDetectConnected(bool bValue)
+ {
+ if (bValue == true)
+ {
+ this.timerClientConnectCheck.Enabled = false;
+ this.timerClientConnectCheck.Enabled = true;
+ }
+ else
+ {
+ this.timerClientConnectCheck.Enabled = false;
+ }
+ }
private void UpdateDisplayUser(SystemStatus status)
{
string id = "", group = "";
@@ -674,6 +692,17 @@ namespace ITC81DB_0H.Forms
this.MainDisplayWeightBigScreen.UpdateEthernetStatusDisplay(status);
if (this.MainDisplayWeightSmall != null)
this.MainDisplayWeightSmall.UpdateEthernetStatusDisplay(status);
+
+ if (status == true)
+ {
+ if (this.ParentForm.SystemConfig2.EthernetOperationMode == 1) // 중량선별기 : Server
+ this.ParentForm.TimerPingEnabled(2000, true);
+ }
+ else
+ {
+ if (this.ParentForm.SystemConfig2.EthernetOperationMode == 1) // 중량선별기 : Server
+ this.ParentForm.TimerPingDisabled();
+ }
}
public void UpdateModbusScreen()
@@ -840,13 +869,13 @@ namespace ITC81DB_0H.Forms
{
if (value == false)
{
- if (this.timerServer.Enabled == true)
- this.timerServer.Enabled = false;
+ if (this.timerClientConnectCheck.Enabled == true)
+ this.timerClientConnectCheck.Enabled = false;
}
else
{
- if (this.timerServer.Enabled == false)
- this.timerServer.Enabled = true;
+ if (this.timerClientConnectCheck.Enabled == false)
+ this.timerClientConnectCheck.Enabled = true;
}
}
@@ -983,19 +1012,43 @@ namespace ITC81DB_0H.Forms
//this.buttonPrint.Enabled = true;
//this.buttonClear.Enabled = true;
}
- private void timerServer_Tick(object sender, EventArgs e)
+
+ private void ClientConnectCheck()
{
- if (this.ParentForm.smartTCPMultiServer.IsStart == true)
+ try
{
- if (this.ParentForm.smartTCPMultiServer.ClientInfoList == null)
+ if (this.ParentForm.smartTCPMultiServer.IsStart == true)
{
- this.UpdateEthernetStatusDisplay(false);
- }
- else
- {
- this.UpdateEthernetStatusDisplay(true);
+ if (this.ParentForm.smartTCPMultiServer.ClientInfoList == null)
+ {
+ this.ParentForm.DelegateUISeverStatus(false);
+
+ // 로그
+ if (this.ParentForm.IsCommunicationLogOpen == true)
+ this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("ClientConnectCheck ({0:yyyy-MM-dd HH:mm:ss}): false", DateTime.Now));
+ }
+ else
+ {
+ this.ParentForm.DelegateUISeverStatus(true);
+
+ // 로그
+ if (this.ParentForm.IsCommunicationLogOpen == true)
+ this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("ClientConnectCheck ({0:yyyy-MM-dd HH:mm:ss}): true", DateTime.Now));
+ }
+
+ this.ThreadClientConnected.Join();
}
}
+ catch (Exception ex)
+ {
+ FormMain.Exception(ex);
+ }
+ }
+ private void timerClientConnectCheck_Tick(object sender, EventArgs e)
+ {
+ this.ThreadClientConnected = new Thread(this.ThreadDelegate);
+ this.ThreadClientConnected.Priority = ThreadPriority.Highest;
+ this.ThreadClientConnected.Start();
}
private void pictureBoxIconAlarm_Click(object sender, EventArgs e)
diff --git a/ITC81DB_0H/Forms/FormMainDisplay.resx b/ITC81DB_0H/Forms/FormMainDisplay.resx
index 7cb783f..2b42ac2 100644
--- a/ITC81DB_0H/Forms/FormMainDisplay.resx
+++ b/ITC81DB_0H/Forms/FormMainDisplay.resx
@@ -2864,7 +2864,7 @@
wqhHmSz4xPunNhp82YSoJxHsUIp3UyPasLewEBtJ+gszpFSZ4+UzBQAAAABJRU5ErkJggg==
-
+
277, 17
\ No newline at end of file
diff --git a/ITC81DB_0H/Forms/FormMenu.cs b/ITC81DB_0H/Forms/FormMenu.cs
index 5b32c69..00b408e 100644
--- a/ITC81DB_0H/Forms/FormMenu.cs
+++ b/ITC81DB_0H/Forms/FormMenu.cs
@@ -611,8 +611,15 @@ namespace ITC81DB_0H.Forms
this.CenterEquipFunctionSetting.DisplayHiddenMenu(true);
break;
case DataStore.DisplayStore.InforSystem:
- if (int.Parse(systemConfig1.MainBoardVersion) >= 200)
- this.CenterInforSystem.DisplayHiddenMenu(true);
+ string temp = systemConfig1.MainBoardVersion.Replace(".", "");
+ try
+ {
+ if (int.Parse(temp) >= 20000)
+ this.CenterInforSystem.DisplayHiddenMenu(true);
+ }
+ catch
+ {
+ }
break;
case DataStore.DisplayStore.EquipHelp:
DialogFormPasswordKeyPad password = new DialogFormPasswordKeyPad(8, this.ParentForm.SystemConfig1.Language, this.ParentForm.CurrentSystemStatus.CurrentUserPasswordType);
diff --git a/ITC81DB_0H/Helper.cs b/ITC81DB_0H/Helper.cs
index 5b67f58..752770b 100644
--- a/ITC81DB_0H/Helper.cs
+++ b/ITC81DB_0H/Helper.cs
@@ -7,6 +7,21 @@ namespace ITC81DB_0H
{
public class Helper
{
+ public static string RemoveZeroNumberString(string value)
+ {
+ string ret = "";
+ try
+ {
+ ret = (int.Parse(value)).ToString();
+ }
+ catch
+ {
+ ret = value;
+ }
+
+ return ret;
+ }
+
///
/// Double형을 String형으로 변환하여 리턴(소수점 자릿수에 마춰 0을 채워서 리턴)
///
diff --git a/ITC81DB_0H/ITC81DB_2H.csproj b/ITC81DB_0H/ITC81DB_2H.csproj
index decf669..ba05c8a 100644
--- a/ITC81DB_0H/ITC81DB_2H.csproj
+++ b/ITC81DB_0H/ITC81DB_2H.csproj
@@ -90,10 +90,10 @@
ControlCenterInforSystem2.cs
-
+
UserControl
-
+
ControlCenterSystemAutoZero.cs
@@ -590,7 +590,7 @@
ControlCenterInforSystem2.cs
Designer
-
+
ControlCenterSystemAutoZero.cs
Designer
diff --git a/ITC81DB_0H/Program.cs b/ITC81DB_0H/Program.cs
index 8c5a491..c73950d 100644
--- a/ITC81DB_0H/Program.cs
+++ b/ITC81DB_0H/Program.cs
@@ -6,6 +6,7 @@ using System.Text;
using System.Windows.Forms;
using ITC81DB_0H.Forms;
+using ITC81DB_0H.DialogForms;
namespace ITC81DB_0H
{
@@ -23,31 +24,10 @@ namespace ITC81DB_0H
}
catch (Exception ex)
{
- bool fileCheck = false, directoryCheck = false;
- string fullFilePath = "", message = "";
- StreamWriter sw;
+ FormMain.Exception(ex);
- DateTime time = DateTime.Now;
-
- fullFilePath = string.Format("SD Card\\DataBackup\\{0:yyyyMMdd_HHmmss}.txt", time);
- message = ex.ToString();
-
- DirectoryInfo di = new DirectoryInfo("SD Card\\DataBackup\\");
- directoryCheck = di.Exists;
- // 폴더 체크
- if (directoryCheck == false)
- di.Create();
-
- FileInfo fileInfo = new FileInfo(fullFilePath);
- fileCheck = fileInfo.Exists;
-
- sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
- sw.WriteLine(time.ToString("yyyy-MM-dd HH:mm:ss"));
- sw.Write(message);
- sw.WriteLine();
- sw.Close();
-
- MessageBox.Show(message);
+ DialogFormMessage myMsg = new DialogFormMessage(1);
+ myMsg.ShowDialog();
}
}
}
diff --git a/ITC81DB_0H/bin/Release/ITC81DB_2H.exe b/ITC81DB_0H/bin/Release/ITC81DB_2H.exe
index 880ff91..ec92786 100644
Binary files a/ITC81DB_0H/bin/Release/ITC81DB_2H.exe and b/ITC81DB_0H/bin/Release/ITC81DB_2H.exe differ
diff --git a/ITC81DB_0H/obj/Release/ITC81DB_2H.exe b/ITC81DB_0H/obj/Release/ITC81DB_2H.exe
index 880ff91..ec92786 100644
Binary files a/ITC81DB_0H/obj/Release/ITC81DB_2H.exe and b/ITC81DB_0H/obj/Release/ITC81DB_2H.exe differ