From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。
---
SourceCode/Bond/Servo/CEqModeStep.cpp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqModeStep.cpp b/SourceCode/Bond/Servo/CEqModeStep.cpp
index 3b416b2..edb3eec 100644
--- a/SourceCode/Bond/Servo/CEqModeStep.cpp
+++ b/SourceCode/Bond/Servo/CEqModeStep.cpp
@@ -19,11 +19,12 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Mode",
- std::to_string(m_nMode).c_str(), getModeDescription(strTemp).c_str()));
+ std::to_string(m_nMode).c_str(), getModeDescription(strTemp).c_str(), weight++));
attrubutes.addAttribute(new CAttribute("Mode Dev",
- std::to_string(m_nModeDev).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nModeDev, strTemp)).c_str(), "", weight++));
}
int CEqModeStep::onReadData()
@@ -31,7 +32,7 @@
CReadStep::onReadData();
DWordContainer dc;
- if (0 != m_pCclink->ReadDWordData(m_station, DeviceType::W, m_nModeDev, 1, dc)) {
+ if (0 != m_pCclink->ReadDWordDataEx(m_station, DeviceType::W, m_nModeDev, 1, dc)) {
return -2;
}
if (dc.size() < 1) {
--
Gitblit v1.9.3