From b13e43c3eb3881d56f0da797a4171f070bcf2413 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期四, 20 二月 2025 18:05:23 +0800
Subject: [PATCH] 1.修复状态错误的问题 2.SECS运行表完成SystemDV表和EqpDV的增删改查，并且把DV数据和SV数据的增删改查提取成一个通用函数
---
SourceCode/Bond/Servo/CMaster.h | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index ad4d0df..704b502 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -7,6 +7,13 @@
namespace SERVO {
+ typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
+ typedef struct _MasterListener
+ {
+ ONEQALIVE onEqAlive;
+ ONEQALIVE onEqCimStateChanged;
+ } MasterListener;
+
class CMaster
{
public:
@@ -15,16 +22,17 @@
public:
+ void setListener(MasterListener listener);
int init();
int term();
void onTimer(UINT nTimerid);
-
+ CEquipment* getEquipment(int id);
private:
int addEquipment(CEquipment* pEquipment);
-
private:
+ MasterListener m_listener;
CCCLinkIEControl m_cclink;
std::list<CEquipment*> m_listEquipment;
};
--
Gitblit v1.9.3