|
|
|
@ -48,6 +48,15 @@ namespace Rs.MotionPlat.Flow
|
|
|
|
|
switch (homeStep)
|
|
|
|
|
{
|
|
|
|
|
case 0://所有的Z轴回原
|
|
|
|
|
string canGohome = CheckCanHome();
|
|
|
|
|
if(!string.IsNullOrEmpty(canGohome))
|
|
|
|
|
{
|
|
|
|
|
Msg.ShowError($"轴{canGohome}处于报警状态,不能回原");
|
|
|
|
|
MessageQueue.Instance.Warn($"轴{canGohome}处于报警状态,不能回原");
|
|
|
|
|
m_bCancle = true;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
MessageQueue.Instance.Insert("Z轴开始回零");
|
|
|
|
|
m_bHomed = false;
|
|
|
|
|
homeTime.Restart();
|
|
|
|
@ -74,6 +83,7 @@ namespace Rs.MotionPlat.Flow
|
|
|
|
|
//周转Z轴回原
|
|
|
|
|
AxisControl.TurnoverZ.Home();
|
|
|
|
|
homeStep++;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 1://等待所有Z轴回原完成
|
|
|
|
|
if (homeTime.ElapsedMilliseconds < 1000 * 60 * 2)//5分钟还未回零成功,则返回回零超时
|
|
|
|
|