From fac102938562e13dd4e4e4914d0fde9b1cd05d8b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 09 六月 2025 09:47:37 +0800
Subject: [PATCH] 1.CMaster调度线程中添加任务运行发送到EFEM;
---
SourceCode/Bond/Servo/CBonder.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 8be694e..4a48f1e 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -342,13 +342,13 @@
m_slot[0].enable();
m_slot[0].setPosition(m_nID);
m_slot[0].setNo(1);
- m_slot[0].setName("Slot 1(G1)");
- m_slot[0].setType(MaterialsType::G1);
+ m_slot[0].setName("Slot 1(G2)");
+ m_slot[0].setType(MaterialsType::G2);
m_slot[1].enable();
m_slot[1].setPosition(m_nID);
m_slot[1].setNo(2);
- m_slot[1].setName("Slot 2(G2)");
- m_slot[1].setType(MaterialsType::G2);
+ m_slot[1].setName("Slot 2(G1)");
+ m_slot[1].setType(MaterialsType::G1);
}
void CBonder::onTimer(UINT nTimerid)
@@ -390,6 +390,11 @@
Lock();
CGlass* pGlass1 = getGlassFromSlot(1);
CGlass* pGlass2 = getGlassFromSlot(2);
+ if (pGlass1 == nullptr || pGlass2 == nullptr) {
+ LOGE("<CBonder-%s>onProcessData,错误!不满足两片玻璃且分别为G1与G2的条件，请检查数据是否正确!", m_strName.c_str());
+ Unlock();
+ return -1;
+ }
if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被绑定，请检查数据是否正确!", m_strName.c_str());
Unlock();
--
Gitblit v1.9.3