From e7a450d2fdc99bd501e1af7dd7c16c477cfea75e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 15 三月 2025 11:56:44 +0800
Subject: [PATCH] 1.CimMessageClear(清除Cim消息)测试通过； 2.增加VCREanbleStep(启用/禁用)VCR;

---
 SourceCode/Bond/Servo/CEquipment.h |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index c10084a..ad84bee 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -3,6 +3,14 @@
 #include "CCLinkIEControl.h"
 #include "CEqModeStep.h"
 #include "CEqStatusStep.h"
+#include "CEqAlarmStep.h"
+#include "CEqProcessStep.h"
+#include "CEqCimModeChangeStep.h"
+#include "CEqModeChangeStep.h"
+#include "CEqCimMessageCmdStep.h"
+#include "CEqCimMessageClearStep.h"
+#include "CEqDateTimeSetCmdStep.h"
+#include "CEqVCREnableStep.h"
 #include <map>
 
 
@@ -45,6 +53,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);
@@ -53,6 +63,7 @@
 		std::string& getDescription();
 		void setStation(int network, int station);
 		const StationIdentifier& getStation();
+		virtual void getAttributeVector(CAttributeVector& attrubutes);
 		void setReadBitBlock(unsigned int start, unsigned int end);
 		MemoryBlock& getReadBitBlock();
 		void setWriteBitBlock(unsigned int start, unsigned int end);
@@ -60,6 +71,8 @@
 		void getProperties(std::vector<std::pair<std::string, std::string>>& container);
 		int addStep(unsigned int addr, CStep* pStep);
 		CStep* getStep(unsigned int addr);
+		CStep* getStepWithName(const char* pszName);
+		std::map<unsigned int, CStep*>& getSteps();
 		virtual void init();
 		virtual void term();
 		virtual void onTimer(UINT nTimerid);
@@ -109,6 +122,7 @@
 	private:
 		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
+		int m_nBaseAlarmId;
 	};
 }
 

--
Gitblit v1.9.3