From 4d1e6979820d9aaf27890a833ae0fcb6959e8637 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 27 二月 2025 15:33:03 +0800
Subject: [PATCH] 1.完善警告信息，打通CC-Link获取警告信息到通过SECS上报警告信息的路径。
---
SourceCode/Bond/Servo/CMaster.h | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index ad4d0df..73ae99b 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -7,6 +7,15 @@
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
{
public:
@@ -15,16 +24,18 @@
public:
+ void setListener(MasterListener listener);
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;
CCCLinkIEControl m_cclink;
std::list<CEquipment*> m_listEquipment;
};
--
Gitblit v1.9.3