From 66d8ca4b75006f9875731ef819dafd3d20ca01a2 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 21 七月 2025 11:15:30 +0800
Subject: [PATCH] 1.信号页面，增加下游信号的显示；
---
SourceCode/Bond/Servo/CEFEM.cpp | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 901e3ae..cf42141 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;
}
@@ -676,23 +677,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 +787,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]);
@@ -880,4 +866,12 @@
{
return 10000;
}
+
+ void CEFEM::printDebugRobotState()
+ {
+ LOGI("<CEFEM>Robot status:%d, ARM1:%s, ARM2:%s",
+ m_robotData.status,
+ m_robotData.armState[1] ? _T("ON") : _T("OFF"),
+ m_robotData.armState[2] ? _T("ON") : _T("OFF"));
+ }
}
--
Gitblit v1.9.3