From 56d92f02caa0e5bffb36a8f46446d297b0baf730 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 23 六月 2025 15:15:59 +0800
Subject: [PATCH] 1.配方列表，搜索框，UI调整，未添加搜索功能；
---
SourceCode/Bond/Servo/CEFEM.cpp | 238 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 160 insertions(+), 78 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 7d54c05..8a0e9cc 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)
@@ -531,11 +544,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 +606,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
@@ -611,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;
});
@@ -624,18 +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);
- 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;
}
}
@@ -712,94 +817,71 @@
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;
}
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()
{
return 10000;
}
+
+ void CEFEM::printDebugString001()
+ {
+ for (int i = 0; i < 8; i++) {
+ LOGI("<CEquipment-%s>%d, Signal:%s, %s, %s, %s",
+ m_strName.c_str(), i,
+ m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE] ? "ON" : "OFF",
+ m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE] ? "ON" : "OFF",
+ m_bLinkSignal[i][SIGNAL_INTERLOCK] ? "ON" : "OFF",
+ m_bLinkSignal[i][SIGNAL_SEND_ABLE] ? "ON" : "OFF"
+ );
+ }
+ }
}
--
Gitblit v1.9.3