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/CEquipment.cpp | 85 ++++++++++++++++++++++++++++++++++++------
1 files changed, 73 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 43067d2..35c81b8 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -47,7 +47,6 @@
for (int i = 0; i < SLOT_MAX; i++) {
CContext* pContext = m_slot[i].getContext();
if (pContext != nullptr) {
- pContext->release();
m_slot[i].setContext(nullptr);
}
}
@@ -335,22 +334,23 @@
}
// 梳理各玻璃之间的绑定关系
- /*
Lock();
- std::list<CGlass*> list = m_glassList;
- for (auto item : list) {
- std::string& strBuddyId = item->getBuddyId();
- if (!strBuddyId.empty()) {
- for (auto item2 : m_glassList) {
- if (strBuddyId.compare(item2->getID()) == 0) {
- item->setBuddy(item2);
- TRACE("绑定关系: %s <- %s\n", item->getID().c_str(), item2->getID().c_str());
+ for (int i = 0; i < SLOT_MAX; i++) {
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass != nullptr) {
+ std::string& strBuddyId = pGlass->getBuddyId();
+ if (!strBuddyId.empty()) {
+ for (int j = 0; j < SLOT_MAX; j++) {
+ CGlass* pBudy = (CGlass*)m_slot[j].getContext();
+ if (pBudy != nullptr && strBuddyId.compare(pBudy->getID()) == 0) {
+ pGlass->setBuddy(pBudy);
+ TRACE("绑定关系: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
+ }
}
}
}
}
Unlock();
- */
}
}
@@ -370,6 +370,7 @@
for (int i = 0; i < 8; i++) {
m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
+ m_bLinkSignal[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
m_bLinkSignal[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
index += 0x40;
}
@@ -605,6 +606,14 @@
if (path >= PATH_MAX) return;
if (signal >= SIGNAL_MAX) return;
m_bLinkSignal[path][signal] = bOn;
+ }
+
+ void CEquipment::setLinkSignalBlock(unsigned int path, BOOL* pSignal)
+ {
+ if (path >= PATH_MAX) return;
+ for (int i = 0; i < SIGNAL_MAX; i++) {
+ m_bLinkSignal[path][i] = pSignal[i];
+ }
}
int CEquipment::onStepEvent(CStep* pStep, int code)
@@ -1139,16 +1148,53 @@
if (m_slot[i].isLock()) continue;
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (pGlass == nullptr) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue;
MaterialsType glassType = pGlass->getType();
if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
- if (!pGlass->isProcessed(m_nID, 0)) continue;
return &m_slot[i];
}
return nullptr;
+ }
+
+ CSlot* CEquipment::getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates)
+ {
+ for (auto item : candidates) {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (item == i + 1) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue;
+
+ MaterialsType glassType = pGlass->getType();
+ if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
+ if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
+
+ return &m_slot[i];
+ }
+ }
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getSlot(int index)
+ {
+ if (index >= SLOT_MAX) return nullptr;
+ return &m_slot[index];
}
CGlass* CEquipment::getGlassFromSlot(int slotNo)
@@ -1190,6 +1236,21 @@
return TRUE;
}
+ int CEquipment::removeGlass(int slotNo)
+ {
+ CSlot* pSlot = nullptr;
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].getNo() != slotNo) continue;
+ pSlot = &m_slot[i];
+ break;
+ }
+
+ if (pSlot == nullptr) return -1;
+ pSlot->setContext(nullptr);
+ return 0;
+ }
+
short CEquipment::decodeRecipeListReport(const char* pszData, size_t size)
{
return m_recipesManager.decodeRecipeListReport(pszData, size);
--
Gitblit v1.9.3