From cc779578679f4f3b9d3ee7592ff0f7e40ad4f2d5 Mon Sep 17 00:00:00 2001 From: lhiven Date: Wed, 10 Jul 2024 16:10:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=80=A5=E5=81=9C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.DeweyTester/Flow/MonitorSystemButton.cs | 60 ++-------------------- 1 file changed, 4 insertions(+), 56 deletions(-) diff --git a/Rs.DeweyTester/Flow/MonitorSystemButton.cs b/Rs.DeweyTester/Flow/MonitorSystemButton.cs index 70bedf3..406c92b 100644 --- a/Rs.DeweyTester/Flow/MonitorSystemButton.cs +++ b/Rs.DeweyTester/Flow/MonitorSystemButton.cs @@ -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;