From aabaff9cdcf9bb279b762891aedda5a03571fbb5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 08:55:07 +0800
Subject: [PATCH] 1.修改Glass的JobDataS的更新逻辑，在收到OnReceiveJob时，机器内未保存和管理Glass, 此时Glass在Arm上，应通过Arm来更新JobDataS；
---
SourceCode/Bond/Servo/CEFEM.cpp | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 8a0e9cc..8175eed 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -805,14 +805,23 @@
}
// 更新信号到LoadPort, Robot, Aligner, Fliper
- m_pPort[0]->setLinkSignalBlock(0, &m_bLinkSignal[0][0]);
- m_pPort[1]->setLinkSignalBlock(0, &m_bLinkSignal[1][0]);
- m_pPort[2]->setLinkSignalBlock(0, &m_bLinkSignal[2][0]);
- m_pPort[3]->setLinkSignalBlock(0, &m_bLinkSignal[3][0]);
- m_pArmTray[0]->setLinkSignalBlock(0, &m_bLinkSignal[4][0]);
- m_pArmTray[1]->setLinkSignalBlock(0, &m_bLinkSignal[5][0]);
- m_pAligner->setLinkSignalBlock(0, &m_bLinkSignal[6][0]);
- m_pFliper->setLinkSignalBlock(0, &m_bLinkSignal[7][0]);
+ m_pPort[0]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[0][0]);
+ m_pPort[1]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[1][0]);
+ m_pPort[2]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[2][0]);
+ m_pPort[3]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[3][0]);
+ m_pArmTray[0]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[4][0]);
+ m_pArmTray[1]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[5][0]);
+ m_pAligner->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[6][0]);
+ m_pFliper->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[7][0]);
+
+ m_pPort[0]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[0][0]);
+ m_pPort[1]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[1][0]);
+ m_pPort[2]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[2][0]);
+ m_pPort[3]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[3][0]);
+ m_pArmTray[0]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[4][0]);
+ m_pArmTray[1]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[5][0]);
+ m_pAligner->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[6][0]);
+ m_pFliper->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[7][0]);
}
int CEFEM::onReceivedJob(int port, CJobDataS* pJobDataS)
@@ -872,16 +881,11 @@
return 10000;
}
- void CEFEM::printDebugString001()
+ void CEFEM::printDebugRobotState()
{
- 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"
- );
- }
+ 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