From b61e36d522da06650b393e6a8becfc12c892d285 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 07 八月 2025 13:44:38 +0800
Subject: [PATCH] 1.千传调试逻辑测试修改完善；
---
SourceCode/Bond/Servo/CMaster.cpp | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 856a750..6a46191 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -748,10 +748,17 @@
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
- // Bonder2 -> BakeCooling
+ // VacuumBake(G1) -> BakeCooling
+ if (!rmd.armState[0]) {
+ m_pActiveRobotTask = createTransferTask_continuous_transfer(pVacuumBake,
+ 0, pBakeCooling, 0);
+ CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
+ }
+
+ // Bonder2 -> VacuumBake(G1)
if (!rmd.armState[0]) {
m_pActiveRobotTask = createTransferTask_continuous_transfer(pBonder2,
- 0, pBakeCooling, 0);
+ 0, pVacuumBake, 0);
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
@@ -762,17 +769,10 @@
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
- // VacuumBake(G1) -> Bonder1
+ // Fliper(G2) -> Bonder1
if (!rmd.armState[0] && !pBonder1->hasBondClass()) {
- m_pActiveRobotTask = createTransferTask_continuous_transfer(pVacuumBake,
- 0, pBonder1, 0);
- CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
- }
-
- // Fliper(G2) -> VacuumBake(G1)
- if (!rmd.armState[0]) {
m_pActiveRobotTask = createTransferTask_continuous_transfer(pFliper,
- 0, pVacuumBake, 0);
+ 0, pBonder1, 1);
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
@@ -1034,7 +1034,7 @@
((CEquipment*)pEquipment)->getName().c_str(), scanMap, downMap);
};
listener.onPortStatusChanged = [&](void* pEquipment, short status, __int64 data) {
- LOGE("<Master-%s>Port InUse。status=%d, data=%lld", ((CEquipment*)pEquipment)->getName().c_str(), status);
+ LOGE("<Master-%s>onPortStatusChanged。status=%d, data=%lld", ((CEquipment*)pEquipment)->getName().c_str(), status);
if (m_listener.onLoadPortStatusChanged != nullptr) {
m_listener.onLoadPortStatusChanged(this, (CEquipment*)pEquipment, status, data);
}
--
Gitblit v1.9.3