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

优化急停功能

Browse Source
master
lhiven 1 year ago
parent 04361cf30f
commit cc77957867
1 changed files with 4 additions and 56 deletions
Show Stats Download Patch File Download Diff File

60
Rs.DeweyTester/Flow/MonitorSystemButton.cs
Unescape Escape View File

@ -93,13 +93,7 @@ namespace Rs.MotionPlat.Flow
switch (step)
{
case EMonitorButtonStep.Monitoring:
signalValue = IoManager.Instance.ReadIn("前急停");
if(signalValue==0 || (buttonValue == ESystemButton.EStopPressed))
{
step = EMonitorButtonStep.EStopButtonPressed;
break;
}
signalValue = IoManager.Instance.ReadIn("后急停");
signalValue = IoManager.Instance.ReadIn("急停");
if (signalValue == 0 || (buttonValue == ESystemButton.EStopPressed))
{
step = EMonitorButtonStep.EStopButtonPressed;
@ -118,57 +112,11 @@ namespace Rs.MotionPlat.Flow
break;
}
signalValue = IoManager.Instance.ReadIn("复位");
//if (signalValue == 1 || (buttonValue == ESystemButton.ResetPressed))
if ((buttonValue == ESystemButton.ResetPressed))
{
step = EMonitorButtonStep.ResetButtonPressed;
break;
}
//if(MachineManage.Instance.MachineStatus== EMachineStatus.Working)
//{
// if (!GlobalVar.DisableDoor)
// {
// signalValue = IoManager.Instance.ReadIn("后安全门禁");
// if (signalValue == 0)
// {
// step = EMonitorButtonStep.DoorOpend;
// break;
// }
// }
// if(!GlobalVar.DisableCheckSocketLock)
// {
// if (IoManager.Instance.ReadIn("左前固定气缸动位") == 0 ||
// IoManager.Instance.ReadIn("左后固定气缸动位") == 0 ||
// IoManager.Instance.ReadIn("右前固定气缸动位") == 0 ||
// IoManager.Instance.ReadIn("右后固定气缸动位") == 0)
// {
// step = EMonitorButtonStep.SocketUnlock;
// break;
// }
// }
//}
signalValue = IoManager.Instance.ReadIn("照明");
if (signalValue == 1)
{
step = EMonitorButtonStep.LightButtonPressed;
break;
}
signalValue = IoManager.Instance.ReadIn("跳过");
if (signalValue == 1)
{
step = EMonitorButtonStep.SkipButtonPressed;
break;
}
signalValue = IoManager.Instance.ReadIn("重试");
if (signalValue == 1)
{
step = EMonitorButtonStep.RetryButtonPressed;
break;
}
break;
case EMonitorButtonStep.EStopButtonPressed:
MessageQueue.Instance.Insert("急停按钮按下");
@ -181,11 +129,11 @@ namespace Rs.MotionPlat.Flow
step = EMonitorButtonStep.EStopButtonUp;
break;
case EMonitorButtonStep.EStopButtonUp:
signalValue = IoManager.Instance.ReadIn("前急停");
if (((IoManager.Instance.ReadIn("前急停") == 1)&& ((IoManager.Instance.ReadIn("后急停") == 1))) || (buttonValue == ESystemButton.ResetPressed))
signalValue = IoManager.Instance.ReadIn("急停");
if (((IoManager.Instance.ReadIn("急停") == 1)) || (buttonValue == ESystemButton.ResetPressed))
{
buttonValue = ESystemButton.None;
//AxisManager.AllEnable();
AxisControl.AllEnable();
MachineManage.Instance.MachineStatus = EMachineStatus.NotHomed;
MessageQueue.Instance.Insert("急停按钮抬起");
step = EMonitorButtonStep.Monitoring;

Write Preview
Loading…
Cancel
Save