From bf55b2f3083cbfdeb83611b2fa2dd552bf5b0775 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 03 三月 2025 16:20:00 +0800
Subject: [PATCH] 1.开始处理Step属性值； 2.增加左侧master面板；
---
SourceCode/Bond/Servo/CMaster.h | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index ad4d0df..0fefda3 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -7,6 +7,15 @@
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 +24,19 @@
public:
+ void setListener(MasterListener listener);
int init();
int term();
void onTimer(UINT nTimerid);
-
+ std::list<CEquipment*>& getEquipmentList();
+ CEquipment* getEquipment(int id);
private:
int addEquipment(CEquipment* pEquipment);
-
+ int addEFEM(StepListener& listener);
private:
+ MasterListener m_listener;
CCCLinkIEControl m_cclink;
std::list<CEquipment*> m_listEquipment;
};
--
Gitblit v1.9.3