diff --git a/ITC81DB.suo b/ITC81DB.suo index 3b22b0e..d67d956 100644 Binary files a/ITC81DB.suo and b/ITC81DB.suo differ diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs index 1edc60c..2e55da1 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.Designer.cs @@ -344,7 +344,7 @@ // this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image"))); - this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(306, 3); + this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(307, 3); this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection"; this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisconnection.Visible = false; @@ -353,7 +353,7 @@ // this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image"))); - this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(306, 3); + this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(307, 3); this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection"; this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetConnection.Visible = false; diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs index 789cd49..239ca54 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightBigScreen.cs @@ -88,6 +88,8 @@ namespace ITC81DB } public void UpdateSpotOrBypassImageVisibleStatus(bool check) { + this.ParentForm.ParentForm.IsBypassStart = check; + if (check == true) { this.pictureBoxBypass.Visible = true; diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs index 7b4d8ad..0d96671 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.Designer.cs @@ -328,7 +328,7 @@ // this.pictureBoxEthernetDisable.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisable.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisable.Image"))); - this.pictureBoxEthernetDisable.Location = new System.Drawing.Point(306, 3); + this.pictureBoxEthernetDisable.Location = new System.Drawing.Point(307, 3); this.pictureBoxEthernetDisable.Name = "pictureBoxEthernetDisable"; this.pictureBoxEthernetDisable.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisable.Visible = false; @@ -337,7 +337,7 @@ // this.pictureBoxEthernetConnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetConnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetConnection.Image"))); - this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(306, 3); + this.pictureBoxEthernetConnection.Location = new System.Drawing.Point(307, 3); this.pictureBoxEthernetConnection.Name = "pictureBoxEthernetConnection"; this.pictureBoxEthernetConnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetConnection.Visible = false; @@ -346,7 +346,7 @@ // this.pictureBoxEthernetDisconnection.BackColor = System.Drawing.Color.Black; this.pictureBoxEthernetDisconnection.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxEthernetDisconnection.Image"))); - this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(306, 3); + this.pictureBoxEthernetDisconnection.Location = new System.Drawing.Point(307, 3); this.pictureBoxEthernetDisconnection.Name = "pictureBoxEthernetDisconnection"; this.pictureBoxEthernetDisconnection.Size = new System.Drawing.Size(30, 25); this.pictureBoxEthernetDisconnection.Visible = false; diff --git a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs index 92ee7be..caaa566 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainWeightSmallScreen.cs @@ -89,6 +89,8 @@ namespace ITC81DB.Controls } public void UpdateSpotOrBypassImageVisibleStatus(bool check) { + this.ParentForm.ParentForm.IsBypassStart = check; + if (check == true) { this.pictureBoxBypass.Visible = true; diff --git a/ITC81DB/Forms/FormMain.cs b/ITC81DB/Forms/FormMain.cs index e32feba..95f8591 100644 --- a/ITC81DB/Forms/FormMain.cs +++ b/ITC81DB/Forms/FormMain.cs @@ -54,6 +54,7 @@ namespace ITC81DB.Forms public bool IsAlarmOccured; public bool IsCountingOutputCrossStatus; private bool IsSatisfyCounting; + public bool IsBypassStart; // 재전송 기능 public int MissingCommIDCount; @@ -2571,6 +2572,11 @@ namespace ITC81DB.Forms { this.IsBootingComplete = true; this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ParameterCount, ""); + + if (this.SystemConfig2.EthernetOperationMode == 2) + { + this.TimerEnabled(true); + } } else { @@ -8461,8 +8467,8 @@ namespace ITC81DB.Forms #region Client public void TimerEnabled(bool bValue) { - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) - if (this.IsEthernetStartMenu == false) + // if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + // if (this.IsEthernetStartMenu == false) this.timerClientConnect.Enabled = bValue; } @@ -8670,30 +8676,60 @@ namespace ITC81DB.Forms this.IsEthernetTransferData = true; this.EthernetTransferData = strTemp; - if (this.IsEthernetThreadStart == false) - this.EthernetClientConnect(); - else - this.EthernetSendMessage((string)this.EthernetTransferData); + try + { + if (this.IsEthernetThreadStart == false) + { + this.EthernetClientConnect(); + this.EthernetSendMessage((string)this.EthernetTransferData); + } + else + this.EthernetSendMessage((string)this.EthernetTransferData); + } + catch + { + + } } public void EthernetWeightData(byte[] bytes) { this.IsEthernetTransferData = true; this.EthernetTransferData = bytes; - if (this.IsEthernetThreadStart == false) - this.EthernetClientConnect(); - else - this.EthernetSendMessage(bytes); + try + { + if (this.IsEthernetThreadStart == false) + { + this.EthernetClientConnect(); + this.EthernetSendMessage(bytes); + } + else + this.EthernetSendMessage(bytes); + } + catch + { + + } } public void EthernetWeightDataForModbus(byte[] bytes) { this.IsEthernetTransferData = true; this.EthernetTransferData = bytes; - if (this.IsEthernetThreadStart == false) - this.EthernetClientConnect(); - else - this.EthernetSendMessage(bytes); + try + { + if (this.IsEthernetThreadStart == false) + { + this.EthernetClientConnect(); + this.EthernetSendMessage(bytes); + } + else + this.EthernetSendMessage(bytes); + } + catch + { + + } } #endregion diff --git a/ITC81DB/bin/Release/ITC81DB.exe b/ITC81DB/bin/Release/ITC81DB.exe index 91c1776..bca555c 100644 Binary files a/ITC81DB/bin/Release/ITC81DB.exe and b/ITC81DB/bin/Release/ITC81DB.exe differ diff --git a/ITC81DB/bin/Release/ITC81DB.pdb b/ITC81DB/bin/Release/ITC81DB.pdb index 6f92ca1..3d17dfd 100644 Binary files a/ITC81DB/bin/Release/ITC81DB.pdb and b/ITC81DB/bin/Release/ITC81DB.pdb differ diff --git a/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache b/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache index 51d05bc..4c635ae 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache and b/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache differ diff --git a/ITC81DB/obj/Release/ITC81DB.exe b/ITC81DB/obj/Release/ITC81DB.exe index 91c1776..bca555c 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.exe and b/ITC81DB/obj/Release/ITC81DB.exe differ diff --git a/ITC81DB/obj/Release/ITC81DB.pdb b/ITC81DB/obj/Release/ITC81DB.pdb index 6f92ca1..3d17dfd 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.pdb and b/ITC81DB/obj/Release/ITC81DB.pdb differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll b/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll index 42bfab6..edb1f16 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll and b/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll differ