Read Rack/Slot from CPU/CP fixes #18

dotnetprojects · Oct 7, 2014 · 470d119 · 470d119
1 parent 8dc1367
commit 470d119
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 3 deletions.
diff --git a/LibNoDaveConnectionLibrary/DataTypes/Projectfolders/IHardwareFolder.cs b/LibNoDaveConnectionLibrary/DataTypes/Projectfolders/IHardwareFolder.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DotNetSiemensPLCToolBoxLibrary.DataTypes.Projectfolders
+{
+    public interface IHardwareFolder
+    {
+        int Rack { get; set; }
+        int Slot { get; set; }
+    }
+}
diff --git a/LibNoDaveConnectionLibrary/DataTypes/Projectfolders/Step7V5/CPFolder.cs b/LibNoDaveConnectionLibrary/DataTypes/Projectfolders/Step7V5/CPFolder.cs
@@ -1,8 +1,11 @@
 namespace DotNetSiemensPLCToolBoxLibrary.DataTypes.Projectfolders.Step7V5
 {
-    public class CPFolder : Step7ProjectFolder
+    public class CPFolder : Step7ProjectFolder, IHardwareFolder
     {
         internal int UnitID;
-        internal int TobjTyp;                
+        internal int TobjTyp;
+
+        public int Rack { get; set; }
+        public int Slot { get; set; }
     }
 }
diff --git a/LibNoDaveConnectionLibrary/DataTypes/Projectfolders/Step7V5/CPUFolder.cs b/LibNoDaveConnectionLibrary/DataTypes/Projectfolders/Step7V5/CPUFolder.cs
@@ -1,11 +1,14 @@
 namespace DotNetSiemensPLCToolBoxLibrary.DataTypes.Projectfolders.Step7V5
 {
-    public class CPUFolder : Step7ProjectFolder
+    public class CPUFolder : Step7ProjectFolder, IHardwareFolder
     {
         internal int UnitID;
         internal int TobjTyp;        
         public PLCType CpuType { get; set; }
 
         public string PasswdHard { get; set; }
+
+        public int Rack { get; set; }
+        public int Slot { get; set; }
     }
 }
diff --git a/LibNoDaveConnectionLibrary/DotNetSiemensPLCToolBoxLibrary.csproj b/LibNoDaveConnectionLibrary/DotNetSiemensPLCToolBoxLibrary.csproj
@@ -107,6 +107,7 @@
     <Compile Include="DataTypes\MultiLanguangeString.cs" />
     <Compile Include="DataTypes\Pointer.cs" />
     <Compile Include="DataTypes\MnemonicLanguage.cs" />
+    <Compile Include="DataTypes\Projectfolders\IHardwareFolder.cs" />
     <Compile Include="DataTypes\Projectfolders\IProjectFolder.cs" />
     <Compile Include="DataTypes\Projectfolders\Step7V11\TIASymbolTableEntry.cs" />
     <Compile Include="DataTypes\Projectfolders\Step7V11\TIABlocksFolder.cs" />

diff --git a/LibNoDaveConnectionLibrary/Projectfiles/Step7ProjectV5.cs b/LibNoDaveConnectionLibrary/Projectfiles/Step7ProjectV5.cs
@@ -429,6 +429,9 @@ override internal void LoadProject()
                                 y.Name = ((string)row["Name"]).Replace("\0", "");
                                 if ((bool)row["DELETED_FLAG"]) y.Name = "$$_" + y.Name;
                                 y.ID = (int)row["ID"];
+
+                                y.Rack = (int)row["SUBSTATN"];
+                                y.Slot = (int)row["MODULN"];
                             }
                         }
                     }
@@ -452,6 +455,9 @@ override internal void LoadProject()
                                 y.Name = ((string)row["Name"]).Replace("\0", "");
                                 if ((bool)row["DELETED_FLAG"]) y.Name = "$$_" + y.Name;
                                 y.ID = (int)row["ID"];
+
+                                y.Rack = (int)row["SUBSTATN"];
+                                y.Slot = (int)row["MODULN"];
                             }
                         }
                     }
@@ -514,6 +520,9 @@ override internal void LoadProject()
                                 y.Name = ((string)row["Name"]).Replace("\0", "");
                                 if ((bool)row["DELETED_FLAG"]) y.Name = "$$_" + y.Name;
                                 y.ID = (int)row["ID"];
+
+                                y.Rack = (int)row["SUBSTATN"];
+                                y.Slot = (int)row["MODULN"];
                             }
                         }
                     }
@@ -572,6 +581,9 @@ override internal void LoadProject()
                             {
                                 y.Name = ((string)row["Name"]).Replace("\0", "");
                                 if ((bool)row["DELETED_FLAG"]) y.Name = "$$_" + y.Name;
+
+                                y.Rack = (int)row["SUBSTATN"];
+                                y.Slot = (int)row["MODULN"];
                             }
                         }
                     }

diff --git a/compiled/DotNetSiemensPLCToolBoxLibrary.dll b/compiled/DotNetSiemensPLCToolBoxLibrary.dll
diff --git a/compiled/JFK-ProtokollerConfigurationTool.exe b/compiled/JFK-ProtokollerConfigurationTool.exe
diff --git a/compiled/JFK-ProtokollerLibrary.dll b/compiled/JFK-ProtokollerLibrary.dll
diff --git a/compiled/JFK-ProtokollerService.exe b/compiled/JFK-ProtokollerService.exe
diff --git a/compiled/Kopplungstester.exe b/compiled/Kopplungstester.exe
diff --git a/compiled/ToolboxForSiemensPLCs.exe b/compiled/ToolboxForSiemensPLCs.exe
diff --git a/compiled/WPFToolboxForSiemensPLCs.exe b/compiled/WPFToolboxForSiemensPLCs.exe
diff --git a/compiled/WPFVarTab.exe b/compiled/WPFVarTab.exe
diff --git a/compiled/en/DotNetSiemensPLCToolBoxLibrary.resources.dll b/compiled/en/DotNetSiemensPLCToolBoxLibrary.resources.dll
diff --git a/compiled/es/DotNetSiemensPLCToolBoxLibrary.resources.dll b/compiled/es/DotNetSiemensPLCToolBoxLibrary.resources.dll