From f354ac6647f9d763c0119717c202e684b261d8ae Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 29 三月 2025 17:26:42 +0800
Subject: [PATCH] 1.修改逻辑，CStep不在设置和调用Listener,而是直接调用成员变量m_pEquipment的虚函数onStepEvent来传递数据。
---
SourceCode/Bond/Servo/CMaster.h | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index f3a531b..c6180cc 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -14,11 +14,12 @@
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 std::function<void(void* pMaster, CEquipment* pEquipment, int state, int alarmId, int unitId, int level)> ONEQALARM;
typedef struct _MasterListener
{
ONEQALIVE onEqAlive;
ONEQALIVE onEqCimStateChanged;
- ONEQSTEPEVENT onEqStepEvent;
+ ONEQALARM onEqAlarm;
} MasterListener;
class CMaster
@@ -39,13 +40,13 @@
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);
+ int addLoadPort(int index);
+ int addFliper();
+ int addVacuumBake();
+ int addAligner();
+ int addEFEM();
+ int addBonder(int index);
+ int addBakeCooling();
void connectEquipments();
int saveCache();
int saveCacheAndBackups();
--
Gitblit v1.9.3