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/CEqCassetteCtrlCmdStep.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp
index c59ab4d..63cf42b 100644
--- a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp
+++ b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp
@@ -23,17 +23,17 @@
int jobExistenceSize,
short slotProcess,
short jopCount,
- CJobDataB* pJobDataB)
+ CJobDataA* pJobDataA)
{
ASSERT(jobExistenceSize == 12);
- ASSERT(pJobDataB);
+ ASSERT(pJobDataA);
char szBuffer[1024] = { 0 };
memcpy(&szBuffer[0], &cmd, sizeof(short));
memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
memcpy(&szBuffer[26], &slotProcess, sizeof(short));
memcpy(&szBuffer[36], &jopCount, sizeof(short));
- int nLen = pJobDataB->serialize(&szBuffer[38], 1024 - 38);
+ int nLen = pJobDataA->serialize(&szBuffer[38], 1024 - 38);
return writeData(m_nCtrlCmdDev, (const char*)szBuffer, 38 + nLen);
}
@@ -41,9 +41,10 @@
{
CWriteStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Control Command Dev",
- ("W" + CToolUnits::toHexString(m_nCtrlCmdDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nCtrlCmdDev, strTemp)).c_str(), "", weight++));
}
}
--
Gitblit v1.9.3