Browse Source

关闭plc自动测试模块。准备现场测试

yc_t 6 years ago
parent
commit
22f21a0da6
3 changed files with 26 additions and 40 deletions
  1. 13 13
      PLCLinker/PLCLinker.cs
  2. 0 14
      parkMonitor.sln
  3. 13 13
      parkMonitor/server/PLCLinker/PLCLinker.cs

+ 13 - 13
PLCLinker/PLCLinker.cs

@@ -856,19 +856,19 @@ namespace PLCLinker
                 }
             });
 
-            //模拟plc与激光自动操作
-            Task.Factory.StartNew(() =>
-            {
-                laserAnim();
-            });
-            Task.Factory.StartNew(() =>
-            {
-                wheelbaseAnim();
-            });
-            Task.Factory.StartNew(() =>
-            {
-                autoCycling();
-            });
+            ////模拟plc与激光自动操作
+            //Task.Factory.StartNew(() =>
+            //{
+            //    laserAnim();
+            //});
+            //Task.Factory.StartNew(() =>
+            //{
+            //    wheelbaseAnim();
+            //});
+            //Task.Factory.StartNew(() =>
+            //{
+            //    autoCycling();
+            //});
         }
 
         /// <summary>

+ 0 - 14
parkMonitor.sln

@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "parkMonitor", "parkMonitor\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PLCLinker", "PLCLinker\PLCLinker.csproj", "{E574C9C3-B320-4DBC-B1B5-C5CEEA1A0D7D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NumMachineManager", "NumMachineManager\NumMachineManager.csproj", "{BF6FD30A-11DC-478D-B728-DC3B979E48D2}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,18 +41,6 @@ Global
 		{E574C9C3-B320-4DBC-B1B5-C5CEEA1A0D7D}.Release|x64.Build.0 = Release|Any CPU
 		{E574C9C3-B320-4DBC-B1B5-C5CEEA1A0D7D}.Release|x86.ActiveCfg = Release|Any CPU
 		{E574C9C3-B320-4DBC-B1B5-C5CEEA1A0D7D}.Release|x86.Build.0 = Release|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Debug|x64.Build.0 = Debug|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Debug|x86.Build.0 = Debug|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Release|x64.ActiveCfg = Release|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Release|x64.Build.0 = Release|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Release|x86.ActiveCfg = Release|Any CPU
-		{BF6FD30A-11DC-478D-B728-DC3B979E48D2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 13 - 13
parkMonitor/server/PLCLinker/PLCLinker.cs

@@ -854,19 +854,19 @@ namespace parkMonitor.server
                 }
             });
 
-            //模拟plc与激光自动操作
-            Task.Factory.StartNew(() =>
-            {
-                laserAnim();
-            });
-            Task.Factory.StartNew(() =>
-            {
-                wheelbaseAnim();
-            });
-            Task.Factory.StartNew(() =>
-            {
-                autoCycling();
-            });
+            ////模拟plc与激光自动操作
+            //Task.Factory.StartNew(() =>
+            //{
+            //    laserAnim();
+            //});
+            //Task.Factory.StartNew(() =>
+            //{
+            //    wheelbaseAnim();
+            //});
+            //Task.Factory.StartNew(() =>
+            //{
+            //    autoCycling();
+            //});
         }
 
         /// <summary>