From ec2b63378e47ac0aba4e0265b63a5cd26e373a32 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 26 五月 2025 18:02:57 +0800
Subject: [PATCH] 1.添加了状态栏;

---
 SourceCode/Bond/Servo/CMaster.h |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 073a460..2a0286b 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -8,6 +8,9 @@
 #include "CAligner.h"
 #include "CVacuumBake.h"
 #include "CBakeCooling.h"
+#include "CMeasurement.h"
+#include "CArm.h"
+#include "CArmTray.h"
 #include "CCLinkIEControl.h"
 
 
@@ -16,12 +19,14 @@
     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 struct _MasterListener
     {
         ONEQALIVE				onEqAlive;
         ONEQALIVE		        onEqCimStateChanged;
         ONEQALARM               onEqAlarm;
         ONEQVCREVENTREPORT	    onEqVcrEventReport;
+        ONEQDATACHANGED         onEqDataChanged;
     } MasterListener;
 
     class CMaster
@@ -35,6 +40,8 @@
         void setListener(MasterListener listener);
         int init();
         int term();
+        int start();
+        int stop();
         unsigned ReadBitsProc();
         void onTimer(UINT nTimerid);
         std::list<CEquipment*>& getEquipmentList();
@@ -43,13 +50,16 @@
 
     private:
         int addToEquipmentList(CEquipment* pEquipment);
-        int addLoadPort(int index);
-        int addFliper();
-        int addVacuumBake();
-        int addAligner();
-        int addEFEM();
-        int addBonder(int index);
-        int addBakeCooling();
+        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();

--
Gitblit v1.9.3