From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期三, 22 十月 2025 14:24:34 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/BoounionPLC/Model.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/BoounionPLC/Model.h b/SourceCode/Bond/BoounionPLC/Model.h index b02b2de..55401e4 100644 --- a/SourceCode/Bond/BoounionPLC/Model.h +++ b/SourceCode/Bond/BoounionPLC/Model.h @@ -20,6 +20,10 @@ int addPlc(const char* pszName, const char* pszIp, const unsigned int port); int removePlc(const char* pszName); + // 设置/获取当前PLC + void setCurrentPlc(CPLC* pPlc); + CPLC* getCurrentPlc(); + public: int notify(int code); int notifyPtr(int code, void* ptr = NULL); @@ -37,12 +41,12 @@ public: CConfiguration m_configuration; - private: IObservable* m_pObservable; IObservableEmitter* m_pObservableEmitter; CString m_strWorkDir; std::map<std::string, CPLC*> m_mapPlc; + CPLC* m_pActivePlc; private: int m_nTimerID; -- Gitblit v1.9.3