@ -227,7 +227,7 @@ namespace Rs.MotionPlat.Commom
}
public static void Stop()
public static void Stop(Action act=null)
{
if(MachineManage.Instance.MachineStatus== EMachineStatus.Working)
@ -252,7 +252,7 @@ namespace Rs.MotionPlat.Commom
HomeFlow.Instance.CancleHome();
MachineManage.Instance.SetLocalMachineStatus(EMachineStatus.HomeFail);
act?.Invoke();
public static void GoHome()
@ -246,6 +246,13 @@ namespace Rs.MotionPlat.Flow
case EInstruction.ChangeState:
SchedulingResult cs = JsonConvert.DeserializeObject<SchedulingResult>(msg);
client.Send(cs.ToString());
if(cs.State== ERunState.Error)
MessageQueue.Instance.Insert("中控报警");
Ops.Stop(() => {
LightManger.Instance.SetStatus(ELightStatus.Red);
});
ReplayTaskEvent?.Invoke(cs.ToString());
break;
case EInstruction.ShowMessage:
@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
[assembly: AssemblyVersion("3.20.24.22")]
[assembly: AssemblyVersion("3.20.24.24")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]