|
|
|
@ -374,12 +374,14 @@ namespace Rs.MotionPlat.Flow
|
|
|
|
|
if(GlobalVar.EnableTwoSpeed)
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("TurnoverTakeZ") + GlobalVar.CloseVacOffsetHeight;
|
|
|
|
|
errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("TurnoverSafeZ");
|
|
|
|
|
errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.WholeSpeed);
|
|
|
|
|
}
|
|
|
|
|
errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.WholeSpeed);
|
|
|
|
|
|
|
|
|
|
if (errCode == Motion.ErrorCode.Ok || GlobalVar.VirtualAxis)
|
|
|
|
|
{
|
|
|
|
|
if (GlobalVar.VirtualAxis)
|
|
|
|
@ -1005,14 +1007,6 @@ namespace Rs.MotionPlat.Flow
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case ETurnoverFlowStep.测试完成抬起到高速位:
|
|
|
|
|
if(GlobalVar.EnableTwoSpeed)
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("PressZ") + GlobalVar.PressLowSpeedOffset;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("PressSafeZ");
|
|
|
|
|
}
|
|
|
|
|
double curPos = Ops.GetCurPosition(AxisAlias.PressZ);
|
|
|
|
|
if(Math.Abs(curPos-targetPos)<0.1)
|
|
|
|
|
{
|
|
|
|
@ -1020,7 +1014,16 @@ namespace Rs.MotionPlat.Flow
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
errCode = AxisControl.PressZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
|
|
|
|
|
if (GlobalVar.EnableTwoSpeed)
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("PressZ") + GlobalVar.PressLowSpeedOffset;
|
|
|
|
|
errCode = AxisControl.PressZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("PressSafeZ");
|
|
|
|
|
errCode = AxisControl.PressZ.MovePos(targetPos, GlobalVar.WholeSpeed);
|
|
|
|
|
}
|
|
|
|
|
if (errCode == Motion.ErrorCode.Ok || GlobalVar.VirtualAxis)
|
|
|
|
|
{
|
|
|
|
|
if (GlobalVar.VirtualAxis)
|
|
|
|
@ -1611,12 +1614,14 @@ namespace Rs.MotionPlat.Flow
|
|
|
|
|
if(GlobalVar.EnableTwoSpeed)
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("TurnoverTakeZ") + GlobalVar.PressLowSpeedOffset;
|
|
|
|
|
errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
targetPos = SysConfigParam.GetValue<double>("TurnoverSafeZ");
|
|
|
|
|
errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.WholeSpeed);
|
|
|
|
|
}
|
|
|
|
|
errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed);
|
|
|
|
|
|
|
|
|
|
if(errCode == Motion.ErrorCode.Ok || GlobalVar.VirtualAxis)
|
|
|
|
|
{
|
|
|
|
|
if (GlobalVar.VirtualAxis)
|
|
|
|
|