From 8650e8420468ad97fa265c61cef0643a28543b10 Mon Sep 17 00:00:00 2001
From: "CMS3762\\carminatini" <nicola.carminati@cms.it>
Date: Thu, 21 Dec 2017 17:08:36 +0100
Subject: [PATCH] Siemens Bugs Fixed

---
 Step.Config/serverConfig.xml            | 2 +-
 Step.NC/NcHandler.cs                    | 2 +-
 Step.UI/ServerControlWindow.Designer.cs | 2 +-
 Step.sln                                | 3 +--
 Step/App.config                         | 3 +++
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Step.Config/serverConfig.xml b/Step.Config/serverConfig.xml
index 94e9d057..e9e033b5 100644
--- a/Step.Config/serverConfig.xml
+++ b/Step.Config/serverConfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <ncConfig>
-    <ncVendor>1</ncVendor>
+    <ncVendor>2</ncVendor>
     <ncIpAddress>10.69.36.33</ncIpAddress>
     <ncPort>8193</ncPort>
   </ncConfig>
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 77796a15..da9b3b60 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -42,7 +42,7 @@ namespace Step.NC
                 case NC_VENDOR.FANUC:
                     return new Nc_Fanuc(NcConfig.NcIpAddress, NcConfig.NcPort, 2000);
                 case NC_VENDOR.SIEMENS:
-                    return new Nc_Siemens(2);
+                    return new Nc_Siemens(2000);
                 case NC_VENDOR.OSAI:
                     return new Nc_Osai(NcConfig.NcIpAddress, NcConfig.NcPort, 2);
             }
diff --git a/Step.UI/ServerControlWindow.Designer.cs b/Step.UI/ServerControlWindow.Designer.cs
index 86e4a927..54606a6c 100644
--- a/Step.UI/ServerControlWindow.Designer.cs
+++ b/Step.UI/ServerControlWindow.Designer.cs
@@ -74,7 +74,7 @@
             this.stopServerButton.UseVisualStyleBackColor = true;
             this.stopServerButton.Click += new System.EventHandler(this.StopServerButton_Click);
             // 
-            // openUiButton
+            // openUiButtonx
             // 
             this.openUiButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.openUiButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
diff --git a/Step.sln b/Step.sln
index 0e16a830..52cbfb25 100644
--- a/Step.sln
+++ b/Step.sln
@@ -1,12 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step", "Step\Step.csproj", "{AFED34E1-77DB-4D81-830A-A8D0A190573D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3F5C2483-FC87-43EF-92A8-66FF7D0E440F} = {3F5C2483-FC87-43EF-92A8-66FF7D0E440F}
-		{66FA29DB-925A-402B-A4C7-D3D780FB1BC3} = {66FA29DB-925A-402B-A4C7-D3D780FB1BC3}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Model", "Step.Model\Step.Model.csproj", "{631375DD-06D3-49BB-8130-D9DDB34C429D}"
diff --git a/Step/App.config b/Step/App.config
index f9bdde76..04724f51 100644
--- a/Step/App.config
+++ b/Step/App.config
@@ -7,6 +7,9 @@
   <configSections>
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+  </startup>
   <appSettings>
     <add key="enableDirectoryBrowsing" value="true" />
   </appSettings>