From 4a9f803ce6896554706b97fe36e0002d18e1f346 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 16 七月 2025 09:35:41 +0800
Subject: [PATCH] 1. [TaskControl] 添加设备启用状态判断（IsEnabled） 2. 在多个工艺任务（如 bake_to_cooling、bond_to_bake 等）中增加 psrEq->IsEnabled() 判断
---
SourceCode/Bond/Servo/CWriteStep.cpp | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CWriteStep.cpp b/SourceCode/Bond/Servo/CWriteStep.cpp
index 0470421..2e79b5a 100644
--- a/SourceCode/Bond/Servo/CWriteStep.cpp
+++ b/SourceCode/Bond/Servo/CWriteStep.cpp
@@ -55,6 +55,18 @@
m_nWriteSignalDev = dev;
}
+ void CWriteStep::setRetDataDev(int dev, int size)
+ {
+ m_nReturnDevNo = dev;
+ m_nReturnDataSize = size;
+ }
+
+ int CWriteStep::getReturnData(const char*& pszData)
+ {
+ pszData = m_szReturnBuf;
+ return m_nReturnDataSize;
+ }
+
void CWriteStep::onRecvSignal(BOOL bSignal)
{
Lock();
@@ -111,6 +123,18 @@
goto RESET;
}
ResetEvent(m_hRecvSignalOn);
+
+
+ // 3.9读数据，如果有
+ if (m_nReturnDataSize > 0) {
+ int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nReturnDevNo,
+ (long)min(READ_BUFFER_MAX, m_nReturnDataSize), m_szReturnBuf);
+ if (0 != nRet) {
+ LOGI("<CEqReadStep>Read return data error.");
+ onReadRetDataError();
+ return -1;
+ }
+ }
// 4.写OFF
@@ -196,4 +220,9 @@
{
return 0;
}
+
+ int CWriteStep::onReadRetDataError()
+ {
+ return 0;
+ }
}
--
Gitblit v1.9.3