折叠门光栅,整机暂停

DeviceLibrary/DeviceLibrary/LiftMonitor.cs

@@ -290,7 +290,7 @@ namespace DeviceLibrary
         public int ResumeWaitTimeSec = 0;
         public int ResumeWaitTimeSec = 0;
         public void Resume()
         public void Resume()
         {
         {
-
+            ResumeSingle();
         }
         }
         public void ResumeSingle()
         public void ResumeSingle()
         {
         {

DeviceLibrary/theMachine/MainMachine.cs

@@ -638,17 +638,19 @@ namespace DeviceLibrary
                 if (IOValue(IO_Type.AGV_OnPosition).Equals(IO_VALUE.LOW))
                 if (IOValue(IO_Type.AGV_OnPosition).Equals(IO_VALUE.LOW))
                 {
                 {
                     Msg.add("料串门光栅被遮挡", MsgLevel.warning);
                     Msg.add("料串门光栅被遮挡", MsgLevel.warning);
-                    if (lastStringSafetyStatus)
-                    {
-                        lastStringSafetyStatus = false;
-                        StringDoor.Pause();
-                    }
-                }
-                else if (!lastStringSafetyStatus)
-                {
-                    StringDoor.ResumeSingle();
-                    lastStringSafetyStatus = true;
+                    //if (lastStringSafetyStatus)
+                    //{
+                    //    lastStringSafetyStatus = false;
+                    //  StringDoor.Pause();
+                    //}
+                    ok = false;
+                    DeviceSuddenStop();
                 }
                 }
+                //else if (!lastStringSafetyStatus)
+                //{
+                //    StringDoor.ResumeSingle();
+                //    lastStringSafetyStatus = true;
+                //}
             }
             }
             if (!ConfigHelper.Config.Get("Device_Disable_DoorSafeCheck", false))
             if (!ConfigHelper.Config.Get("Device_Disable_DoorSafeCheck", false))
             {
             {
@@ -688,6 +690,7 @@ namespace DeviceLibrary
                     Msg.add(msg, MsgLevel.warning);
                     Msg.add(msg, MsgLevel.warning);
                 }
                 }
                 SafetyDevice.ResumeAll();
                 SafetyDevice.ResumeAll();
+                //StringDoor.ResumeSingle();
             }
             }
             lastSafeCheckStatus = ok;
             lastSafeCheckStatus = ok;
             return ok;
             return ok;
@@ -700,6 +703,8 @@ namespace DeviceLibrary
                 AxisBean.StopMultiAxis(AxisBean.List);
                 AxisBean.StopMultiAxis(AxisBean.List);
                 MoveInfo.List.ForEach((m) => { m.CanWhileCount = 5; });
                 MoveInfo.List.ForEach((m) => { m.CanWhileCount = 5; });
                 SafetyDevice.PauseAll();
                 SafetyDevice.PauseAll();
+                StringDoor.Pause();
+                
                 if (runStatus == RunStatus.HomeReset)
                 if (runStatus == RunStatus.HomeReset)
                 {
                 {
                     ResetMoveInfo.NewMove(MoveStep.H01_HomeReset);
                     ResetMoveInfo.NewMove(MoveStep.H01_HomeReset);