系统对接，准备联合测试

modbus_PLC_laser_test/runtest.bat

@@ -0,0 +1,2 @@
+modbus_msvc.exe 127.0.0.1 502 1 2
+pause

parkMonitor/App.config

@@ -29,13 +29,13 @@
     <!--PLC通用配置-->
     <add key="fetch_completed_address" value="9"/>
     <add key="park_command_address" value="0"/>
-    <add key="park_completed_address" value="9"/>
+    <add key="park_completed_address" value="8"/>
     <add key="laser_countdown" value="50"/>
     <!--激光数据地址-->
-    <add key="vehicleTypeLength_address" value="1"/>
+    <!--<add key="vehicleTypeLength_address" value="1"/>
     <add key="vehicleTypeWidth_address" value="1"/>
     <add key="vehicleTypeHeight_address" value="1"/>
-    <add key="vehicleTypeWheelbase_address" value="1"/>
+    <add key="vehicleTypeWheelbase_address" value="1"/>-->
     <!--一号激光设备配置-->
     <add key="laser1_status_address" value="1"/>
     <!--二号激光设备配置-->
@@ -47,14 +47,14 @@
     <!--PLC总控状态-->
     <add key="equipmentStatus_address" value="0"/>
     <!--取车写入PLC-->
-    <add key="fetching_startRobot_address" value="0"/>
-    <add key="parkingSpaceID_address" value="1"/>
-    <add key="parkingSpaceX_address" value="2"/>
-    <add key="parkingSpaceY_address" value="3"/>
-    <add key="parkingSpaceZ_address" value="4"/>
-    <add key="parkingLaserCenterX_address" value="4"/>
+    <add key="fetching_startRobot_address" value="12"/>
+    <add key="parkingSpaceID_address" value="13"/>
+    <add key="parkingSpaceX_address" value="14"/>
+    <add key="parkingSpaceY_address" value="15"/>
+    <add key="parkingSpaceZ_address" value="16"/>
+    <add key="parkingLaserCenterX_address" value="17"/>
     <!--停车启动机械手-->
-    <add key="parking_startRobot_address" value="0"/>
+    <add key="parking_startRobot_address" value="11"/>
     
     <!--车库入口-->
     <add key="parkingEntX" value="0"/>

parkMonitor/entity/AbstractMessage.cs

@@ -267,12 +267,10 @@ namespace parkMonitor.entity
         //3：停车完成，归零--park_completed_address
         //4：取车startRobot,车位信息4个
         public int  status { get; set; }
-        public string startRobot { get; set; }//不用
         public string parkingSpaceID { get; set; }
         public string parkingSpaceX { get; set; }
         public string parkingSpaceY { get; set; }
         public string parkingSpaceZ { get; set; }
-        public string startLaser { get; set; }//不用
         public string centerX { get; set; }
         public string centerY { get; set; }
         public string angleA { get; set; }

parkMonitor/parkMonitor.csproj

@@ -107,6 +107,7 @@
     <Compile Include="server\CoreThread\AllotParkingSpace.cs" />
     <Compile Include="server\CoreThread\AllotTest.cs" />
     <Compile Include="server\CoreThread\CoreThread.cs" />
+    <Compile Include="server\CoreThread\CoreThreadTest.cs" />
     <Compile Include="server\CoreThread\QueuingThread.cs" />
     <Compile Include="server\monitorServer\IMonitorCtl.cs" />
     <Compile Include="server\monitorServer\LaserMonitorCtl.cs" />

parkMonitor/server/CoreThread/CoreThreadTest.cs

@@ -47,18 +47,18 @@ namespace parkMonitor.server.CoreThread
 
         public CoreThreadTest()
         {
-            startRobot_address = ConfigurationManager.AppSettings["startRobot_address"];
-            parkingSpaceID_address = ConfigurationManager.AppSettings["parkingSpaceID_address"];
-            parkingSpaceX_address = ConfigurationManager.AppSettings["parkingSpaceX_address"];
-            parkingSpaceY_address = ConfigurationManager.AppSettings["parkingSpaceY_address"];
-            parkingSpaceZ_address = ConfigurationManager.AppSettings["parkingSpaceZ_address"];
+            //startRobot_address = ConfigurationManager.AppSettings["startRobot_address"];
+            //parkingSpaceID_address = ConfigurationManager.AppSettings["parkingSpaceID_address"];
+            //parkingSpaceX_address = ConfigurationManager.AppSettings["parkingSpaceX_address"];
+            //parkingSpaceY_address = ConfigurationManager.AppSettings["parkingSpaceY_address"];
+            //parkingSpaceZ_address = ConfigurationManager.AppSettings["parkingSpaceZ_address"];
             equipmentStatus_address = Convert.ToInt32(ConfigurationManager.AppSettings["equipmentStatus_address"]);
             park_completed_address = Convert.ToInt32(ConfigurationManager.AppSettings["park_completed_address"]);
             parkingEntX = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntX"]);
             parkingEntY = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntY"]);
             parkingEntZ = Convert.ToInt32(ConfigurationManager.AppSettings["parkingEntZ"]);
             //启动激光
-            park_command_address = ConfigurationManager.AppSettings["park_command_address"];
+            //park_command_address = ConfigurationManager.AppSettings["park_command_address"];
             ////激光测量数据
             //vehicleTypeLength_address = Convert.ToInt32(ConfigurationManager.AppSettings["vehicleTypeLength_address"]);
             //vehicleTypeWidth_address = Convert.ToInt32(ConfigurationManager.AppSettings["vehicleTypeWidth_address"]);
@@ -158,10 +158,8 @@ namespace parkMonitor.server.CoreThread
                     int parkingSpaceY = fslist.parkingSpaceY;
                     int parkingSpaceZ = fslist.parkingSpaceZ;
                     int status = 4 ;//取车
-                    string startRobot = "1";
                     ParkingMessage pm = new ParkingMessage();
                     pm.status = status;
-                    pm.startRobot = startRobot;
                     pm.parkingSpaceID = Convert.ToString(parkingSpaceID);
                     pm.parkingSpaceX = Convert.ToString(parkingSpaceX);
                     pm.parkingSpaceY = Convert.ToString(parkingSpaceY);
@@ -200,8 +198,6 @@ namespace parkMonitor.server.CoreThread
                     int status = 1;//停车
                     ParkingMessage pm = new ParkingMessage();
                     pm.status = status;
-                    string startLaser = "1";
-                    pm.startLaser = startLaser;
                     PLC.SetMessage(pm);
 
                     c.parkingEntX = parkingEntX;
@@ -252,7 +248,6 @@ namespace parkMonitor.server.CoreThread
                        height = PLCMsg.laser1.data.height;
                    }
                    status = 2;
-                   string startRobot = "1";
                    pm.status = status;
                    pm.centerX = Convert.ToString(centerX);
                    pm.centerY = Convert.ToString(centerY);
@@ -260,7 +255,6 @@ namespace parkMonitor.server.CoreThread
                    pm.length = Convert.ToString(length);
                    pm.width = Convert.ToString(width);
                    pm.height = Convert.ToString(height);
-                   pm.startRobot = startRobot;
                    pm.parkingSpaceID = Convert.ToString(parkingSpaceID);
                    pm.parkingSpaceX = Convert.ToString(parkingSpaceX);
                    pm.parkingSpaceY = Convert.ToString(parkingSpaceY);