From 2af991c1c72211b3b6b7fda703846bc017bc1908 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 11:25:33 +0800
Subject: [PATCH] 1.修复上一次合并代码遗留问题；

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 2a9bd53..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>
 
 
@@ -43,6 +47,9 @@
 	public:
 		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);
@@ -58,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);
@@ -105,7 +113,9 @@
 		BOOL m_bVCREnable[VCR_MAX];
 
 	private:
+		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
+		int m_nBaseAlarmId;
 	};
 }
 

--
Gitblit v1.9.3