|
|
@@ -79,6 +79,7 @@ namespace TeamAAS_VP.Services
|
|
|
//夹爪张开为false,夹爪闭合为True
|
|
|
await robot.CalibOutIOAsync(false);
|
|
|
}
|
|
|
+
|
|
|
var view = new ShowMessage(Lang.提示, Lang.请将校准块放置在吸嘴中心);
|
|
|
var result = await DialogHost.Show(view, "CalibToolDialog", null, null, null);
|
|
|
if (!((bool)result)) return (false, null, 0, 0, 0, 0);
|
|
|
@@ -495,8 +496,7 @@ namespace TeamAAS_VP.Services
|
|
|
|
|
|
//-------------------------------------------P0-----------------------------------
|
|
|
//移动机器人至中心点
|
|
|
-
|
|
|
- if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
+ if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown && !calibrationInfo.FixedDownCameraNoReturnToHome)
|
|
|
{
|
|
|
await robot.CalibMotionAsync(calibrationInfo.CenterPoint, 0);
|
|
|
//关闭吸气
|
|
|
@@ -514,7 +514,7 @@ namespace TeamAAS_VP.Services
|
|
|
RobotP1.X += distance;
|
|
|
RobotP2.Y += distance;
|
|
|
|
|
|
- if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
+ if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown && !calibrationInfo.FixedDownCameraNoReturnToHome)
|
|
|
{
|
|
|
//移动机器人至待机位置
|
|
|
await robot.CalibMotionAsync(calibrationInfo.HomePoint, 0);
|
|
|
@@ -529,7 +529,7 @@ namespace TeamAAS_VP.Services
|
|
|
PointF P0 = new PointF((float)result.X, (float)result.Y);
|
|
|
|
|
|
//-------------------------------------------P1-----------------------------------
|
|
|
- if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
+ if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown && !calibrationInfo.FixedDownCameraNoReturnToHome)
|
|
|
{
|
|
|
//移动机器人至P0
|
|
|
await robot.CalibMotionAsync(RobotP0, 0);
|
|
|
@@ -570,7 +570,7 @@ namespace TeamAAS_VP.Services
|
|
|
PointF P1 = new PointF((float)result.X, (float)result.Y);
|
|
|
|
|
|
//-------------------------------------------P2-----------------------------------
|
|
|
- if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
+ if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown && !calibrationInfo.FixedDownCameraNoReturnToHome)
|
|
|
{
|
|
|
//移动机器人至P1
|
|
|
await robot.CalibMotionAsync(RobotP1, 0);
|
|
|
@@ -611,7 +611,7 @@ namespace TeamAAS_VP.Services
|
|
|
PointF P2 = new PointF((float)result.X, (float)result.Y);
|
|
|
|
|
|
//-------------------------------------------P0--------------------------------------
|
|
|
- if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown)
|
|
|
+ if (calibrationInfo.CameraMount == Enums.CameraMount.FixedDown && !calibrationInfo.FixedDownCameraNoReturnToHome)
|
|
|
{
|
|
|
//移动机器人至P2
|
|
|
await robot.CalibMotionAsync(RobotP2, 0);
|