From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEFEM.cpp | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 645251f..901e3ae 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -728,7 +728,6 @@
CJobDataS* pJobDataS = ((CGlass*)m_pActiveContext)->getJobDataS();
if (pJobDataS != nullptr) {
pJobDataS->serialize(szBuffer, 1024);
- pJobDataS->serialize(szBuffer, 1024);
ack = (short)JobDataRequestAck::OK;
}
}
@@ -806,14 +805,23 @@
}
// 更新信号到LoadPort, Robot, Aligner, Fliper
- m_pPort[0]->setLinkSignalBlock(0, &m_bLinkSignal[0][0]);
- m_pPort[1]->setLinkSignalBlock(0, &m_bLinkSignal[1][0]);
- m_pPort[2]->setLinkSignalBlock(0, &m_bLinkSignal[2][0]);
- m_pPort[3]->setLinkSignalBlock(0, &m_bLinkSignal[3][0]);
- m_pArmTray[0]->setLinkSignalBlock(0, &m_bLinkSignal[4][0]);
- m_pArmTray[1]->setLinkSignalBlock(0, &m_bLinkSignal[5][0]);
- m_pAligner->setLinkSignalBlock(0, &m_bLinkSignal[6][0]);
- m_pFliper->setLinkSignalBlock(0, &m_bLinkSignal[7][0]);
+ m_pPort[0]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[0][0]);
+ m_pPort[1]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[1][0]);
+ m_pPort[2]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[2][0]);
+ m_pPort[3]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[3][0]);
+ m_pArmTray[0]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[4][0]);
+ m_pArmTray[1]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[5][0]);
+ m_pAligner->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[6][0]);
+ m_pFliper->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[7][0]);
+
+ m_pPort[0]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[0][0]);
+ m_pPort[1]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[1][0]);
+ m_pPort[2]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[2][0]);
+ m_pPort[3]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[3][0]);
+ m_pArmTray[0]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[4][0]);
+ m_pArmTray[1]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[5][0]);
+ m_pAligner->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[6][0]);
+ m_pFliper->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[7][0]);
}
int CEFEM::onReceivedJob(int port, CJobDataS* pJobDataS)
--
Gitblit v1.9.3