优化回原方法

master
lhiven 2 years ago
parent bab2498327
commit aea392117e

@ -128,6 +128,20 @@ namespace Rs.MotionPlat.Commom
}
public static void GoHome()
{
if (MachineManage.Instance.MachineStatus == EMachineStatus.Homed
|| MachineManage.Instance.MachineStatus == EMachineStatus.NotInit
|| MachineManage.Instance.MachineStatus == EMachineStatus.NotHomed
)
{
HomeFlow.Instance.StartGoHome();
}
else
{
MessageQueue.Instance.Warn($"device state {MachineManage.Instance.MachineStatus} cann't home!");
}
}
public static bool IsStop(params string[] axies)
{
foreach (var axisname in axies)

@ -40,9 +40,10 @@ namespace Rs.MotionPlat.Flow
public void StartGoHome()
{
MachineManage.Instance.InitializeState = EInitializeState.Initializing ;
homeStep = 0;
m_bHomed = false;
Task.Run(() =>
{
while (true && !m_bCancle && !m_bHomed)
{
switch (homeStep)
@ -58,7 +59,6 @@ namespace Rs.MotionPlat.Flow
else
{
MessageQueue.Instance.Insert("Z轴开始回零");
m_bHomed = false;
homeTime.Restart();
MachineManage.Instance.MachineStatus = EMachineStatus.Homing;
//料仓Z轴回零

@ -58,7 +58,8 @@ namespace Rs.MotionPlat.Flow
case SchedulingStatusInfo.InfoType.InitializeState:
if(ssi.Info==EInitializeState.Initializing.ToString())
{
MonitorSystemButton.Instance.ButtonPressed(ESystemButton.ResetPressed);
Ops.GoHome();
//MonitorSystemButton.Instance.ButtonPressed(ESystemButton.ResetPressed);
}
break;
case SchedulingStatusInfo.InfoType.AssignMode:

@ -420,17 +420,7 @@ namespace Rs.MotionPlat
private void btnWholeHome_Load(object sender, EventArgs e)
{
if (MachineManage.Instance.MachineStatus == EMachineStatus.Homed
|| MachineManage.Instance.MachineStatus == EMachineStatus.NotInit
|| MachineManage.Instance.MachineStatus == EMachineStatus.NotHomed
)
{
HomeFlow.Instance.StartGoHome();
}
else
{
MessageQueue.Instance.Warn($"device state {MachineManage.Instance.MachineStatus} cann't home!");
}
Ops.GoHome();
}
private void btnSpaceRun_BtnClick(object sender, EventArgs e)

Loading…
Cancel
Save