From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEqReadStep.cpp | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqReadStep.cpp b/SourceCode/Bond/Servo/CEqReadStep.cpp
index c1bf97d..f4fe44f 100644
--- a/SourceCode/Bond/Servo/CEqReadStep.cpp
+++ b/SourceCode/Bond/Servo/CEqReadStep.cpp
@@ -27,9 +27,10 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
- ("W" + CToolUnits::toHexString(m_nDataDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nDataDev, strTemp)).c_str(), "", weight++));
}
int CEqReadStep::onReadData()
@@ -37,18 +38,29 @@
CReadStep::onReadData();
+ // 20250620新增，有些场景是不需要读数据的，只要检测到信息就写数据给机器
+ if (m_nReadSize == 0) {
+ if (m_onReadBlock != nullptr) {
+ m_onReadBlock(this, ROK, nullptr, 0);
+ }
+
+ return 0;
+ }
+
+
+ // 读数据
char szBuffer[READ_BUFFER_MAX];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nDataDev,
(long)min(READ_BUFFER_MAX, m_nReadSize), szBuffer);
if (0 != nRet) {
- LOGI("<CEqReadStep>Read data error.");
+ LOGE("<CEqReadStep>Read data error.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, RERROR, nullptr, 0);
}
return -1;
}
- LOGI("<CEqReadStep>read data succeed.");
+ LOGD("<CEqReadStep>read data succeed.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, ROK, szBuffer, m_nReadSize);
}
@@ -60,7 +72,7 @@
int CEqReadStep::onComplete()
{
CReadStep::onComplete();
- LOGI("<CEqReadStep> onComplete.");
+ LOGD("<CEqReadStep> onComplete.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, RCOMPLETE, nullptr, 0);
}
@@ -71,7 +83,7 @@
int CEqReadStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqReadStep> onTimeout.");
+ LOGE("<CEqReadStep> onTimeout.");
if (m_onReadBlock != nullptr) {
m_onReadBlock(this, RTIMEOUT, nullptr, 0);
}
--
Gitblit v1.9.3