From 69d1e03745175dadece54b1dfce0738d5b5d8961 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 19 二月 2025 15:54:47 +0800
Subject: [PATCH] Merge branch 'master' into clh
---
SourceCode/Bond/Servo/DevicePropertyDlg.cpp | 2 +-
SourceCode/Bond/Servo/CEquipment.cpp | 9 +++++++++
SourceCode/Bond/Servo/CEquipment.h | 1 +
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 33156a2..2a592fa 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -34,6 +34,15 @@
m_listener.onCimStateChanged = listener.onCimStateChanged;
}
+ void CEquipment::getProperties(std::vector<std::pair<std::string, std::string>>& container)
+ {
+ container.clear();
+ // 示例：将一些属性添加到容器
+ container.push_back(std::make_pair("DeviceName", "ServoMotor"));
+ container.push_back(std::make_pair("SerialNumber", "123456789"));
+ container.push_back(std::make_pair("Version", "1.0"));
+ }
+
CStep* CEquipment::getStep(unsigned int addr)
{
auto iter = m_mapStep.find(addr);
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 765467c..2a9bd53 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -55,6 +55,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();
diff --git a/SourceCode/Bond/Servo/DevicePropertyDlg.cpp b/SourceCode/Bond/Servo/DevicePropertyDlg.cpp
index 8a115d2..82f4c6f 100644
--- a/SourceCode/Bond/Servo/DevicePropertyDlg.cpp
+++ b/SourceCode/Bond/Servo/DevicePropertyDlg.cpp
@@ -51,7 +51,7 @@
// 鑾峰彇鎵�鏈夎澶囧睘鎬�
std::vector<std::pair<std::string, std::string>> properties;
- //pEquipment->getProperties(properties);
+ pEquipment->getProperties(properties);
// 鑾峰彇ListCtrl鐨勫鎴峰尯鍩�
CRect rect;
--
Gitblit v1.9.3