Browse Source

revise robot action_ready received

chenzk 5 days ago
parent
commit
d139dd0788

+ 4 - 3
CyberX8_RT/Devices/EFEM/SunWayRobot.cs

@@ -975,12 +975,12 @@ namespace CyberX8_RT.Devices.EFEM
                 SetRobotMovingInfo(RobotAction.None, Hand.Both, ModuleName.EFEM);
                 return;
             }
-            else if (msg.StartsWith("ACTION_RDY"))
+            else if (msg.StartsWith("ACTION _RDY"))
             {
                 _isResumeRDYReceived = false;
                 _isPauseRDYReceived = false;
                 _isActionRDYReceived = true;
-                
+
                 _status = RState.End;
                 switch (_currentMessage.Operation)
                 {
@@ -1025,13 +1025,14 @@ namespace CyberX8_RT.Devices.EFEM
             {
                 _isPauseRDYReceived = true;
                 _isResumeRDYReceived = false; //收到pause把收到resume的信号置false
+                LOG.WriteLog(eEvent.INFO_TM_ROBOT, Module.ToString(), $"PAUSE_RDY was received, robot pause status is true");
             }
             else if(msg.Contains("RESUME _RDY"))
             {
                  _isResumeRDYReceived = true;
                 _isPauseRDYReceived =  false;  //收到Resume把收到pause的信号置false
-                
                 _isInPauseStatus = false; //取消pause状态
+                LOG.WriteLog(eEvent.INFO_TM_ROBOT, Module.ToString(), $"RESUME _RDY was received, robot pause status is false");
             }
             else
             {

+ 3 - 5
CyberX8_Simulator/Devices/SunWayEfemSimulator.cs

@@ -236,19 +236,17 @@ namespace CyberX8_Simulator.Devices
             else if (str.StartsWith("PAUSE"))
             {
                 Pause();
-                ack = "PAUSE_RDY";
+                ack = "PAUSE _RDY";
                 OnWriteMessage(ack);
             }
             else if(str.StartsWith("RESUME"))
             {
               
-                ack = "RESUME_RDY";
+                ack = "RESUME _RDY";
                 OnWriteMessage(ack);
                 _ = Task.Run(DelayAnswerResume); // 启动后台任务
                 Resume();
 
-
-
             }
             else //默认回复
             {
@@ -310,7 +308,7 @@ namespace CyberX8_Simulator.Devices
             Thread.Sleep((ushort)2200);
             if (_pendingAcks.Count > 0) 
             {
-                OnWriteMessage("ACTION_RDY");
+                OnWriteMessage("ACTION _RDY");
             }
         }
         private void UpdateLocked(string lpNumber,bool locked)

+ 1 - 1
CyberX8_UI/Config/UIMenu.json

@@ -560,7 +560,7 @@
 			},
 			{
 				"Id": "RdsRecipe",
-				"IsShow": "true",
+				"IsShow": "false",
 				"Name": "RDS",
 				"View": "RdsRecipeView"
 			}