- 외부입력 항목 통일 - NG, START, STOP

- 이더넷 통신 Server - Local Port 변경 후 재부팅하면 저장 안되는 버그 수정
   SystemConfig2 - EthernetLocalPort 추가

ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiEthernet.cs

@@ -207,7 +207,7 @@ namespace ITC81DB_0H.Controls
             this.labelHostIP4.Text = sValue[3];
 
             this.labelHostPort.Text = this.ParentForm.ParentForm.SystemConfig2.EthernetPort.ToString();
-            this.labelLocalPort.Text = this.ParentForm.ParentForm.smartTCPMultiServer.Port.ToString();
+            this.labelLocalPort.Text = this.ParentForm.ParentForm.SystemConfig2.EthernetLocalPort.ToString();
 
             this.ChangeCommunicationMode();
 
@@ -334,6 +334,19 @@ namespace ITC81DB_0H.Controls
             //else if (this.comboBoxSerialMode.SelectedIndex == 5)   // User Define
             //    this.labelFormat.Text = "User Define";
         }
+        public void DisplayLabelLocalPort(bool bValue)
+        {
+            if (bValue == false)
+            {
+                this.labelLocalPort.Enabled = false;
+                this.labelLocalPort.BackColor = Color.Silver;
+            }
+            else
+            {
+                this.labelLocalPort.Enabled = true;
+                this.labelLocalPort.BackColor = Color.White;
+            }
+        }
 
         private void ControlVisible(bool visible)
         {
@@ -427,6 +440,7 @@ namespace ITC81DB_0H.Controls
                 this.labelClientStatus.Text = "-";
                 this.labelConnectedIP.Text = "-";
             }
+            this.labelLocalPort.Text = this.ParentForm.ParentForm.SystemConfig2.EthernetLocalPort.ToString();
 
             this.buttonSave.Enabled = false;
         }
@@ -984,6 +998,8 @@ namespace ITC81DB_0H.Controls
             if (myKeyPad.ShowDialog() == DialogResult.OK)
             {
                 this.labelLocalPort.Text = myKeyPad.StringValue;
+                this.ParentForm.ParentForm.SystemConfig2.EthernetLocalPort = myKeyPad.IntValue;
+                this.ParentForm.ParentForm.SaveSystemConfigurationFile2(this.ParentForm.ParentForm.SystemConfig2);
                 this.ParentForm.ParentForm.smartTCPMultiServer.Port = myKeyPad.IntValue;
             }
         }
@@ -1065,6 +1081,7 @@ namespace ITC81DB_0H.Controls
                 msg.ShowDialog();
 
                 this.labelLocalPort.Text = "502";
+                this.ParentForm.ParentForm.SystemConfig2.EthernetLocalPort = 502;
                 this.ParentForm.ParentForm.smartTCPMultiServer.Port = 502;
                 this.comboBoxEthernetOpMode.SelectedIndex = 1;
             }

ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.cs

@@ -363,19 +363,19 @@ namespace ITC81DB_0H.Controls
                             this.labelMessage1.Font = new Font("새굴림", 17, FontStyle.Regular);
                             this.labelMessage1.Text = "USB를 본체에 삽입 하십시오";
                             this.labelMessage2.Font = new Font("새굴림", 17, FontStyle.Regular);
-                            this.labelMessage2.Text = "삽입 후 하단 'Update'버튼을 눌러주십시오";
+                            this.labelMessage2.Text = "업데이트 할 항목을 선택해 주십시오";
                             break;
                         case DataStore.LanguageID.English:
                             this.labelMessage1.Font = new Font("새굴림", 17, FontStyle.Regular);
                             this.labelMessage1.Text = "Please insert usb into the device";
                             this.labelMessage2.Font = new Font("새굴림", 17, FontStyle.Regular);
-                            this.labelMessage2.Text = "Press the bottom button after inserting";
+                            this.labelMessage2.Text = "Please select an item to update";
                             break;
                         case DataStore.LanguageID.Chinese:
                             this.labelMessage1.Font = new Font("새굴림", 17, FontStyle.Regular);
