From 4897210a25e7c98ddacb1fa4ecee3e8bdd1ae98e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 六月 2025 14:18:16 +0800
Subject: [PATCH] 1.手臂选择匹配问题,

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

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 0fefda3..f918d48 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -3,42 +3,123 @@
 #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 "CMeasurement.h"
+#include "CArm.h"
+#include "CArmTray.h"
 #include "CCLinkIEControl.h"
+#include "CRobotTask.h"
 
 
 namespace SERVO {
+    enum MASTERSTATE {
+        READY = 0,
+        STARTING,
+        RUNNING,
+        STOPPING
+    };
+
+    typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
     typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
     typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
+    typedef std::function<void(void* pMaster, CEquipment* pEquipment, int state, int alarmId, int unitId, int level)> ONEQALARM;
+    typedef std::function<void(void* pMaster, CEquipment* pEquipment, CVcrEventReport* pReport)> ONEQVCREVENTREPORT;
+    typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
+    typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
     typedef struct _MasterListener
     {
+        ONMASTERSTATECHANGED    onMasterStateChanged;
         ONEQALIVE				onEqAlive;
         ONEQALIVE		        onEqCimStateChanged;
-        ONEQSTEPEVENT		    onEqStepEvent;
+        ONEQALARM               onEqAlarm;
+        ONEQVCREVENTREPORT	    onEqVcrEventReport;
+        ONEQDATACHANGED         onEqDataChanged;
+        ONROBOTTASKEVENT        onRobotTaskEvent;
     } MasterListener;
 
     class CMaster
     {
     public:
         CMaster();
-        ~CMaster();
+        virtual ~CMaster();
 
 
     public:
         void setListener(MasterListener listener);
+        CRobotTask* getActiveRobotTask();
         int init();
         int term();
+        int start();
+        int stop();
+        ULONGLONG getRunTime();
+        MASTERSTATE getState();
+        unsigned DispatchProc();
+        unsigned ReadBitsProc();
         void onTimer(UINT nTimerid);
         std::list<CEquipment*>& getEquipmentList();
         CEquipment* getEquipment(int id);
+        void setCacheFilepath(const char* pszFilepath);
+        int abortCurrentTask();
 
     private:
-        int addEquipment(CEquipment* pEquipment);
-        int addEFEM(StepListener& listener);
+        inline void lock() { EnterCriticalSection(&m_criticalSection); }
+        inline void unlock() { LeaveCriticalSection(&m_criticalSection); }
+        int addToEquipmentList(CEquipment* pEquipment);
+        CLoadPort* addLoadPort(int index);
+        CFliper* addFliper();
+        CVacuumBake* addVacuumBake();
+        CAligner* addAligner();
+        CEFEM* addEFEM();
+        CArm* addArm();
+        CArmTray* addArmTray(int index);
+        CBonder* addBonder(int index);
+        CBakeCooling* addBakeCooling();
+        CMeasurement* addMeasurement();
+        void connectEquipments();
+        int saveCache();
+        int saveCacheAndBackups();
+        int readCache();
+        void serialize(CArchive& ar);
+        void setState(MASTERSTATE state);
+        CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
+            MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2,
+            int armNo = 1);
+        CRobotTask* createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq);
+        CRobotTask* createTransferTask_bake_to_cooling(CEquipment* pSrcEq);
+        CRobotTask* createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq);
 
     private:
+        CRITICAL_SECTION m_criticalSection;
         MasterListener m_listener;
         CCCLinkIEControl m_cclink;
         std::list<CEquipment*> m_listEquipment;
+        std::string m_strFilepath;
+        BOOL m_bDataModify;
+
+    private:
+        /* 监控比特位的线程*/
+        HANDLE m_hEventReadBitsThreadExit[2];
+        HANDLE m_hReadBitsThreadHandle;
+        unsigned m_nReadBitsThreadAddr;
+
+        // 调度线程
+        HANDLE m_hDispatchEvent;
+        HANDLE m_hEventDispatchThreadExit[2];
+        HANDLE m_hDispatchThreadHandle;
+        unsigned m_nDispatchThreadAddr;
+
+        // 启动时间,运行时间,状态
+        ULONGLONG m_ullStartTime;
+        ULONGLONG m_ullRunTime;
+        MASTERSTATE m_state;
+
+        // 当前任务和已完成任务列表
+        CRobotTask* m_pActiveRobotTask;
+        std::list< CRobotTask* > m_listTask;
     };
 }
 

--
Gitblit v1.9.3