From d68541dce155a682f65b7c3fbfbfbeef17ea5b8f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 12 五月 2025 12:00:41 +0800
Subject: [PATCH] 1.StoredJob, Fetched out Job实现； 2.CStep增加定制的Attribute, 以便通过的Step不使用getAttributeVector也能添加不一样的Attribute;
---
SourceCode/Bond/Servo/CEFEM.cpp | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 3918188..32e9233 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -294,15 +294,39 @@
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)((CEqReadStep*)pFrom)->getProp("Port");
+ int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
if (port > 0) {
- decodeFetchedOutJobReport(port, pszData, size);
+ decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
}
}
return -1;
@@ -312,6 +336,30 @@
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;
}
}
@@ -407,4 +455,34 @@
return -1;
}
+
+ int CEFEM::onStore(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