From 8379d72c7f16fc8850d51d0d6ed7ec7238f26edc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 14 三月 2025 15:26:42 +0800
Subject: [PATCH] 1.增加CEqDateTimeSetCmdStep; 2.相关dev读写地址用w+16进制展示；

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 731fcf9..ac64bd3 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -1,7 +1,15 @@
 #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 "CEqModeChangeStep.h"
+#include "CEqCimMessageCmdStep.h"
+#include "CEqCimMessageClearStep.h"
+#include "CEqDateTimeSetCmdStep.h"
 #include <map>
 
 
@@ -44,6 +52,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);
@@ -52,6 +62,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);
@@ -59,6 +70,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);
@@ -108,6 +121,7 @@
 	private:
 		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
+		int m_nBaseAlarmId;
 	};
 }
 

--
Gitblit v1.9.3