葛店0612

parkMonitor/App.config

@@ -30,7 +30,7 @@
     <add key="ClientSettingsProvider.ServiceUri" value="" />
     <!--PLC基本配置-->
     <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
-    <add key="PLC_ip_address" value="127.0.0.1" />
+    <add key="PLC_ip_address" value="192.168.0.1" />
     <add key="PLC_port" value="30000" />
     <add key="PLC_station" value="1" />
     <add key="PLC_start_address" value="0" />
@@ -63,10 +63,10 @@
     <add key="laser_countdown" value="100" />
     <!--队列线程参数-->
     <add key="fetch_store_ratio" value="3" />
-    <add key="licenseTime" value="30" />
+    <add key="licenseTime" value="10" />
     <add key="userTime" value="30" />
     <!--上位机（Web线程）IP地址及配置serverScoket的端口-->
-    <add key="WebConfig" value="192.168.111.254:9000" />
+    <add key="WebConfig" value="192.168.0.164:9000" />
     <!--<add key ="WebConfig" value="127.0.0.1:9000"/>-->
 
     <!--车库入口-->
@@ -75,12 +75,12 @@
     <add key="parkingEntZ" value="0" />
     <!--监控线程-->
     <!--数据更新间隔(毫秒数)-->
-    <add key="monitor_timGap" value="500"/>
+    <add key="monitor_timGap" value="200"/>
 
     <!--ip位置映射表-->
     <!--位置编号；基点横坐标；车位宽度；宽度补偿-->
-    <add key="192.168.0.20" value="1" />
-    <add key="192.168.0.21" value="2" />
+    <add key="192.168.0.50" value="1" />
+    <add key="192.168.0.51" value="2" />
     <!--车库权重-->
     <add key="xWeight" value="1"/>
     <add key="yWeight" value="1"/>

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -816,7 +816,7 @@ namespace parkMonitor.server.CoreThread
             cm = new ControlMessage();
 
             int robotID = 0;
-            robotID = parkingSpaceID / 15 + 1;
+            robotID = parkingSpaceID / 50 + 1;
             if (!WaitForRobotResource(robotID))
             {
                 Rollback(queueCmd, parkingSpaceID, true, false);

parkMonitor/server/PLCLinker/PLCLinker.cs

@@ -588,7 +588,7 @@ namespace parkMonitor.server
                                     Thread.Sleep(300);
                                     SendtoPLC(laser_start_addr, "1");
                                     Thread.Sleep(100);
-                                    SendtoPLC("1", "1");//停车指令置1
+                                    //SendtoPLC("1", "1");//停车指令置1
                                     Log.WriteLog("已发送激光" + lpuTemp.id + "启动指令");
                                     UILogServer.ins.info("已发送激光" + lpuTemp.id + "启动指令");
                                 }
@@ -599,6 +599,8 @@ namespace parkMonitor.server
                         case 2:
                             if (cm.RobotID == 1)
                             {
+                                //停车指令置1
+                                SendtoPLC("1", "1");
                                 //停车启动机械手
                                 SendtoPLC(rpu1.parking_startRobot_address.ToString(), "1");
                                 //自动或手动输入激光雷达数据
@@ -690,19 +692,20 @@ namespace parkMonitor.server
                     UpdateLaserStatus();
                 }
             });
+
             //模拟plc与激光自动操作
-            Task.Factory.StartNew(() =>
-            {
-                laserAnim();
-            });
-            Task.Factory.StartNew(() =>
-            {
-                wheelbaseAnim();
-            });
-            Task.Factory.StartNew(() =>
-            {
-                autoCycling();
-            });
+            //Task.Factory.StartNew(() =>
+            //{
+            //    laserAnim();
+            //});
+            //Task.Factory.StartNew(() =>
+            //{
+            //    wheelbaseAnim();
+            //});
+            //Task.Factory.StartNew(() =>
+            //{
+            //    autoCycling();
+            //});
         }
 
         /// <summary>