From cb3d913e147acce92bfacc34dab441abb9ab8735 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 04 三月 2025 16:24:52 +0800
Subject: [PATCH] 1.属性页面板增加关闭按钮,关闭时隐藏,默认隐藏。

---
 SourceCode/Bond/Servo/CMaster.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 04d7574..d0bd080 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -74,7 +74,7 @@
 		// 初始化添加各子设备
 		addEFEM(listener);
 
-		/*
+		
 		{
 			CBonder* pBonder = new CBonder();
 			pBonder->setName("Bonder 1");
@@ -84,7 +84,7 @@
 			addEquipment(pBonder);
 			LOGE("已添加“Bonder 1”.");
 		}
-		*/
+		
 
 		// 定时器
 		g_pMaster = this;
@@ -127,6 +127,11 @@
 		return 0;
 	}
 
+	std::list<CEquipment*>& CMaster::getEquipmentList()
+	{
+		return m_listEquipment;
+	}
+
 	CEquipment* CMaster::getEquipment(int id)
 	{
 		for (auto item : m_listEquipment) {

--
Gitblit v1.9.3