From 6df6302161eb6021ad3c324d7a3f5494c63dc21e Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 08:39:53 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index ad4d0df..f120b12 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -7,6 +7,12 @@
namespace SERVO {
+ typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
+ typedef struct _MasterListener
+ {
+ ONEQALIVE onEqAlive;
+ } MasterListener;
+
class CMaster
{
public:
@@ -15,6 +21,7 @@
public:
+ void setListener(MasterListener listener);
int init();
int term();
void onTimer(UINT nTimerid);
@@ -25,6 +32,7 @@
private:
+ MasterListener m_listener;
CCCLinkIEControl m_cclink;
std::list<CEquipment*> m_listEquipment;
};
--
Gitblit v1.9.3