-                            this.labelMessage1.Text = "请点击下端的按钮更新按钮";
+                            this.labelMessage1.Text = "请将usb插入设备中。";
                             this.labelMessage2.Font = new Font("새굴림", 17, FontStyle.Regular);
-                            this.labelMessage2.Text = "";
+                            this.labelMessage2.Text = "请选择一个项目来更新";
                             break;
                         case DataStore.LanguageID.German:
                             this.labelMessage1.Font = new Font("새굴림", 12, FontStyle.Regular);

ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs

@@ -66,7 +66,7 @@ namespace ITC81DB_0H.Controls
         private void DefaultSetting()
         {
             this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig1.SerialNumber;
-            this.labelDisplayVer.Text = "1.0.6";
+            this.labelDisplayVer.Text = "1.0.8";
         }
 
         public void UpdateMainBoardVersionDisplay(string version)

ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem3.cs

@@ -545,7 +545,7 @@ namespace ITC81DB_0H
             this.labelIPAddress.Text = this.ParentForm.ParentForm.smartConfigs.IPSettings.DeviceIP;
             this.labelSubnetMask.Text = this.ParentForm.ParentForm.smartConfigs.IPSettings.SubNetMask;
             this.labelGateWay.Text = this.ParentForm.ParentForm.smartConfigs.IPSettings.GateWay;
-            this.labelServerPort.Text = this.ParentForm.ParentForm.smartTCPMultiServer.Port.ToString();
+            this.labelServerPort.Text = this.ParentForm.ParentForm.SystemConfig2.EthernetLocalPort.ToString();
             this.labelClientServerIP.Text = this.ParentForm.ParentForm.SystemConfig2.EthernetAddress;
             this.labelClientServerPort.Text = this.ParentForm.ParentForm.SystemConfig2.EthernetPort.ToString();
             #endregion

ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs

