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/CWriteStep.cpp | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CWriteStep.cpp b/SourceCode/Bond/Servo/CWriteStep.cpp
index 5414b12..2e79b5a 100644
--- a/SourceCode/Bond/Servo/CWriteStep.cpp
+++ b/SourceCode/Bond/Servo/CWriteStep.cpp
@@ -55,6 +55,18 @@
m_nWriteSignalDev = dev;
}
+ void CWriteStep::setRetDataDev(int dev, int size)
+ {
+ m_nReturnDevNo = dev;
+ m_nReturnDataSize = size;
+ }
+
+ int CWriteStep::getReturnData(const char*& pszData)
+ {
+ pszData = m_szReturnBuf;
+ return m_nReturnDataSize;
+ }
+
void CWriteStep::onRecvSignal(BOOL bSignal)
{
Lock();
@@ -89,9 +101,9 @@
// 1.写数据
nextStep();
ASSERT(m_pCclink);
- int nRet = m_pCclink->WriteData(m_station, (short)DeviceType::W,
+ int nWriteRet = m_pCclink->WriteData(m_station, (short)DeviceType::W,
m_nWriteDevNo, m_nWriteDataSize, (short*)m_szBuffer);
- if (0 != nRet) {
+ if (0 != nWriteRet) {
onTimeout();
goto RESET;
}
@@ -111,6 +123,18 @@
goto RESET;
}
ResetEvent(m_hRecvSignalOn);
+
+
+ // 3.9读数据，如果有
+ if (m_nReturnDataSize > 0) {
+ int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nReturnDevNo,
+ (long)min(READ_BUFFER_MAX, m_nReturnDataSize), m_szReturnBuf);
+ if (0 != nRet) {
+ LOGI("<CEqReadStep>Read return data error.");
+ onReadRetDataError();
+ return -1;
+ }
+ }
// 4.写OFF
@@ -141,10 +165,11 @@
CStep::getAttributeVector(attrubutes);
std::string temp;
+ unsigned int weight = 20;
attrubutes.addAttribute(new CAttribute("Current Step",
- std::to_string(m_nCurStep).c_str(), ""));
+ std::to_string(m_nCurStep).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Signal Dev",
- ("W" + CToolUnits::toHexString(m_nWriteSignalDev, temp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nWriteSignalDev, temp)).c_str(), "", weight++));
}
void CWriteStep::init()
@@ -195,4 +220,9 @@
{
return 0;
}
+
+ int CWriteStep::onReadRetDataError()
+ {
+ return 0;
+ }
}
--
Gitblit v1.9.3