From ef6c229b7dd70ef82a068ae198f23bc9a44dfad2 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 21 三月 2025 15:12:33 +0800
Subject: [PATCH] 1.修复因对齐线未清0导致点击子项自动移动的问题;

---
 SourceCode/Bond/Servo/CMaster.h |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index ad4d0df..12b8de3 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -3,10 +3,24 @@
 #include "CEquipment.h"
 #include "CEFEM.h"
 #include "CBonder.h"
+#include "CLoadPort.h"
+#include "CFliper.h"
+#include "CAligner.h"
+#include "CVacuumBake.h"
+#include "CBakeCooling.h"
 #include "CCLinkIEControl.h"
 
 
 namespace SERVO {
+    typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
+    typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
+    typedef struct _MasterListener
+    {
+        ONEQALIVE				onEqAlive;
+        ONEQALIVE		        onEqCimStateChanged;
+        ONEQSTEPEVENT		    onEqStepEvent;
+    } MasterListener;
+
     class CMaster
     {
     public:
@@ -15,16 +29,27 @@
 
 
     public:
+        void setListener(MasterListener listener);
         int init();
         int term();
         void onTimer(UINT nTimerid);
+        std::list<CEquipment*>& getEquipmentList();
+        CEquipment* getEquipment(int id);
+
+    private:
+        int addToEquipmentList(CEquipment* pEquipment);
+        int addLoadPort(int index, StepListener& listener);
+        int addFliper(StepListener& listener);
+        int addVacuumBake(StepListener& listener);
+        int addAligner(StepListener& listener);
+        int addEFEM(StepListener& listener);
+        int addBonder(int index, StepListener& listener);
+        int addBakeCooling(StepListener& listener);
+        void connectEquipments();
 
 
     private:
-        int addEquipment(CEquipment* pEquipment);
-
-
-    private:
+        MasterListener m_listener;
         CCCLinkIEControl m_cclink;
         std::list<CEquipment*> m_listEquipment;
     };

--
Gitblit v1.9.3