From cf1497e3bba45ddc3b31cf9768954248bedc0bc1 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 16:03:21 +0800
Subject: [PATCH] 1.修复以下问题：Only-1 Job 支持：isProcessJobsEmpty()/validate 决定了当前实现只支持单个 PJ/CJ。Host 如果按标准一次下多 PJ 或在运行中追加 PJ，会被拒绝但无明确回应，容易引起 Host/设备状态脱节。
---
SourceCode/Bond/Servo/CReadStep.cpp | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index 787d92a..06181b8 100644
--- a/SourceCode/Bond/Servo/CReadStep.cpp
+++ b/SourceCode/Bond/Servo/CReadStep.cpp
@@ -95,6 +95,7 @@
ASSERT(m_pEquipment);
m_pEquipment->onStepEvent(this, STEP_EVENT_READDATA);
}
+ if (m_bReadContinue) continue;
// 0426新增
// 1.1，写return code or data
@@ -154,10 +155,11 @@
CStep::getAttributeVector(attrubutes);
std::string strTemp;
+ unsigned int weight = 21;
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, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nWriteSignalDev, strTemp)).c_str(), "", weight++));
}
void CReadStep::init()
@@ -209,4 +211,21 @@
{
return 0;
}
+
+ int CReadStep::setReturnCode(short code)
+ {
+ memcpy(m_szReturnBuf, &code, sizeof(short));
+ m_nReturnDataSize = sizeof(short);
+
+ return 0;
+ }
+
+ int CReadStep::setReturnData(const char* pszData, unsigned int size)
+ {
+ ASSERT(size < 1024);
+ memcpy(m_szReturnBuf, pszData, size);
+ m_nReturnDataSize = size;
+
+ return 0;
+ }
}
--
Gitblit v1.9.3