From 5edb485d226790306097e40ea954efb2ed90dd21 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 11 八月 2025 16:05:09 +0800
Subject: [PATCH] 1.EAP:查询CJSpace和PJSpace功能模拟，Master对EAP查询机器变量的回复；
---
SourceCode/Bond/Servo/CEFEM.cpp | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 8175eed..dcb5684 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -137,7 +137,7 @@
}
return 0;
- });
+ });
}
return 0;
@@ -473,6 +473,7 @@
pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
pStep->setProp("Port", (void*)1);
pStep->setWriteSignalDev(0x4a);
+ pStep->setReturnDev(0x91e);
if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
delete pStep;
}
@@ -540,6 +541,27 @@
pStep->setWriteSignalDev(0x66);
pStep->setDataDev(0x90a);
if (addStep(STEP_ID_MASTER_RECIPE_LIST_CMD_REPLY, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // master recipe list report
+ CEqReadStep* pStep = new CEqReadStep(0x6955, 255 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+ short ret = MRLRC_OK;
+ if (code == ROK && pszData != nullptr && size > 0) {
+ // 此处解释配方数据
+ ret = decodeRecipeListReport(pszData, size);
+ }
+ pTmpStep->setReturnCode(ret);
+ return -1;
+ });
+ pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
+ pStep->setWriteSignalDev(0x4b);
+ pStep->setReturnDev(0x91d);
+ if (addStep(STEP_ID_MASTER_RECIPE_LIST_REPORT, pStep) != 0) {
delete pStep;
}
}
@@ -676,23 +698,6 @@
}
{
- // Panel Data Report
- CEqReadStep* pStep = new CEqReadStep(0x617f, 386 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- decodePanelDataReport((CStep*)pFrom, pszData, size);
- }
- return -1;
- });
- pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
- pStep->setProp("Port", (void*)1);
- pStep->setWriteSignalDev(0x15e);
- if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
- delete pStep;
- }
- }
-
- {
// FAC Data Report
CEqReadStep* pStep = new CEqReadStep(0x6301, 108 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
@@ -803,6 +808,8 @@
m_pPort[i]->onReceiveLBData(pszData, size);
}
}
+ m_pAligner->onReceiveLBData(pszData, size);
+
// 更新信号到LoadPort, Robot, Aligner, Fliper
m_pPort[0]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[0][0]);
--
Gitblit v1.9.3