From c8173fa96f226ff88412d07955fb340de4681ffc Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期四, 06 三月 2025 11:21:34 +0800 Subject: [PATCH] 1.实现 CIM model change指令下发到机器。与之前的从CC link读数据逻辑稍有不同,下发指令为写数据,因此,从原CStep派生两个类,CReadStep(用于读数据),CWriteStep(用于写数据),然后根据使用场景选择合适的基数做应用层逻辑。已完成待测试验证 --- SourceCode/Bond/Servo/CEquipment.h | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index 731fcf9..c13e71e 100644 --- a/SourceCode/Bond/Servo/CEquipment.h +++ b/SourceCode/Bond/Servo/CEquipment.h @@ -1,7 +1,11 @@ #pragma once #include "Log.h" #include "CCLinkIEControl.h" -#include "CStep.h" +#include "CEqModeStep.h" +#include "CEqStatusStep.h" +#include "CEqAlarmStep.h" +#include "CEqProcessStep.h" +#include "CEqCimModeChangeStep.h" #include <map> @@ -44,6 +48,8 @@ virtual const char* getClassName() = 0; virtual void setListener(EquipmentListener listener); void setCcLink(CCCLinkIEControl* pCcLink); + void setBaseAlarmId(int nBaseId); + int getBaseAlarmId(); void setID(int nID); int getID(); void setName(const char* pszName); @@ -59,6 +65,7 @@ void getProperties(std::vector<std::pair<std::string, std::string>>& container); int addStep(unsigned int addr, CStep* pStep); CStep* getStep(unsigned int addr); + std::map<unsigned int, CStep*>& getSteps(); virtual void init(); virtual void term(); virtual void onTimer(UINT nTimerid); @@ -108,6 +115,7 @@ private: CCCLinkIEControl* m_pCclink; std::map<unsigned int, CStep*> m_mapStep; + int m_nBaseAlarmId; }; } -- Gitblit v1.9.3