From be01318968aed5e55c511eedc6c1f72a961c3f13 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 19 六月 2025 14:49:02 +0800
Subject: [PATCH] 1.重新梳理JobDataS的传递和更新；
---
SourceCode/Bond/Servo/CEFEM.cpp | 115 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 93 insertions(+), 22 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 7d54c05..a331c96 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -531,11 +531,59 @@
}
}
+ // 使用CEqReadStep替换CEqJobEventStep
{
- // Received Job Report Upstream#1~9
+ // Received Job Report Upstream #1~9
char szBuffer[256];
- for (int i = 0; i < 9; i++) {
+ for (int i = 0; i < 8; 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) {
+ decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
+ }
+ }
+ return -1;
+ });
+ sprintf_s(szBuffer, "%s%d", STEP_EQ_RECEIVED_JOB_UPSn, i + 1);
+ pStep->setName(szBuffer);
+ pStep->setProp("Port", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev(0x0 + i);
+ if (addStep(STEP_ID_RECIVE_JOB_UPS1 + i, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+ {
+ // Sent Out Job Report Downstream #1~9
+ char szBuffer[256];
+ for (int i = 0; i < 8; i++) {
+ CEqReadStep* pStep = new CEqReadStep(0x4000 + 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) {
+ decodeSentOutJobReport((CStep*)pFrom, port, pszData, size);
+ }
+ }
+ return -1;
+ });
+ sprintf_s(szBuffer, "%s%d", STEP_EQ_SENT_OUT_JOB_DOWNSn, i + 1);
+ pStep->setName(szBuffer);
+ pStep->setProp("Port", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev(0x00a + i);
+ if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1 + i, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ }
+
+ {
+ // Fetched Out Job Report #1~15
+ char szBuffer[256];
+ for (int i = 0; i < 8; 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");
@@ -545,15 +593,40 @@
}
return -1;
});
- sprintf_s(szBuffer, "%s%d", STEP_EQ_RECEIVED_JOBn, i + 1);
+ sprintf_s(szBuffer, "%s%d", STEP_EQ_FETCHED_OUT_JOBn, i + 1);
pStep->setName(szBuffer);
- pStep->setProp("Upstream", (void*)(__int64)(i + 1));
- pStep->setWriteSignalDev(0x0 + i);
- if (addStep(STEP_ID_RECIVE_JOB_UPS1 + i, pStep) != 0) {
+ pStep->setProp("Port", (void*)(__int64)(i + 1));
+ pStep->setWriteSignalDev(0x023 + i);
+ if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + i, pStep) != 0) {
delete pStep;
}
}
}
+
+ {
+ // Stored Job Report #1~15
+ char szBuffer[256];
+ for (int i = 0; i < 8; 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;
+ }
+ }
+ }
+
{
// Dispatching Mode Change Command
@@ -712,28 +785,26 @@
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);
+ // 转发到子单元设备
+ 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]->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);
+ // 转发到子单元设备
+ 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]->onSentOutJob(port, pJobDataS);
+ }
+
return 0;
}
--
Gitblit v1.9.3