From 8e616c73d0adf401f6fc562a2bccbe682ee449e0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Tue, 8 Apr 2025 14:43:12 +0900 Subject: [PATCH] =?UTF-8?q?=20-=20Modbus=2012=EC=97=B4=EC=97=90=EC=84=9C?= =?UTF-8?q?=EB=8F=84=20=EC=82=AC=EC=9A=A9=20=EA=B0=80=EB=8A=A5=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT_LKD_2.suo | Bin 118272 -> 118272 bytes .../System/ControlMenuSystemEthernet.cs | 26 ++---- INT_LKD_2/DataStore/ModbusData.cs | 16 ++-- INT_LKD_2/Forms/FormMain.cs | 85 ++++++++++-------- INT_LKD_2/INT_LKD_2.csproj | 13 +-- 5 files changed, 75 insertions(+), 65 deletions(-) diff --git a/INT_LKD_2.suo b/INT_LKD_2.suo index b130bdfaafc00fab52c22e3ea6a770e22c65431e..d97b84537ba7b9e376168b4320ae8a95b6650b07 100644 GIT binary patch delta 8483 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 ZSq~Sip5WoB$%?*-6_*)6_3y!|{{piJyi5Q9 diff --git a/INT_LKD_2/Controls/System/ControlMenuSystemEthernet.cs b/INT_LKD_2/Controls/System/ControlMenuSystemEthernet.cs index 6a434b4..a8dff5d 100644 --- a/INT_LKD_2/Controls/System/ControlMenuSystemEthernet.cs +++ b/INT_LKD_2/Controls/System/ControlMenuSystemEthernet.cs @@ -282,8 +282,7 @@ namespace INT_LKD_2.Controls { if (this.ParentForm.ParentForm.SystemConfig.ETHERNET_OP_MODE == 1) { - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(true); this.groupBoxModbusSetting.Visible = true; this.labelModbusRole.Text = "Slave"; @@ -294,8 +293,7 @@ namespace INT_LKD_2.Controls } else if (this.ParentForm.ParentForm.SystemConfig.ETHERNET_OP_MODE == 2) { - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(true); this.groupBoxModbusSetting.Visible = true; this.labelModbusRole.Text = "Master"; @@ -307,20 +305,17 @@ namespace INT_LKD_2.Controls } else { - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(false); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(false); this.groupBoxModbusSetting.Visible = false; } } else { - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(false); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainButtonModbusAdd(false); this.groupBoxModbusSetting.Visible = false; } - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.InitialEthernetIcon(); + this.ParentForm.ParentForm.ChildFormMainDisplay.InitialEthernetIcon(); } public void DisplayRefresh() @@ -461,7 +456,6 @@ namespace INT_LKD_2.Controls this.ParentForm.ParentForm.EthernetClientDisconnect(); afterOpMode = "Client"; - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(false); this.labelConnectedIP.Text = "-"; @@ -479,7 +473,6 @@ namespace INT_LKD_2.Controls this.ParentForm.ParentForm.SystemConfig.ETHERNET_OP_MODE = 0; afterOpMode = "None"; - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(false); this.buttonStartServer.Enabled = false; @@ -602,8 +595,7 @@ namespace INT_LKD_2.Controls if (this.timerServer.Enabled != false) this.timerServer.Enabled = false; - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(false); + this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(false); } else { @@ -612,8 +604,7 @@ namespace INT_LKD_2.Controls if (this.timerServer.Enabled != true) this.timerServer.Enabled = true; - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(true); } this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.TryEthernetStart, "Server"); @@ -626,8 +617,7 @@ namespace INT_LKD_2.Controls if (this.labelServerStatus.Text != ">Stop") this.labelServerStatus.Text = ">Stop"; - if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10) - this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(false); + this.ParentForm.ParentForm.ChildFormMainDisplay.TimerServer(false); this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.TryEthernetStop, "Server"); } private void buttonSaveServer_Click(object sender, EventArgs e) diff --git a/INT_LKD_2/DataStore/ModbusData.cs b/INT_LKD_2/DataStore/ModbusData.cs index d6e40af..99bccad 100644 --- a/INT_LKD_2/DataStore/ModbusData.cs +++ b/INT_LKD_2/DataStore/ModbusData.cs @@ -33,6 +33,10 @@ namespace INT_LKD_2 public const int _18_9_IsLeak = 3027; public const int _19_10_IsProcessing = 3028; public const int _20_10_IsLeak = 3029; + public const int _21_11_IsProcessing = 3030; + public const int _22_11_IsLeak = 3031; + public const int _23_12_IsProcessing = 3032; + public const int _24_12_IsLeak = 3033; } public class _30000_ModbusData { @@ -77,19 +81,19 @@ namespace INT_LKD_2 public void Initialization() { this.CollectionIsProcessing = new Collection(); - for (int i = 0; i < 10; i++) + for (int i = 0; i < 12; i++) this.CollectionIsProcessing.Add(0); this.CollectionIsLeak = new Collection(); - for (int i = 0; i < 10; i++) + for (int i = 0; i < 12; i++) this.CollectionIsLeak.Add(0); this.CollectionIsProcessingHexa = new Collection(); - for (int i = 0; i < 10; i++) + for (int i = 0; i < 12; i++) this.CollectionIsProcessingHexa.Add(this.CollectionIsProcessing[i].ToString("X8")); this.CollectionIsLeakHexa = new Collection(); - for (int i = 0; i < 10; i++) + for (int i = 0; i < 12; i++) this.CollectionIsLeakHexa.Add(this.CollectionIsLeak[i].ToString("X8")); } @@ -97,12 +101,12 @@ namespace INT_LKD_2 { if(this.CollectionIsProcessingHexa.Count > 0) this.CollectionIsProcessingHexa.Clear(); - for (int i = 0; i < 10; i++) + for (int i = 0; i < 12; i++) this.CollectionIsProcessingHexa.Add(this.CollectionIsProcessing[i].ToString("X8")); if (this.CollectionIsLeakHexa.Count > 0) this.CollectionIsLeakHexa.Clear(); - for (int i = 0; i < 10; i++) + for (int i = 0; i < 12; i++) this.CollectionIsLeakHexa.Add(this.CollectionIsLeak[i].ToString("X8")); } #endregion diff --git a/INT_LKD_2/Forms/FormMain.cs b/INT_LKD_2/Forms/FormMain.cs index fdc8e27..5d5717f 100644 --- a/INT_LKD_2/Forms/FormMain.cs +++ b/INT_LKD_2/Forms/FormMain.cs @@ -264,43 +264,40 @@ namespace INT_LKD_2.Forms } private void DefaultSetting2() { - if (this.SystemConfig.EQUIPMENT_LANE == 10) + // 이더넷 + if (this.SystemConfig.ETHERNET_OP_MODE == 1) { - // 이더넷 - if (this.SystemConfig.ETHERNET_OP_MODE == 1) + try { - try - { - if (string.Compare(this.smartConfigs.IPSettings.DeviceIP, "0.0.0.0") != 0) - this.EthernetServerStart(); + if (string.Compare(this.smartConfigs.IPSettings.DeviceIP, "0.0.0.0") != 0) + this.EthernetServerStart(); - this.ChildFormMainDisplay.TimerServer(true); - } - catch - { - - } + this.ChildFormMainDisplay.TimerServer(true); } - else if (this.SystemConfig.ETHERNET_OP_MODE == 2) + catch { - this.EthernetClientDisconnect(); - } - if (this.SystemConfig.ETHERNET_COMM_MODE != (int)Define.E_CommMode.f0_None) - { - switch (this.SystemConfig.ETHERNET_COMM_MODE) - { - case (int)Define.E_CommMode.f1_Modbus: - this.ChildFormMainDisplay.MainButtonModbusAdd(true); - break; - default: - break; - } } - - this.ChildFormMainDisplay.InitialEthernetIcon(); } - } + else if (this.SystemConfig.ETHERNET_OP_MODE == 2) + { + this.EthernetClientDisconnect(); + } + + if (this.SystemConfig.ETHERNET_COMM_MODE != (int)Define.E_CommMode.f0_None) + { + switch (this.SystemConfig.ETHERNET_COMM_MODE) + { + case (int)Define.E_CommMode.f1_Modbus: + this.ChildFormMainDisplay.MainButtonModbusAdd(true); + break; + default: + break; + } + } + + this.ChildFormMainDisplay.InitialEthernetIcon(); + } private void InitializeUserManager() { UserManager.UserListNewDataEvent += this.UserManager_UserListNewDataEvent; @@ -4209,6 +4206,26 @@ namespace INT_LKD_2.Forms for (int i = 0; i < 2; i++) madeData[madeDataIndex + i] = length2Value[2 - i]; break; + case _30000_ModbusAddress._21_11_IsProcessing: + length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[10]); + for (int i = 0; i < 2; i++) + madeData[madeDataIndex + i] = length2Value[2 - i]; + break; + case _30000_ModbusAddress._22_11_IsLeak: + length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[10]); + for (int i = 0; i < 2; i++) + madeData[madeDataIndex + i] = length2Value[2 - i]; + break; + case _30000_ModbusAddress._23_12_IsProcessing: + length2Value = GetBytes(this.Current30000ModbusData.CollectionIsProcessing[11]); + for (int i = 0; i < 2; i++) + madeData[madeDataIndex + i] = length2Value[2 - i]; + break; + case _30000_ModbusAddress._24_12_IsLeak: + length2Value = GetBytes(this.Current30000ModbusData.CollectionIsLeak[11]); + for (int i = 0; i < 2; i++) + madeData[madeDataIndex + i] = length2Value[2 - i]; + break; default: break; #endregion @@ -4271,12 +4288,10 @@ namespace INT_LKD_2.Forms default: break; } - this.Current30000ModbusData.CollectionIsLeak[i] = (short)this.CurrentLeakDatas[i].Judgment.Result; } - if (this.SystemConfig.EQUIPMENT_LANE == 10) - this.ChildFormMainDisplay.ChildModbus.UpdateData(this.Current30000ModbusData); + this.ChildFormMainDisplay.ChildModbus.UpdateData(this.Current30000ModbusData); //this.DelegateModbusStatus(); // 로그 @@ -4484,8 +4499,7 @@ namespace INT_LKD_2.Forms private void UIServerStatus(bool status) { - if (this.SystemConfig.EQUIPMENT_LANE == 10) - this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(status); + this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(status); } public void DelegateUISeverStatus(bool status) { @@ -5900,8 +5914,7 @@ namespace INT_LKD_2.Forms #region Modbus TCP if (this.smartTCPMultiServer.ClientInfoList != null) { - if (this.SystemConfig.EQUIPMENT_LANE == 10) - this.ChildFormMainDisplay.ChildModbus.UpdateReceiveCount(); + this.ChildFormMainDisplay.ChildModbus.UpdateReceiveCount(); //Console.Write("\n" + string.Format("Receive Modbus {0:yyyy-MM-dd HH:mm:ss}: {1}", DateTime.Now, Helper.ByteToHexString(readByte))); diff --git a/INT_LKD_2/INT_LKD_2.csproj b/INT_LKD_2/INT_LKD_2.csproj index 352ec15..4beeec9 100644 --- a/INT_LKD_2/INT_LKD_2.csproj +++ b/INT_LKD_2/INT_LKD_2.csproj @@ -45,23 +45,23 @@ Off - + False - bin\Release\InModbus.dll + C:\Program Files (x86)\Intech\InModbus_V2.0.9.1\InModbus.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXNCommon.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXNFDCommon.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNFDCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXN_IEC1000.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXN_IEC1000.dll @@ -421,6 +421,9 @@ + + +