lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

二段速问题修复

Browse Source
master
lhiven 1 year ago
parent b8eccd6b6d
commit d7ec501d05
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File

27
Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save