From 4acd7cfd96f2099772497713e17ca8bfaf5cf4ec Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 25 二月 2025 14:35:17 +0800
Subject: [PATCH] 1.CStep完善；
---
SourceCode/Bond/Servo/CMaster.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index f120b12..3868b59 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(void* pEiuipment, CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
typedef struct _MasterListener
{
ONEQALIVE onEqAlive;
+ ONEQALIVE onEqCimStateChanged;
+ ONEQSTEPEVENT onEqStepEvent;
} MasterListener;
class CMaster
@@ -25,11 +28,11 @@
int init();
int term();
void onTimer(UINT nTimerid);
-
+ CEquipment* getEquipment(int id);
private:
int addEquipment(CEquipment* pEquipment);
-
+ int addEFEM(StepListener& listener);
private:
MasterListener m_listener;
--
Gitblit v1.9.3