From 03c02cbe095487d8412ead853da536c19f8bad2d Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Sat, 30 Dec 2023 10:36:06 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E6=AC=A1=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E6=96=99=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8CZR=E5=9B=9E=E5=8E=9F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs | 34 +++++++++++----------
 Rs.SkyLine/Flow/SubFlow/ZRHomeFlow.cs       | 11 +++++--
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
index 7aaef7d..c8a6b75 100644
--- a/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
+++ b/Rs.SkyLine/Flow/NormalFlow/DischargeFlow.cs
@@ -139,6 +139,7 @@ namespace Rs.MotionPlat.Flow
                             || LoadAndUnloadTask.Instance.GetTaskNum(ETaskType.Unload) > 0
                             || LoadAndUnloadTask.Instance.GetTaskNum(ETaskType.Change) > 0)
                         {
+                            ZRHomeFlow.Instance.Wait();
                             StockTrayToTurnoverTray = true;
                             logInfo = GetClassName()+$"接收到排料任务";
                             MessageQueue.Instance.Insert(logInfo);
@@ -1660,26 +1661,27 @@ namespace Rs.MotionPlat.Flow
                     errCode = AxisControl.LoadX.MovePos(SysConfigParam.GetValue<double>("LoadXStartPos"), GlobalVar.WholeSpeed);
                     if(errCode== ErrorCode.Ok || GlobalVar.VirtualAxis)
                     {
-                        AxisControl.NozzleZ1.Home();
-                        AxisControl.NozzleZ2.Home();
-                        AxisControl.NozzleZ3.Home();
-                        AxisControl.NozzleZ4.Home();
-                        AxisControl.NozzleZ5.Home();
-                        AxisControl.NozzleZ6.Home();
-                        AxisControl.NozzleZ7.Home();
-                        AxisControl.NozzleZ8.Home();
+                        //AxisControl.NozzleZ1.Home();
+                        //AxisControl.NozzleZ2.Home();
+                        //AxisControl.NozzleZ3.Home();
+                        //AxisControl.NozzleZ4.Home();
+                        //AxisControl.NozzleZ5.Home();
+                        //AxisControl.NozzleZ6.Home();
+                        //AxisControl.NozzleZ7.Home();
+                        //AxisControl.NozzleZ8.Home();
 
-                        AxisControl.NozzleR1.Home();
-                        AxisControl.NozzleR2.Home();
-                        AxisControl.NozzleR3.Home();
-                        AxisControl.NozzleR4.Home();
-                        AxisControl.NozzleR5.Home();
-                        AxisControl.NozzleR6.Home();
-                        AxisControl.NozzleR7.Home();
-                        AxisControl.NozzleR8.Home();
+                        //AxisControl.NozzleR1.Home();
+                        //AxisControl.NozzleR2.Home();
+                        //AxisControl.NozzleR3.Home();
+                        //AxisControl.NozzleR4.Home();
+                        //AxisControl.NozzleR5.Home();
+                        //AxisControl.NozzleR6.Home();
+                        //AxisControl.NozzleR7.Home();
+                        //AxisControl.NozzleR8.Home();
                         errCode = AxisControl.LoadY.MovePos(SysConfigParam.GetValue<double>("LoadYStartPos"), GlobalVar.WholeSpeed);
                         if(errCode== ErrorCode.Ok || GlobalVar.VirtualAxis)
                         {
+                            ZRHomeFlow.Instance.GoHome();
                             if (GlobalVar.VirtualAxis)
                             {
                                 Thread.Sleep(GlobalVar.VirtualAxisMoveTime);
diff --git a/Rs.SkyLine/Flow/SubFlow/ZRHomeFlow.cs b/Rs.SkyLine/Flow/SubFlow/ZRHomeFlow.cs
index e9858cb..7c929dd 100644
--- a/Rs.SkyLine/Flow/SubFlow/ZRHomeFlow.cs
+++ b/Rs.SkyLine/Flow/SubFlow/ZRHomeFlow.cs
@@ -32,14 +32,16 @@ namespace Rs.MotionPlat.Flow.SubFlow
                 return instance;
             }
         }
-        private ManualResetEvent homeFinished = new ManualResetEvent(false);
+        private ManualResetEvent homeFinished = new ManualResetEvent(true);
         private EZRHomeFlowStep step = EZRHomeFlowStep.StartHome;
-        bool finished = false;
+        bool finished = true;
 
         public void GoHome()
         {
+            step = EZRHomeFlowStep.StartHome;
             if (finished)
             {
+                homeFinished.Reset();
                 finished = false;
             }
             else
@@ -117,5 +119,10 @@ namespace Rs.MotionPlat.Flow.SubFlow
                 }
             });
         }
+
+        public bool Wait()
+        {
+            return homeFinished.WaitOne();
+        }
     }
 }