diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 39f197e..61f71ae 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -374,12 +374,14 @@ namespace Rs.MotionPlat.Flow if(GlobalVar.EnableTwoSpeed) { targetPos = SysConfigParam.GetValue("TurnoverTakeZ") + GlobalVar.CloseVacOffsetHeight; + errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed); } else { targetPos = SysConfigParam.GetValue("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("PressZ") + GlobalVar.PressLowSpeedOffset; - } - else - { - targetPos = SysConfigParam.GetValue("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("PressZ") + GlobalVar.PressLowSpeedOffset; + errCode = AxisControl.PressZ.MovePos(targetPos, GlobalVar.PressLowSpeed); + } + else + { + targetPos = SysConfigParam.GetValue("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("TurnoverTakeZ") + GlobalVar.PressLowSpeedOffset; + errCode = AxisControl.TurnoverZ.MovePos(targetPos, GlobalVar.PressLowSpeed); } else { targetPos = SysConfigParam.GetValue("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)