From e4a5ae95b07b9e13a81a5a814b052742e53ca890 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 04 三月 2025 14:52:50 +0800
Subject: [PATCH] 1.补允完Process Data的属性值列表。
---
SourceCode/Bond/Servo/CMaster.h | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index f120b12..0fefda3 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -8,9 +8,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 struct _MasterListener
{
ONEQALIVE onEqAlive;
+ ONEQALIVE onEqCimStateChanged;
+ ONEQSTEPEVENT onEqStepEvent;
} MasterListener;
class CMaster
@@ -25,11 +28,12 @@
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;
--
Gitblit v1.9.3