From e731e05bb712765bf85a359ff4d505e39ca09c02 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 14:19:01 +0800
Subject: [PATCH] 1.Port Status 测试； 2.Cassette ctrl cmd测试和修改地址；
---
SourceCode/Bond/Servo/CMaster.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 9cbcbd7..cba74ae 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -825,7 +825,7 @@
m_listener.onEqVcrEventReport(this, p, p2);
}
};
- listener.onPreFethedOutJob = [&](void* pEquipment, CJobDataB* pJobDataB) -> BOOL {
+ listener.onPreFethedOutJob = [&](void* pEquipment, int port, CJobDataB* pJobDataB) -> BOOL {
CEquipment* p = (CEquipment*)pEquipment;
@@ -858,7 +858,7 @@
return bOk;
};
- listener.onPreStoredJob = [&](void* pEquipment, CJobDataB* pJobDataB, short& slot) -> BOOL {
+ listener.onPreStoredJob = [&](void* pEquipment, int port, CJobDataB* pJobDataB, short& slot) -> BOOL {
CEquipment* p = (CEquipment*)pEquipment;
@@ -890,7 +890,7 @@
else if (m_pActiveRobotTask->isRestoring() &&
m_pActiveRobotTask->getSrcPosition() == p->getID()) {
CGlass* pGlass = p->getGlassFromSlot(m_pActiveRobotTask->getSrcSlot());
- if (pGlass == nullptr) {
+ if (pGlass == nullptr && m_pActiveRobotTask->getSrcSlot() == port) {
bOk = TRUE;
slot = m_pActiveRobotTask->getSrcSlot();
LOGI("<CMaster>onPreFethedOutJob, 已校验数据一致性.");
@@ -1392,7 +1392,7 @@
CRobotTask* CMaster::createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq)
{
- std::vector<int> slots = {1, 2};
+ std::vector<int> slots = {1, 3};
CRobotTask* pTask = nullptr;
CSlot* pSrcSlot, * pTarSlot;
@@ -1413,8 +1413,8 @@
CRobotTask* CMaster::createTransferTask_bake_to_cooling(CEquipment* pSrcEq)
{
- std::vector<int> slotsTar = { 3, 4 };
- std::vector<int> slotsSrc = { 1, 2 };
+ std::vector<int> slotsTar = { 2, 4 };
+ std::vector<int> slotsSrc = { 1, 3 };
CRobotTask* pTask = nullptr;
CSlot* pSrcSlot, * pTarSlot;
@@ -1435,7 +1435,7 @@
CRobotTask* CMaster::createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq)
{
- std::vector<int> slots = { 3, 4 };
+ std::vector<int> slots = { 2, 4 };
CRobotTask* pTask = nullptr;
CSlot* pSrcSlot, * pTarSlot;
--
Gitblit v1.9.3