|
|
@@ -62,7 +62,7 @@ namespace TeamAAS_VP.Services
|
|
|
Matrix<double> RobotCameraRotationMatrix = null;
|
|
|
|
|
|
//移动机器人至待机位置
|
|
|
- bool isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ bool isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -112,7 +112,7 @@ namespace TeamAAS_VP.Services
|
|
|
RPoint RobotU = calibrationInfo.CenterPoint.Clone();
|
|
|
RobotU.U += (float)calibrationInfo.Angle;
|
|
|
//移动机器人中心点
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -125,7 +125,7 @@ namespace TeamAAS_VP.Services
|
|
|
await robot.CalibOutIOAsync(true);
|
|
|
|
|
|
//机器人U轴旋转
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotU, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotU, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -138,7 +138,7 @@ namespace TeamAAS_VP.Services
|
|
|
//关闭吸气
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -164,7 +164,7 @@ namespace TeamAAS_VP.Services
|
|
|
double offsety = (P0.Y - curPixel.Y) * pixelScaleY;
|
|
|
var pos = RobotCameraRotationMatrix.Inverse() * Vector<double>.Build.Dense(new double[] { offsetx, offsety });
|
|
|
//移动机器人取标定块
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotU, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotU, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -179,7 +179,7 @@ namespace TeamAAS_VP.Services
|
|
|
RobotU.X += (float)pos[0];
|
|
|
RobotU.Y += (float)pos[1];
|
|
|
//机器人移动
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotU, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotU, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -192,7 +192,7 @@ namespace TeamAAS_VP.Services
|
|
|
//关闭吸气
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -214,7 +214,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (Math.Abs(offsetx) < 1 && Math.Abs(offsetx) < 1)
|
|
|
{
|
|
|
//移动机器人取标定块
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotU, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotU, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -226,7 +226,7 @@ namespace TeamAAS_VP.Services
|
|
|
//打开吸气
|
|
|
await robot.CalibOutIOAsync(true);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -282,7 +282,7 @@ namespace TeamAAS_VP.Services
|
|
|
Matrix<double> RobotCameraRotationMatrix = null;
|
|
|
|
|
|
//移动机器人至中心位置
|
|
|
- bool isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, 0);
|
|
|
+ bool isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -374,7 +374,7 @@ namespace TeamAAS_VP.Services
|
|
|
Matrix<double> RobotCameraRotationMatrix = null;
|
|
|
|
|
|
//移动机器人至中心位置
|
|
|
- bool isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, 0);
|
|
|
+ bool isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0, 0, 0);
|
|
|
@@ -544,7 +544,7 @@ namespace TeamAAS_VP.Services
|
|
|
bool isSuccess = false;
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -571,7 +571,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -590,7 +590,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至P0
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotP0, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotP0, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -602,7 +602,7 @@ namespace TeamAAS_VP.Services
|
|
|
//打开吸气
|
|
|
await robot.CalibOutIOAsync(true);
|
|
|
//移动机器人至P1
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotP1, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotP1, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -614,7 +614,7 @@ namespace TeamAAS_VP.Services
|
|
|
//关闭吸气
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -647,7 +647,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至P1
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotP1, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotP1, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -659,7 +659,7 @@ namespace TeamAAS_VP.Services
|
|
|
//打开吸气
|
|
|
await robot.CalibOutIOAsync(true);
|
|
|
//移动机器人至P2
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotP2, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotP2, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -671,7 +671,7 @@ namespace TeamAAS_VP.Services
|
|
|
//关闭吸气
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -704,7 +704,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至P2
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotP2, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotP2, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -716,7 +716,7 @@ namespace TeamAAS_VP.Services
|
|
|
//打开吸气
|
|
|
await robot.CalibOutIOAsync(true);
|
|
|
//移动机器人至P0
|
|
|
- isSuccess = await robot.CalibMotionAsync(RobotP0, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(RobotP0, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -728,7 +728,7 @@ namespace TeamAAS_VP.Services
|
|
|
//关闭吸气
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, 0, 0);
|
|
|
@@ -902,7 +902,7 @@ namespace TeamAAS_VP.Services
|
|
|
{
|
|
|
|
|
|
//移动机器人至中心位置
|
|
|
- isSuccess=await robot.CalibMotionAsync(calibrationInfo.CenterPoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, null, null);
|
|
|
@@ -1088,7 +1088,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.MobileJ4)
|
|
|
{
|
|
|
//移动机器人至中心位置
|
|
|
- isSuccess= await robot.CalibMotionAsync(calibrationInfo.CenterPoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.CenterPoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, null, null);
|
|
|
@@ -1118,7 +1118,7 @@ namespace TeamAAS_VP.Services
|
|
|
//移动机器人至i
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
- isSuccess= await robot.CalibMotionAsync(rPoints[i], 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(rPoints[i], null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, null, null);
|
|
|
@@ -1130,7 +1130,7 @@ namespace TeamAAS_VP.Services
|
|
|
//关闭吸气
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess= await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, null, null);
|
|
|
@@ -1138,7 +1138,7 @@ namespace TeamAAS_VP.Services
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- isSuccess= await robot.CalibMotionAsync(rPoints[i], rPoints[i].Z);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(rPoints[i], rPoints[i].Z);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, null, null);
|
|
|
@@ -1161,7 +1161,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至i
|
|
|
- isSuccess= await robot.CalibMotionAsync(rPoints[i], 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(rPoints[i], null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, null, null);
|
|
|
@@ -1188,7 +1188,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null, null, null);
|
|
|
@@ -1437,7 +1437,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至i
|
|
|
- isSuccess= await robot.CalibMotionAsync(rPoints[i], 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(rPoints[i], null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null);
|
|
|
@@ -1449,7 +1449,7 @@ namespace TeamAAS_VP.Services
|
|
|
//关闭吸气
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess= await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null);
|
|
|
@@ -1458,7 +1458,7 @@ namespace TeamAAS_VP.Services
|
|
|
else
|
|
|
{
|
|
|
//移动机器人至i
|
|
|
- isSuccess = await robot.CalibMotionAsync(rPoints[i], rPoints[i].Z);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(rPoints[i], rPoints[i].Z);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null);
|
|
|
@@ -1483,7 +1483,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至i
|
|
|
- isSuccess = await robot.CalibMotionAsync(rPoints[i], 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(rPoints[i], null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null);
|
|
|
@@ -1501,7 +1501,7 @@ namespace TeamAAS_VP.Services
|
|
|
if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
{
|
|
|
//移动机器人至待机位置
|
|
|
- isSuccess= await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
+ isSuccess = await robot.CalibMotionAsync(calibrationInfo.HomePoint, null);
|
|
|
if (!isSuccess)
|
|
|
{
|
|
|
return (false, null);
|