Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT_LKD_2

# Conflicts:
#	INT_LKD_2.suo

INT_LKD_2/Controls/System/ControlMenuSystemEthernet.cs

@@ -282,7 +282,6 @@ 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.groupBoxModbusSetting.Visible = true;
 
@@ -294,7 +293,6 @@ 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.groupBoxModbusSetting.Visible = true;
 
@@ -307,19 +305,16 @@ namespace INT_LKD_2.Controls
                 }
                 else
                 {
-                    if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10)
                     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.groupBoxModbusSetting.Visible = false;
             }
 
-            if (this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE == 10)
             this.ParentForm.ParentForm.ChildFormMainDisplay.InitialEthernetIcon();
         }
 
@@ -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,7 +595,6 @@ 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);
             }
             else
@@ -612,7 +604,6 @@ 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);
             }
 
@@ -626,7 +617,6 @@ 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.SetTrackingHistoryData(Define.E_TrackingOperation.TryEthernetStop, "Server");
         }

INT_LKD_2/Controls/System/ControlMenuSystemInformation.cs

@@ -49,7 +49,7 @@ namespace INT_LKD_2.Controls
         {
             this.smartGroupBox1.Text = "System > Information";
 
-            this.labelDisplayVersion.Text = "1.1.0";
+            this.labelDisplayVersion.Text = "1.1.1";
             this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SERIAL_NUMBER;
 
             this.USBPath = "하드 디스크\\";

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<short>();
-            for (int i = 0; i < 10; i++)
+            for (int i = 0; i < 12; i++)
                 this.CollectionIsProcessing.Add(0);
 
             this.CollectionIsLeak = new Collection<short>();
-            for (int i = 0; i < 10; i++)
+            for (int i = 0; i < 12; i++)
                 this.CollectionIsLeak.Add(0);
 
             this.CollectionIsProcessingHexa = new Collection<string>();
-            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<string>();
-            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

INT_LKD_2/Forms/FormMain.cs

@@ -263,8 +263,6 @@ namespace INT_LKD_2.Forms
             }
         }
         private void DefaultSetting2()
-        {
-            if (this.SystemConfig.EQUIPMENT_LANE == 10)
         {
             // 이더넷
             if (this.SystemConfig.ETHERNET_OP_MODE == 1)
@@ -300,7 +298,6 @@ namespace INT_LKD_2.Forms
 
             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,11 +4288,9 @@ 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.DelegateModbusStatus();
 
@@ -4484,7 +4499,6 @@ namespace INT_LKD_2.Forms
 
         private void UIServerStatus(bool status)
         {
-            if (this.SystemConfig.EQUIPMENT_LANE == 10)
             this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(status);
         }
         public void DelegateUISeverStatus(bool status)
@@ -5900,7 +5914,6 @@ namespace INT_LKD_2.Forms
                     #region Modbus TCP
                     if (this.smartTCPMultiServer.ClientInfoList != null)
                     {
-                        if (this.SystemConfig.EQUIPMENT_LANE == 10)
                         this.ChildFormMainDisplay.ChildModbus.UpdateReceiveCount();
 
                         //Console.Write("\n" + string.Format("Receive Modbus {0:yyyy-MM-dd HH:mm:ss}: {1}", DateTime.Now, Helper.ByteToHexString(readByte)));

INT_LKD_2/INT_LKD_2.csproj

@@ -45,23 +45,23 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="InModbus, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="InModbus, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Release\InModbus.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\Intech\InModbus_V2.0.9.1\InModbus.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsCE.Forms" />
     <Reference Include="mscorlib" />
     <Reference Include="SmartXNCommon, Version=5.0.0.6, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXNCommon.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNCommon.dll</HintPath>
     </Reference>
     <Reference Include="SmartXNFDCommon, Version=5.0.0.6, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\SmartX_New_5.0.0.6_IEC1000_DOTNETCF3.5수동설치파일\SmartXNFDCommon.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXNFDCommon.dll</HintPath>
     </Reference>
     <Reference Include="SmartXN_IEC1000, Version=5.0.0.6, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>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</HintPath>
+      <HintPath>C:\Program Files (x86)\HNS\Embedded SmartX Component\V5.0.0.6_20221115\IEC1000\SmartXN_IEC1000.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -421,6 +421,9 @@
     <Compile Include="SerialManager\SerialManager.Define.cs" />
     <Compile Include="SerialManager\SerialManager.Structure.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Version.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

INT_LKD_2/Version.txt

@@ -24,6 +24,12 @@
 	리크디텍터 12열 분리타입 (1~6 , 7~12)
 */
 
+@ Ver 1.1.1 by CJY
+	- 2025.04.08
+	- V1.1.0 Modify
+	- SmartX Framework V5.0.0.6(update: 2022.11.12)
+	- Modbus 12열에서도 사용 가능하도록 수정
+
 @ Ver 1.1.0 by LSJ
 	- 2025.04.01
 	- INT_PT002 Modify