From 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 09:34:04 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CEFEM.cpp | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 151 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 4520495..6b28e45 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -19,6 +19,8 @@
m_pPort[1] = nullptr;
m_pPort[2] = nullptr;
m_pPort[3] = nullptr;
+ m_pAligner = nullptr;
+ m_pFliper = nullptr;
}
CEFEM::~CEFEM()
@@ -36,6 +38,23 @@
{
if (index < 4) {
m_pPort[index] = pPort;
+ }
+ }
+
+ void CEFEM::setAligner(CAligner* pAligner)
+ {
+ m_pAligner = pAligner;
+ }
+
+ void CEFEM::setFliper(CFliper* pFliper)
+ {
+ m_pFliper = pFliper;
+ }
+
+ void CEFEM::setArmTray(unsigned int index, CArmTray* pArmTray)
+ {
+ if (index < 2) {
+ m_pArmTray[index] = pArmTray;
}
}
@@ -213,7 +232,6 @@
}
}
-
{
// 请求主配方列表的step
CEqWriteStep* pStep = new CEqWriteStep();
@@ -274,6 +292,78 @@
STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_BLOCKED, 0x103,
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++) {
+ CEqReadStep* pStep = new CEqReadStep(0x5c31 + 18 * i, 18 * 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_FETCHED_OUT_JOBn, i+1);
+ pStep->setName(szBuffer);
+ pStep->setProp("Port", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev(0x023 + i);
+ if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + i, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+
+ {
+ // Store Job Report #1~15
+ char szBuffer[256];
+ for (int i = 0; i < 15; i++) {
+ CEqReadStep* pStep = new CEqReadStep(0x5b23 + 18 * i, 18 * 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) {
+ decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
+ }
+ }
+ return -1;
+ });
+ sprintf_s(szBuffer, "%s%d", STEP_EQ_STORED_JOBn, i + 1);
+ pStep->setName(szBuffer);
+ pStep->setProp("Port", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev(0x014 + i);
+ if (addStep(STEP_ID_STORE_JOB_REPORT1 + i, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
}
int CEFEM::onStepEvent(CStep* pStep, int code)
@@ -335,4 +425,64 @@
}
}
}
+
+ int CEFEM::onFetchedOutJob(int port, const char* pszGlassId)
+ {
+ if (port == 1) {
+ return m_pPort[0]->fetchedOutJob(pszGlassId);
+ }
+ if (port == 2) {
+ return m_pPort[1]->fetchedOutJob(pszGlassId);
+ }
+ if (port == 3) {
+ return m_pPort[2]->fetchedOutJob(pszGlassId);
+ }
+ if (port == 4) {
+ return m_pPort[3]->fetchedOutJob(pszGlassId);
+ }
+ if (port == 5) {
+ return m_pArmTray[0]->fetchedOutJob(pszGlassId);
+ }
+ if (port == 6) {
+ return m_pArmTray[1]->fetchedOutJob(pszGlassId);
+ }
+ if (port == 7) {
+ return m_pAligner->fetchedOutJob(pszGlassId);
+ }
+ if (port == 8) {
+ return m_pFliper->fetchedOutJob(pszGlassId);
+ }
+
+ return -1;
+ }
+
+ int CEFEM::onStoreJob(int port, const char* pszGlassId)
+ {
+ if (port == 1) {
+ return m_pPort[0]->storedJob(pszGlassId);
+ }
+ if (port == 2) {
+ return m_pPort[1]->storedJob(pszGlassId);
+ }
+ if (port == 3) {
+ return m_pPort[2]->storedJob(pszGlassId);
+ }
+ if (port == 4) {
+ return m_pPort[3]->storedJob(pszGlassId);
+ }
+ if (port == 5) {
+ return m_pArmTray[0]->storedJob(pszGlassId);
+ }
+ if (port == 6) {
+ return m_pArmTray[1]->storedJob(pszGlassId);
+ }
+ if (port == 7) {
+ return m_pAligner->storedJob(pszGlassId);
+ }
+ if (port == 8) {
+ return m_pFliper->storedJob(pszGlassId);
+ }
+
+ return -1;
+ }
}
--
Gitblit v1.9.3