diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/Step7ProjectV14SP1Tia.cs b/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/Step7ProjectV14SP1Tia.cs index fd363c4b..6ee0f034 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/Step7ProjectV14SP1Tia.cs +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/Step7ProjectV14SP1Tia.cs @@ -644,7 +644,7 @@ internal void LoadViaOpennessDlls() foreach (var d in tiapProject.Devices) { - if (d.TypeIdentifier != null && d.TypeIdentifier.EndsWith(".S71500")) + if (d.TypeIdentifier != null && (d.TypeIdentifier.EndsWith(".S71500") || d.TypeIdentifier.EndsWith("ET200SP_OC"))) { foreach (DeviceItem deviceItem in d.DeviceItems) { diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV15/Step7ProjectV15Tia.cs b/DotNetSiemensPLCToolBoxLibrary.TIAV15/Step7ProjectV15Tia.cs index 670e40ba..8e4757cb 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV15/Step7ProjectV15Tia.cs +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV15/Step7ProjectV15Tia.cs @@ -651,7 +651,7 @@ internal void LoadViaOpennessDlls(Credentials credentials) foreach (var d in tiapProject.Devices) { - if (d.TypeIdentifier != null && d.TypeIdentifier.EndsWith(".S71500")) + if (d.TypeIdentifier != null && (d.TypeIdentifier.EndsWith(".S71500") || d.TypeIdentifier.EndsWith("ET200SP_OC"))) { foreach (DeviceItem deviceItem in d.DeviceItems) { diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV16/Step7ProjectV16Tia.cs b/DotNetSiemensPLCToolBoxLibrary.TIAV16/Step7ProjectV16Tia.cs index 4e9175eb..12c02385 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV16/Step7ProjectV16Tia.cs +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV16/Step7ProjectV16Tia.cs @@ -861,7 +861,7 @@ internal void LoadViaOpennessDlls() foreach (var d in tiapProject.Devices) { - if (d.TypeIdentifier != null && d.TypeIdentifier.EndsWith(".S71500")) + if (d.TypeIdentifier != null && (d.TypeIdentifier.EndsWith(".S71500") || d.TypeIdentifier.EndsWith("ET200SP_OC"))) { foreach (DeviceItem deviceItem in d.DeviceItems) { diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV17/Step7ProjectV17Tia.cs b/DotNetSiemensPLCToolBoxLibrary.TIAV17/Step7ProjectV17Tia.cs index 3bb0fb0c..3f53f99c 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV17/Step7ProjectV17Tia.cs +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV17/Step7ProjectV17Tia.cs @@ -861,7 +861,7 @@ internal void LoadViaOpennessDlls() foreach (var d in tiapProject.Devices) { - if (d.TypeIdentifier != null && d.TypeIdentifier.EndsWith(".S71500")) + if (d.TypeIdentifier != null && (d.TypeIdentifier.EndsWith(".S71500") || d.TypeIdentifier.EndsWith("ET200SP_OC"))) { foreach (DeviceItem deviceItem in d.DeviceItems) { diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV18/Step7ProjectV18Tia.cs b/DotNetSiemensPLCToolBoxLibrary.TIAV18/Step7ProjectV18Tia.cs index 619e15e0..eba5dfc2 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV18/Step7ProjectV18Tia.cs +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV18/Step7ProjectV18Tia.cs @@ -861,7 +861,7 @@ internal void LoadViaOpennessDlls() foreach (var d in tiapProject.Devices) { - if (d.TypeIdentifier != null && d.TypeIdentifier.EndsWith(".S71500")) + if (d.TypeIdentifier != null && (d.TypeIdentifier.EndsWith(".S71500") || d.TypeIdentifier.EndsWith("ET200SP_OC"))) { foreach (DeviceItem deviceItem in d.DeviceItems) { diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV19/Step7ProjectV19Tia.cs b/DotNetSiemensPLCToolBoxLibrary.TIAV19/Step7ProjectV19Tia.cs index 2bca160d..af24b306 100644 --- a/DotNetSiemensPLCToolBoxLibrary.TIAV19/Step7ProjectV19Tia.cs +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV19/Step7ProjectV19Tia.cs @@ -806,7 +806,7 @@ public override void ExportTextlists(ProjectFolder folder, string exportPath) { foreach (var d in tiapProject.Devices) { - if (d.TypeIdentifier != null && d.TypeIdentifier.EndsWith(".S71500")) + if (d.TypeIdentifier != null && (d.TypeIdentifier.EndsWith(".S71500") || d.TypeIdentifier.EndsWith("ET200SP_OC"))) { foreach (DeviceItem deviceItem in d.DeviceItems) { @@ -900,7 +900,7 @@ internal void LoadViaOpennessDlls() foreach (var d in tiapProject.Devices) { - if (d.TypeIdentifier != null && d.TypeIdentifier.EndsWith(".S71500")) + if (d.TypeIdentifier != null && (d.TypeIdentifier.EndsWith(".S71500") || d.TypeIdentifier.EndsWith("ET200SP_OC"))) { foreach (DeviceItem deviceItem in d.DeviceItems) { diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV20/DotNetSiemensPLCToolBoxLibrary.TIAV20.csproj b/DotNetSiemensPLCToolBoxLibrary.TIAV20/DotNetSiemensPLCToolBoxLibrary.TIAV20.csproj new file mode 100644 index 00000000..02f8ccc3 --- /dev/null +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV20/DotNetSiemensPLCToolBoxLibrary.TIAV20.csproj @@ -0,0 +1,44 @@ + + false + + Library + net48 + true + true + + + DotNetProjects.DotNetSiemensPLCToolBoxLibrary.TIAV20 + DotNetProjects + MIT + https://github.com/jogibear9988/DotNetSiemensPLCToolBoxLibrary + true + 1.0.0 + 1.0.0.0 + 1.0.0.0 + + + true + true + true + snupkg + + + + + + + + + + ..\externalDlls\siemens\V20\Siemens.Engineering.dll + False + False + + + ..\externalDlls\siemens\V20\Siemens.Engineering.Hmi.dll + False + False + + + + \ No newline at end of file diff --git a/DotNetSiemensPLCToolBoxLibrary.TIAV20/SelectPortalInstance.xaml b/DotNetSiemensPLCToolBoxLibrary.TIAV20/SelectPortalInstance.xaml new file mode 100644 index 00000000..47a38513 --- /dev/null +++ b/DotNetSiemensPLCToolBoxLibrary.TIAV20/SelectPortalInstance.xaml @@ -0,0 +1,13 @@ + + + + +