From 4289dfbba5033a08e9aea375f439e2ea7e0648da Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 16:23:54 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index f120b12..704b502 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -11,6 +11,7 @@
typedef struct _MasterListener
{
ONEQALIVE onEqAlive;
+ ONEQALIVE onEqCimStateChanged;
} MasterListener;
class CMaster
@@ -25,11 +26,10 @@
int init();
int term();
void onTimer(UINT nTimerid);
-
+ CEquipment* getEquipment(int id);
private:
int addEquipment(CEquipment* pEquipment);
-
private:
MasterListener m_listener;
--
Gitblit v1.9.3