|
|
@@ -14,22 +14,22 @@ namespace parkMonitor.server.CoreThread
|
|
|
{
|
|
|
class CoreThreadTest : IEquipments, ICoreThreadDoWorking
|
|
|
{
|
|
|
- string startRobot_address;//启动机械手地址
|
|
|
- string parkingSpaceID_address;
|
|
|
- string parkingSpaceX_address;
|
|
|
- string parkingSpaceY_address;
|
|
|
- string parkingSpaceZ_address;
|
|
|
+ //string startRobot_address;//启动机械手地址
|
|
|
+ //string parkingSpaceID_address;
|
|
|
+ //string parkingSpaceX_address;
|
|
|
+ //string parkingSpaceY_address;
|
|
|
+ //string parkingSpaceZ_address;
|
|
|
int equipmentStatus_address;//设备总控状态地址
|
|
|
int park_completed_address;//停车完成地址
|
|
|
int parkingEntX;//入口
|
|
|
int parkingEntY;
|
|
|
int parkingEntZ;
|
|
|
- string park_command_address;//启动激光
|
|
|
+ //string park_command_address;//启动激光
|
|
|
//int vehicleTypeLength_address;
|
|
|
//int vehicleTypeWidth_address;
|
|
|
//int vehicleTypeHeight_address;
|
|
|
//int vehicleTypeWheelbase_address;
|
|
|
- string parking_startRobot_address;//停车启动
|
|
|
+ //string parking_startRobot_address;//停车启动
|
|
|
int fetch_completed_address;
|
|
|
//获取PLC句柄
|
|
|
IEquipments PLC;
|
|
|
@@ -237,7 +237,7 @@ namespace parkMonitor.server.CoreThread
|
|
|
}
|
|
|
});
|
|
|
//Task.WaitAll(dataFromLaser);
|
|
|
- dataFromLaser.Wait();
|
|
|
+ dataFromLaser.Wait();
|
|
|
int centerX = 0;
|
|
|
int centerY = 0;
|
|
|
int angleA = 0;
|
|
|
@@ -296,7 +296,6 @@ namespace parkMonitor.server.CoreThread
|
|
|
//bool isDataRight = oper.IsDataRight(vehicleTypeLength, vehicleTypeWidth, vehicleTypeHeight, vehicleTypeWheelbase, vehicleTypeID);
|
|
|
//更新数据库
|
|
|
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|