浏览代码

revise pause/resume bug

chenzk 1 周之前
父节点
当前提交
2c8b87bbcf
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 2 2
      CyberX8_RT/Devices/EFEM/SunWayRobot.cs
  2. 2 0
      CyberX8_RT/Modules/EFEM/EfemEntity.cs

+ 2 - 2
CyberX8_RT/Devices/EFEM/SunWayRobot.cs

@@ -1009,13 +1009,13 @@ namespace CyberX8_RT.Devices.EFEM
                         break;
                 }
             }
-            else if (msg.Contains("PAUSE_RDY"))
+            else if (msg.Contains("PAUSE _RDY"))
             {
                 _isPauseRDYReceived = true;
                 _isResumeRDYReceived = false; //收到pause把收到resume的信号置false
 
             }
-            else if(msg.Contains("RESUME_RDY"))
+            else if(msg.Contains("RESUME _RDY"))
             {
                  _isResumeRDYReceived = true;
                 _isPauseRDYReceived =  false;  //收到Resume把收到pause的信号置false

+ 2 - 0
CyberX8_RT/Modules/EFEM/EfemEntity.cs

@@ -1208,6 +1208,7 @@ namespace CyberX8_RT.Modules
             if (ret == RState.Failed || ret == RState.Timeout)
             {
                 LOG.Write(eEvent.ERR_EFEM_COMMON_FAILED, ModuleName.EFEM, "SafeOpen Failed");
+                _isPause = false;
                 return false;
             }
             return ret == RState.End;
@@ -1219,6 +1220,7 @@ namespace CyberX8_RT.Modules
             if (ret == RState.Failed || ret == RState.Timeout)
             {
                 LOG.Write(eEvent.ERR_EFEM_COMMON_FAILED, ModuleName.EFEM, "SafeClose Failed");
+                _isResume = false;
                 return false;
             }
             return ret == RState.End;