@@ -258,7 +258,7 @@ namespace ITC81DB_0H.Controls
                     }
                     else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Russian)
                     {
-                        this.listBoxHelp.AddItem("Утановите весы");
+                        this.listBoxHelp.AddItem("Утаноите весы");
                     }
                     else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German)
                     {

ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayWeightBigScreen.Designer.cs

@@ -185,6 +185,7 @@
             this.pictureBoxIconExternalOperationEnable.Location = new System.Drawing.Point(145, 3);
             this.pictureBoxIconExternalOperationEnable.Name = "pictureBoxIconExternalOperationEnable";
             this.pictureBoxIconExternalOperationEnable.Size = new System.Drawing.Size(30, 25);
+            this.pictureBoxIconExternalOperationEnable.Visible = false;
             // 
             // pictureBoxDispenserEnable
             // 
@@ -277,6 +278,7 @@
             this.pictureBoxDoorCheckEnable.Location = new System.Drawing.Point(367, 3);
             this.pictureBoxDoorCheckEnable.Name = "pictureBoxDoorCheckEnable";
             this.pictureBoxDoorCheckEnable.Size = new System.Drawing.Size(30, 25);
+            this.pictureBoxDoorCheckEnable.Visible = false;
             // 
             // pictureBoxDoorCheckDisable
             // 
@@ -291,6 +293,7 @@
             this.pictureBoxDischargeEnable.Location = new System.Drawing.Point(337, 3);
             this.pictureBoxDischargeEnable.Name = "pictureBoxDischargeEnable";
             this.pictureBoxDischargeEnable.Size = new System.Drawing.Size(24, 25);
+            this.pictureBoxDischargeEnable.Visible = false;
             // 
             // pictureBoxDischargeDisable
             // 
@@ -305,6 +308,7 @@
             this.pictureBoxAirCheckEnable.Location = new System.Drawing.Point(307, 3);
             this.pictureBoxAirCheckEnable.Name = "pictureBoxAirCheckEnable";
             this.pictureBoxAirCheckEnable.Size = new System.Drawing.Size(24, 25);
+            this.pictureBoxAirCheckEnable.Visible = false;
             // 
             // pictureBoxAirCheckDisable
             // 

ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayWeightBigScreen.cs

@@ -185,62 +185,7 @@ namespace ITC81DB_0H
             //    this.pictureBoxStopWeighingEnable.Visible = true;
             //}
 
-            // PI2 - 0:미사용, 1:NG, 2:외부운전, 3:공압센서, 4:문열림감지, 5:배출확인
+            // 0:미사용, 1:NG, 2:START, 3:STOP
-            // PI3 - 0:미사용, 1:STOP, 2:외부운전, 3:공압센서, 4:문열림감지, 5:배출확인
-            // PI4 - 0:미사용, 1:START, 2:외부운전, 3:공압센서, 4:문열림감지, 5:배출확인
-            // PI5 - 0:미사용, 1:외부운전, 2:공압센서, 3:문열림감지, 4:배출확인
-            // PI6 - 0:미사용, 1:외부운전, 2:공압센서, 3:문열림감지, 4:배출확인
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 2 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 == 2
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 2 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 1
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 1)
-            {
-                this.pictureBoxIconExternalOperationDisable.Visible = false;
-                this.pictureBoxIconExternalOperationEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxIconExternalOperationDisable.Visible = true;
-                this.pictureBoxIconExternalOperationEnable.Visible = false;
-            }
-
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 3 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 ==3
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 3 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 2
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 2)
-            {
-                this.pictureBoxAirCheckDisable.Visible = false;
-                this.pictureBoxAirCheckEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxAirCheckDisable.Visible = true;
-                this.pictureBoxAirCheckEnable.Visible = false;
-            }
-
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 4 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 == 4
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 4 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 3
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 3)
-            {
-                this.pictureBoxDoorCheckDisable.Visible = false;
-                this.pictureBoxDoorCheckEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxDoorCheckDisable.Visible = true;
-                this.pictureBoxDoorCheckEnable.Visible = false;
-            }
-
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 5 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 == 5
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 5 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 4
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 4)
-            {
-                this.pictureBoxDischargeDisable.Visible = false;
-                this.pictureBoxDischargeEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxDischargeDisable.Visible = true;
-                this.pictureBoxDischargeEnable.Visible = false;
-            }
 
             // 바코드
             if (this.ParentForm.ParentForm.SystemConfig1.IsBarcodeEnable == true)

ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayWeightSmall.Designer.cs

@@ -125,6 +125,7 @@
             this.pictureBoxDoorCheckEnable.Location = new System.Drawing.Point(367, 3);
             this.pictureBoxDoorCheckEnable.Name = "pictureBoxDoorCheckEnable";
             this.pictureBoxDoorCheckEnable.Size = new System.Drawing.Size(30, 25);
+            this.pictureBoxDoorCheckEnable.Visible = false;
             // 
             // pictureBoxDoorCheckDisable
             // 
@@ -139,6 +140,7 @@
             this.pictureBoxDischargeEnable.Location = new System.Drawing.Point(337, 3);
             this.pictureBoxDischargeEnable.Name = "pictureBoxDischargeEnable";
             this.pictureBoxDischargeEnable.Size = new System.Drawing.Size(24, 25);
+            this.pictureBoxDischargeEnable.Visible = false;
             // 
             // pictureBoxDischargeDisable
             // 
@@ -153,6 +155,7 @@
             this.pictureBoxAirCheckEnable.Location = new System.Drawing.Point(307, 3);
             this.pictureBoxAirCheckEnable.Name = "pictureBoxAirCheckEnable";
             this.pictureBoxAirCheckEnable.Size = new System.Drawing.Size(24, 25);
+            this.pictureBoxAirCheckEnable.Visible = false;
             // 
             // pictureBoxAirCheckDisable
             // 
