From 2ffaec40444a4add7d8e638e5b20a2f81daa18af Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期二, 25 二月 2025 17:27:42 +0800
Subject: [PATCH] 1. 合并代码

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 765467c..2bdbc4d 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -1,7 +1,9 @@
 #pragma once
 #include "Log.h"
 #include "CCLinkIEControl.h"
-#include "CStep.h"
+#include "CEqModeStep.h"
+#include "CEqStatusStep.h"
+#include "CEqAlarmStep.h"
 #include <map>
 
 
@@ -43,6 +45,7 @@
 	public:
 		virtual const char* getClassName() = 0;
 		virtual void setListener(EquipmentListener listener);
+		void setCcLink(CCCLinkIEControl* pCcLink);
 		void setID(int nID);
 		int getID();
 		void setName(const char* pszName);
@@ -55,6 +58,7 @@
 		MemoryBlock& getReadBitBlock();
 		void setWriteBitBlock(unsigned int start, unsigned int end);
 		MemoryBlock& getWriteBitBlock();
+		void getProperties(std::vector<std::pair<std::string, std::string>>& container);
 		int addStep(unsigned int addr, CStep* pStep);
 		CStep* getStep(unsigned int addr);
 		virtual void init();
@@ -104,6 +108,7 @@
 		BOOL m_bVCREnable[VCR_MAX];
 
 	private:
+		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
 	};
 }

--
Gitblit v1.9.3