From f4e3d35dd0f912c303b13b48a4a3fc09ccb0a845 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 17:57:40 +0800
Subject: [PATCH] 1. 遍历设备类的属性，并显示在界面上
---
SourceCode/Bond/Servo/CEquipment.cpp | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 67a238b..b18b34b 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -7,8 +7,9 @@
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
+ m_listener = { nullptr, nullptr };
m_alive = {FALSE, 0, FALSE};
- m_listener.onAlive = {nullptr};
+ m_bCimState = FALSE;
InitializeCriticalSection(&m_criticalSection);
}
@@ -20,6 +21,16 @@
void CEquipment::setListener(EquipmentListener listener)
{
m_listener.onAlive = listener.onAlive;
+ 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"));
}
void CEquipment::init()
@@ -131,7 +142,10 @@
}
- // 解释数据
+ // 以下解释和处理数据
+
+ // alive
+ /*
BOOL bAliveFlag = isBitOn(pszData, size, 0x340);
if (m_alive.flag != bAliveFlag) {
m_alive.flag = bAliveFlag;
@@ -145,6 +159,15 @@
}
}
}
+ */
+ // CIM State
+ BOOL bCimState = isBitOn(pszData, size, 0x341);
+ if ((bCimState && !m_bCimState) || (!bCimState && m_bCimState)) {
+ m_bCimState = bCimState;
+ if (m_listener.onCimStateChanged != nullptr) {
+ m_listener.onCimStateChanged(this, m_bCimState);
+ }
+ }
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
--
Gitblit v1.9.3