@@ -262,6 +265,7 @@
             this.pictureBoxIconExternalOperationEnable.Location = new System.Drawing.Point(145, 3);
             this.pictureBoxIconExternalOperationEnable.Name = "pictureBoxIconExternalOperationEnable";
             this.pictureBoxIconExternalOperationEnable.Size = new System.Drawing.Size(30, 25);
+            this.pictureBoxIconExternalOperationEnable.Visible = false;
             // 
             // pictureBoxIconExternalOperationDisable
             // 

ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayWeightSmall.cs

@@ -185,62 +185,7 @@ namespace ITC81DB_0H.Controls
             //    this.pictureBoxStopWeighingEnable.Visible = true;
             //}
 
-            // PI2 - 0:미사용, 1:NG, 2:외부운전, 3:공압센서, 4:문열림감지, 5:배출확인
+            // 0:미사용, 1:NG, 2:START, 3:STOP
-            // PI3 - 0:미사용, 1:STOP, 2:외부운전, 3:공압센서, 4:문열림감지, 5:배출확인
-            // PI4 - 0:미사용, 1:START, 2:외부운전, 3:공압센서, 4:문열림감지, 5:배출확인
-            // PI5 - 0:미사용, 1:외부운전, 2:공압센서, 3:문열림감지, 4:배출확인
-            // PI6 - 0:미사용, 1:외부운전, 2:공압센서, 3:문열림감지, 4:배출확인
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 2 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 == 2
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 2 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 1
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 1)
-            {
-                this.pictureBoxIconExternalOperationDisable.Visible = false;
-                this.pictureBoxIconExternalOperationEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxIconExternalOperationDisable.Visible = true;
-                this.pictureBoxIconExternalOperationEnable.Visible = false;
-            }
-
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 3 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 == 3
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 3 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 2
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 2)
-            {
-                this.pictureBoxAirCheckDisable.Visible = false;
-                this.pictureBoxAirCheckEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxAirCheckDisable.Visible = true;
-                this.pictureBoxAirCheckEnable.Visible = false;
-            }
-
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 4 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 == 4
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 4 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 3
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 3)
-            {
-                this.pictureBoxDoorCheckDisable.Visible = false;
-                this.pictureBoxDoorCheckEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxDoorCheckDisable.Visible = true;
-                this.pictureBoxDoorCheckEnable.Visible = false;
-            }
-
-            if (this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 == 5 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 == 5
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 == 5 || this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 == 4
-                || this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 == 4)
-            {
-                this.pictureBoxDischargeDisable.Visible = false;
-                this.pictureBoxDischargeEnable.Visible = true;
-            }
-            else
-            {
-                this.pictureBoxDischargeDisable.Visible = true;
-                this.pictureBoxDischargeEnable.Visible = false;
-            }
 
             // 바코드
             if (this.ParentForm.ParentForm.SystemConfig1.IsBarcodeEnable == true)

ITC81DB_0H/DataStore.cs

@@ -1159,6 +1159,7 @@ namespace ITC81DB_0H
         private string m_EthernetAddress;
         private int m_ConveyorLength;
         private int m_SortingPointLength;
+        private int m_EthernetLocalPort;
 
         private bool m_IsBypassDirectionPass;
         private bool m_IsBypassOnce;
@@ -1437,6 +1438,11 @@ namespace ITC81DB_0H
             get { return this.m_SortingPointLength; }
             set { this.m_SortingPointLength = value; }
         }
