From 6d106eb1bb92dc235bcbda976ae232729bf52c7c Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 25 十一月 2024 13:46:15 +0800
Subject: [PATCH] 合并代码
---
SourceCode/Bond/BondEq/CBonder.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CBonder.h b/SourceCode/Bond/BondEq/CBonder.h
index 295cac7..c932b47 100644
--- a/SourceCode/Bond/BondEq/CBonder.h
+++ b/SourceCode/Bond/BondEq/CBonder.h
@@ -20,7 +20,6 @@
typedef std::function<void(void* pFrom, int)> ONBONDSTATECHANGED;
typedef std::function<void(void* pFrom, int)> ONPLCSTATECHANGED;
-typedef std::function<void(void* pFrom, int)> ONCIMSTATECHANGED;
typedef std::function<void(void* pFrom, const char* pszAddr, int port, int)> ONEFEMSTATECHANGED;
typedef std::function<void(void* pFrom, void*)> ONRECVBROADCAST;
@@ -28,7 +27,6 @@
{
ONBONDSTATECHANGED onStateChanged;
ONPLCSTATECHANGED onPlcStateChanged;
- ONCIMSTATECHANGED onCimStateChanged;
ONEFEMSTATECHANGED onEfemStateChanged;
ONRECVBROADCAST onRecvBroadcast;
} BondListener;
@@ -44,6 +42,7 @@
void setListener(BondListener& listener);
void setWorkDir(const char* pszWorkDir);
const std::vector<CComponent*>& getComponents();
+ CPLC* getPLC(const char* pszName);
int init();
int term();
void sendBroadcast(CComponent* pSender, CIntent* pIntent);
--
Gitblit v1.9.3