From 19261d011387ec57d646decc945aadaf8913eeab Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 09:05:54 +0800
Subject: [PATCH] Merge branch 'clh'

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 2bdbc4d..c13e71e 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -4,6 +4,8 @@
 #include "CEqModeStep.h"
 #include "CEqStatusStep.h"
 #include "CEqAlarmStep.h"
+#include "CEqProcessStep.h"
+#include "CEqCimModeChangeStep.h"
 #include <map>
 
 
@@ -46,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);
@@ -61,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);
@@ -110,6 +115,7 @@
 	private:
 		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
+		int m_nBaseAlarmId;
 	};
 }
 

--
Gitblit v1.9.3