+        public int EthernetLocalPort
+        {
+            get { return this.m_EthernetLocalPort; }
+            set { this.m_EthernetLocalPort = value; }
+        }
 
         public bool IsBypassDirectionPass
         {
@@ -1512,6 +1518,7 @@ namespace ITC81DB_0H
             this.EthernetAddress = "0.0.0.0";
             this.ConveyorLength = 450;
             this.SortingPointLength = 250;
+            this.EthernetLocalPort = 0;
 
             this.IsBypassDirectionPass = true;
             this.IsBypassOnce = true;
@@ -1574,7 +1581,7 @@ namespace ITC81DB_0H
         public int DummyInt13;
         public int DummyInt14;
         public int DummyInt15;
-        public int DummyInt16;
+        public int EthernetLocalPort;
         public int SortingPointLength;
         public int ConveyorLength;
         public int MarkoprintLineNumberEthernet;

ITC81DB_0H/Forms/FormMain.cs

@@ -5957,13 +5957,20 @@ namespace ITC81DB_0H.Forms
         public void EthernetServerStart()
         {
             if (this.smartTCPMultiServer.IsStart == false)
+            {
+                this.ChildFormMenu.CenterConfiEthernet.DisplayLabelLocalPort(false);
+                this.smartTCPMultiServer.Port = this.SystemConfig2.EthernetLocalPort;
                 this.smartTCPMultiServer.Start();
             }
+        }
         public void EthernetServerStop()
         {
             if (this.smartTCPMultiServer.IsStart == true)
+            {
+                this.ChildFormMenu.CenterConfiEthernet.DisplayLabelLocalPort(true);
                 this.smartTCPMultiServer.Stop();
             }
+        }
         public void EthernetServerSendMessage(SmartTCPMultiServer.CLIENTSINFOS client, string msg)
         {
             this.smartTCPMultiServer.SendStringASCIIID(client.strID, msg);
@@ -6504,7 +6511,7 @@ namespace ITC81DB_0H.Forms
             structItem.DummyInt13 = 0;
             structItem.DummyInt14 = 0;
             structItem.DummyInt15 = 0;
-            structItem.DummyInt16 = 0;
+            structItem.EthernetLocalPort = this.SystemConfig2.EthernetLocalPort;
             structItem.SortingPointLength = this.SystemConfig2.SortingPointLength;
             structItem.ConveyorLength = this.SystemConfig2.ConveyorLength;
             structItem.MarkoprintLineNumberEthernet = this.SystemConfig2.MarkoprintLineNumberEthernet;
@@ -6609,7 +6616,7 @@ namespace ITC81DB_0H.Forms
             structItem.DummyInt13 = 0;
             structItem.DummyInt14 = 0;
             structItem.DummyInt15 = 0;
-            structItem.DummyInt16 = 0;
+            structItem.EthernetLocalPort = item.EthernetLocalPort;
             structItem.SortingPointLength = item.SortingPointLength;
             structItem.ConveyorLength = item.ConveyorLength;
             structItem.MarkoprintLineNumberEthernet = item.MarkoprintLineNumberEthernet;
@@ -6717,6 +6724,7 @@ namespace ITC81DB_0H.Forms
                 this.SystemConfig2.EthernetPort = structItem.EthernetPort;
                 this.SystemConfig2.EthernetCommMode = structItem.EthernetCommMode;
                 this.SystemConfig2.EthernetOperationMode = structItem.EthernetOperationMode;
+                this.SystemConfig2.EthernetLocalPort = structItem.EthernetLocalPort;
 
                 this.SystemConfig2.IsBypassOnce = structItem.IsBypassOnce;
                 this.SystemConfig2.IsBypassDirectionPass = structItem.IsBypassDirectionPass;

ITC81DB_0H/Version.txt

@@ -12,10 +12,16 @@
 	기본형 컨베어 고정밀센서 계량기
 */
 
+@ Ver 1.0.8 by CJY
+	- 2021.03.19
+	- Ver 1.0.7 Modify
+	- 이더넷 통신 Server - Local Port 변경 후 재부팅하면 저장 안되는 버그 수정
+	  SystemConfig2 - EthernetLocalPort 추가
+
 @ Ver 1.0.7 by CJY
 	- 2020.12.09
 	- Ver 1.0.6 Modify
-	- 외부입력 항목 통일 NG, START, STOP
+	- 외부입력 항목 통일 - NG, START, STOP
 
 @ Ver 1.0.6 by CJY
 	- 2020.12.02