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 | 136 +++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 65 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 8b5ec2a..901e3ae 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -26,17 +26,30 @@
m_robotData.position = ROBOT_POSITION::Port1;
m_robotData.armState[0] = FALSE;
m_robotData.armState[1] = FALSE;
+ m_pActiveContext = nullptr;
}
CEFEM::~CEFEM()
{
-
+ if (m_pActiveContext != nullptr) {
+ m_pActiveContext->release();
+ m_pActiveContext = nullptr;
+ }
}
const char* CEFEM::getClassName()
{
static char* pszName = "CEFEM";
return pszName;
+ }
+
+ void CEFEM::setContext(CContext* pContext)
+ {
+ if (m_pActiveContext != nullptr) {
+ m_pActiveContext->release();
+ }
+ m_pActiveContext = pContext;
+ m_pActiveContext->addRef();
}
void CEFEM::setPort(unsigned int index, CLoadPort* pPort)
@@ -684,7 +697,7 @@
CEqReadStep* pStep = new CEqReadStep(0x6301, 108 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
- decodePanelDataRequest((CStep*)pFrom, pszData, size);
+ decodeFacDataReport((CStep*)pFrom, pszData, size);
}
return -1;
});
@@ -697,19 +710,37 @@
}
{
- // Panel Data Request
- CEqReadStep* pStep = new CEqReadStep(0x617d, 2 * 2,
+ // JOB Data Request
+ CEqReadStep* pStep = new CEqReadStep(0x0, 0,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- decodePanelDataRequest((CStep*)pFrom, pszData, size);
+ if (code == ROK /* && pszData != nullptr && size > 0*/) {
+ // 由于EFEM没有发送参数到master, 我们只需要返回数据
+ // Cassette Sequence No和Job Sequence No根据上一次调试缓存而来
+ // decodeJobDataRequest((CStep*)pFrom, pszData, size);
+
+ // 获取数据后返回给EFEM
+ // Job DataS 320W
+ // ACK 1W
+ // Reserved 15W
+ short ack = (short)JobDataRequestAck::NG; // 不存在jobData
+ char szBuffer[1024] = { 0 };
+ if (m_pActiveContext != nullptr) {
+ CJobDataS* pJobDataS = ((CGlass*)m_pActiveContext)->getJobDataS();
+ if (pJobDataS != nullptr) {
+ pJobDataS->serialize(szBuffer, 1024);
+ ack = (short)JobDataRequestAck::OK;
+ }
+ }
+ memcpy(&szBuffer[320 * 2], &ack, sizeof(short));
+ ((CEqReadStep*)pFrom)->setReturnData(szBuffer, 336 * 2);
}
return -1;
});
pStep->setName(STEP_EFEM_PANEL_DATA_REQUEST);
pStep->setProp("Port", (void*)1);
- pStep->setWriteSignalDev(0x15d);
- pStep->setReturnDev(0x73a);
- if (addStep(STEP_ID_PANEL_DATA_REQUEST, pStep) != 0) {
+ pStep->setWriteSignalDev(0x35);
+ pStep->setReturnDev(0x5EA);
+ if (addStep(STEP_ID_JOB_DATA_REQUEST, pStep) != 0) {
delete pStep;
}
}
@@ -774,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)
@@ -812,62 +852,28 @@
int CEFEM::onFetchedOutJob(int port, CJobDataB* pJobDataB)
{
- if (port == 1) {
- return m_pPort[0]->onFetchedOutJob(port, pJobDataB);
- }
- if (port == 2) {
- return m_pPort[1]->onFetchedOutJob(port, pJobDataB);
- }
- if (port == 3) {
- return m_pPort[2]->onFetchedOutJob(port, pJobDataB);
- }
- if (port == 4) {
- return m_pPort[3]->onFetchedOutJob(port, pJobDataB);
- }
- if (port == 5) {
- return m_pArmTray[0]->onFetchedOutJob(port, pJobDataB);
- }
- if (port == 6) {
- return m_pArmTray[1]->onFetchedOutJob(port, pJobDataB);
- }
- if (port == 7) {
- return m_pAligner->onFetchedOutJob(port, pJobDataB);
- }
- if (port == 8) {
- return m_pFliper->onFetchedOutJob(port, pJobDataB);
+ // 转发到子单元设备
+ CEquipment* pEqs[] = { m_pPort[0], m_pPort[1], m_pPort[2], m_pPort[3], m_pArmTray[0], m_pArmTray[1],
+ m_pAligner, m_pFliper };
+ if (1 <= port && port <= 8) {
+ pEqs[port - 1]->onFetchedOutJob(port, pJobDataB);
}
- return -1;
+
+ return 0;
}
int CEFEM::onStoredJob(int port, CJobDataB* pJobDataB)
{
- if (port == 1) {
- return m_pPort[0]->onStoredJob(port, pJobDataB);
- }
- if (port == 2) {
- return m_pPort[1]->onStoredJob(port, pJobDataB);
- }
- if (port == 3) {
- return m_pPort[2]->onStoredJob(port, pJobDataB);
- }
- if (port == 4) {
- return m_pPort[3]->onStoredJob(port, pJobDataB);
- }
- if (port == 5) {
- return m_pArmTray[0]->onStoredJob(port, pJobDataB);
- }
- if (port == 6) {
- return m_pArmTray[1]->onStoredJob(port, pJobDataB);
- }
- if (port == 7) {
- return m_pAligner->onStoredJob(port, pJobDataB);
- }
- if (port == 8) {
- return m_pFliper->onStoredJob(port, pJobDataB);
+ // 转发到子单元设备
+ CEquipment* pEqs[] = { m_pPort[0], m_pPort[1], m_pPort[2], m_pPort[3], m_pArmTray[0], m_pArmTray[1],
+ m_pAligner, m_pFliper };
+ if (1 <= port && port <= 8) {
+ pEqs[port - 1]->onStoredJob(port, pJobDataB);
}
- return -1;
+
+ return 0;
}
int CEFEM::getIndexerOperationModeBaseValue()
--
Gitblit v1.9.3