From 217f07665553605caa3f3339321d04bd2c3e8256 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 15 五月 2025 17:18:58 +0800
Subject: [PATCH] 1.Bonder 处理ProcessDataReport, 并将G1与G2绑定一起。
---
SourceCode/Bond/Servo/CEFEM.cpp | 92 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 72 insertions(+), 20 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index bae19e5..99e9b0c 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -294,6 +294,30 @@
STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x60b0);
{
+ // Received Job Report Upstream#1~9
+ char szBuffer[256];
+ for (int i = 0; i < 9; i++) {
+ CEqReadStep* pStep = new CEqReadStep(0x4c90 + 320 * i, 320 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
+ if (port > 0) {
+ decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
+ }
+ }
+ return -1;
+ });
+ sprintf_s(szBuffer, "%s%d", STEP_EQ_RECEIVED_JOBn, i + 1);
+ pStep->setName(szBuffer);
+ pStep->setProp("Upstream", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev(0x0 + i);
+ if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + i, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+
+ {
// Fetched Out Job Report #1~15
char szBuffer[256];
for (int i = 0; i < 15; i++) {
@@ -302,7 +326,7 @@
if (code == ROK && pszData != nullptr && size > 0) {
int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
if (port > 0) {
- decodeFetchedOutJobReport(port, pszData, size);
+ decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
}
}
return -1;
@@ -326,7 +350,7 @@
if (code == ROK && pszData != nullptr && size > 0) {
int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
if (port > 0) {
- decodeStoredJobReport(port, pszData, size);
+ decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
}
}
return -1;
@@ -402,61 +426,89 @@
}
}
- int CEFEM::onFetchedOut(int port, const char* pszGlassId)
+ int CEFEM::onReceivedJob(int port, CJobDataS* pJobDataS)
+ {
+ m_pPort[0]->onReceivedJob(port, pJobDataS);
+ m_pPort[1]->onReceivedJob(port, pJobDataS);
+ m_pPort[2]->onReceivedJob(port, pJobDataS);
+ m_pPort[3]->onReceivedJob(port, pJobDataS);
+ m_pArmTray[0]->onReceivedJob(port, pJobDataS);
+ m_pArmTray[1]->onReceivedJob(port, pJobDataS);
+ m_pAligner->onReceivedJob(port, pJobDataS);
+ m_pFliper->onReceivedJob(port, pJobDataS);
+
+ return 0;
+ }
+
+ int CEFEM::onSentOutJob(int port, CJobDataS* pJobDataS)
+ {
+ m_pPort[0]->onSentOutJob(port, pJobDataS);
+ m_pPort[1]->onSentOutJob(port, pJobDataS);
+ m_pPort[2]->onSentOutJob(port, pJobDataS);
+ m_pPort[3]->onSentOutJob(port, pJobDataS);
+ m_pArmTray[0]->onSentOutJob(port, pJobDataS);
+ m_pArmTray[1]->onSentOutJob(port, pJobDataS);
+ m_pAligner->onSentOutJob(port, pJobDataS);
+ m_pFliper->onSentOutJob(port, pJobDataS);
+
+ return 0;
+ }
+
+ int CEFEM::onFetchedOutJob(int port, CJobDataB* pJobDataB)
{
if (port == 1) {
- return m_pPort[0]->fetchedOut(pszGlassId);
+ return m_pPort[0]->onFetchedOutJob(port, pJobDataB);
}
if (port == 2) {
- return m_pPort[1]->fetchedOut(pszGlassId);
+ return m_pPort[1]->onFetchedOutJob(port, pJobDataB);
}
if (port == 3) {
- return m_pPort[2]->fetchedOut(pszGlassId);
+ return m_pPort[2]->onFetchedOutJob(port, pJobDataB);
}
if (port == 4) {
- return m_pPort[3]->fetchedOut(pszGlassId);
+ return m_pPort[3]->onFetchedOutJob(port, pJobDataB);
}
if (port == 5) {
- return m_pArmTray[0]->fetchedOut(pszGlassId);
+ return m_pArmTray[0]->onFetchedOutJob(port, pJobDataB);
}
if (port == 6) {
- return m_pArmTray[1]->fetchedOut(pszGlassId);
+ return m_pArmTray[1]->onFetchedOutJob(port, pJobDataB);
}
if (port == 7) {
- return m_pAligner->fetchedOut(pszGlassId);
+ return m_pAligner->onFetchedOutJob(port, pJobDataB);
}
if (port == 8) {
- return m_pFliper->fetchedOut(pszGlassId);
+ return m_pFliper->onFetchedOutJob(port, pJobDataB);
}
return -1;
}
- int CEFEM::onStore(int port, const char* pszGlassId)
+ int CEFEM::onStoredJob(int port, CJobDataB* pJobDataB)
{
if (port == 1) {
- return m_pPort[0]->storedJob(pszGlassId);
+ return m_pPort[0]->onStoredJob(port, pJobDataB);
}
if (port == 2) {
- return m_pPort[1]->storedJob(pszGlassId);
+ return m_pPort[1]->onStoredJob(port, pJobDataB);
}
if (port == 3) {
- return m_pPort[2]->storedJob(pszGlassId);
+ return m_pPort[2]->onStoredJob(port, pJobDataB);
}
if (port == 4) {
- return m_pPort[3]->storedJob(pszGlassId);
+ return m_pPort[3]->onStoredJob(port, pJobDataB);
}
if (port == 5) {
- return m_pArmTray[0]->storedJob(pszGlassId);
+ return m_pArmTray[0]->onStoredJob(port, pJobDataB);
}
if (port == 6) {
- return m_pArmTray[1]->storedJob(pszGlassId);
+ return m_pArmTray[1]->onStoredJob(port, pJobDataB);
}
if (port == 7) {
- return m_pAligner->storedJob(pszGlassId);
+ return m_pAligner->onStoredJob(port, pJobDataB);
}
if (port == 8) {
- return m_pFliper->storedJob(pszGlassId);
+ return m_pFliper->onStoredJob(port, pJobDataB);
}
return -1;
--
Gitblit v1.9.3