From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。
---
SourceCode/Bond/Servo/CEqModeStep.cpp | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqModeStep.cpp b/SourceCode/Bond/Servo/CEqModeStep.cpp
index 888117b..edb3eec 100644
--- a/SourceCode/Bond/Servo/CEqModeStep.cpp
+++ b/SourceCode/Bond/Servo/CEqModeStep.cpp
@@ -4,7 +4,7 @@
namespace SERVO {
- CEqModeStep::CEqModeStep() : CStep()
+ CEqModeStep::CEqModeStep() : CReadStep()
{
m_nModeDev = 0;
m_nMode = 0;
@@ -15,12 +15,24 @@
}
+ void CEqModeStep::getAttributeVector(CAttributeVector& attrubutes)
+ {
+ 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(), weight++));
+ attrubutes.addAttribute(new CAttribute("Mode Dev",
+ ("W" + CToolUnits::toHexString(m_nModeDev, strTemp)).c_str(), "", weight++));
+ }
+
int CEqModeStep::onReadData()
{
- CStep::onReadData();
+ 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) {
@@ -37,7 +49,7 @@
int CEqModeStep::onComplete()
{
- CStep::onComplete();
+ CReadStep::onComplete();
LOGI("<CEqModeStep> onComplete.");
return 0;
@@ -45,7 +57,7 @@
int CEqModeStep::onTimeout()
{
- CStep::onTimeout();
+ CReadStep::onTimeout();
LOGI("<CEqModeStep> onTimeout.");
return 0;
@@ -56,6 +68,11 @@
m_nModeDev = nDev;
}
+ int CEqModeStep::getMode()
+ {
+ return m_nMode;
+ }
+
/*
0: No Equipment Mode exist
1: Normal Mode
--
Gitblit v1.9.3