From f631abac11b6d7c8091ed28b838a5d1f50e24825 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 19 三月 2025 18:03:37 +0800
Subject: [PATCH] 1.把CSample替换为CIntent
---
SourceCode/Bond/Servo/CMaster.h | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 3868b59..d73535e 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -3,12 +3,13 @@
#include "CEquipment.h"
#include "CEFEM.h"
#include "CBonder.h"
+#include "CLoadPort.h"
#include "CCLinkIEControl.h"
namespace SERVO {
typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
- typedef std::function<void(void* pEiuipment, CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
+ typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
typedef struct _MasterListener
{
ONEQALIVE onEqAlive;
@@ -28,11 +29,16 @@
int init();
int term();
void onTimer(UINT nTimerid);
+ std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
private:
- int addEquipment(CEquipment* pEquipment);
+ int addToEquipmentList(CEquipment* pEquipment);
+ int addLoadPort(int index, StepListener& listener);
int addEFEM(StepListener& listener);
+ int addBonder(int index, StepListener& listener);
+ void connectEquipments();
+
private:
MasterListener m_listener;
--
Gitblit v1.9.3