From 0026ea3b1a6588f3e40b8276162f54b2a22bc7ae Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 19 一月 2026 14:32:27 +0800
Subject: [PATCH] 1.修复 ： 多 PJ 支持仍是单槽实现：isProcessJobsEmpty/validate 仍只允许 1 个 PJ/CJ；Host 一次下多 PJ 或运行中追加 PJ 会被拒绝/无明确反馈。需要：协议上明示只支持 1，或补齐 ACK/NAK 与队列管理、PJobSpace 动态更新。
---
SourceCode/Bond/Servo/CEqStatusStep.cpp | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqStatusStep.cpp b/SourceCode/Bond/Servo/CEqStatusStep.cpp
index 697e384..3f8195a 100644
--- a/SourceCode/Bond/Servo/CEqStatusStep.cpp
+++ b/SourceCode/Bond/Servo/CEqStatusStep.cpp
@@ -5,11 +5,11 @@
namespace SERVO {
- CEqStatusStep::CEqStatusStep() : CStep()
+ CEqStatusStep::CEqStatusStep() : CReadStep()
{
m_nStatusDev = 0;
for (int i = 0; i < STATUS_MAX; i++) {
- m_nStatus[i] = 7;
+ m_nStatus[i] = 0;
m_nReasonCode[i] = 0;
}
@@ -23,20 +23,22 @@
void CEqStatusStep::getAttributeVector(CAttributeVector& attrubutes)
{
- CStep::getAttributeVector(attrubutes);
+ CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
char szName[256];
for (int i = 0; i < STATUS_MAX; i++) {
sprintf_s(szName, 256, "Status %d", i + 1);
attrubutes.addAttribute(new CAttribute(szName,
- std::to_string(m_nStatus[i]).c_str(), ""));
+ std::to_string(m_nStatus[i]).c_str(), "", weight++));
sprintf_s(szName, 256, "Reason Code %d", i + 1);
attrubutes.addAttribute(new CAttribute(szName,
- std::to_string(m_nReasonCode[i]).c_str(), ""));
+ std::to_string(m_nReasonCode[i]).c_str(), "", weight++));
}
+ std::string strTemp;
attrubutes.addAttribute(new CAttribute("Status Dev",
- std::to_string(m_nStatusDev).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nStatusDev, strTemp)).c_str(), "", weight++));
}
int CEqStatusStep::getStatus(unsigned int uint)
@@ -49,7 +51,7 @@
}
int CEqStatusStep::onReadData()
{
- CStep::onReadData();
+ CReadStep::onReadData();
char szBuffer[64];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W,
@@ -82,7 +84,7 @@
int CEqStatusStep::onComplete()
{
- CStep::onComplete();
+ CReadStep::onComplete();
LOGI("<CEqStatusStep> onComplete.");
return 0;
@@ -90,8 +92,8 @@
int CEqStatusStep::onTimeout()
{
- CStep::onTimeout();
- LOGI("<CEqStatusStep> onTimeout.");
+ CReadStep::onTimeout();
+ LOGE("<CEqStatusStep> onTimeout.");
return 0;
}
--
Gitblit v1.9.3