From 81df82be1f5f401b80780f65e5811685d9a8e4c4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 19 九月 2025 18:03:24 +0800
Subject: [PATCH] 1.修复打开软件加载CControlJob时，玻璃context丢失的问题；
---
SourceCode/Bond/Servo/CMaster.cpp | 192 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 172 insertions(+), 20 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index e93c06e..3c1adba 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -62,6 +62,8 @@
m_bBatch = false;
m_nContinuousTransferCount = 0;
m_nContinuousTransferStep = CTStep_Unknow;
+ m_nContinuousWorkingPort = 0;
+ m_nContinuousWorkingSlot = 0;
m_pControlJob = nullptr;
m_nTestFlag = 0;
InitializeCriticalSection(&m_criticalSection);
@@ -211,10 +213,9 @@
-
-
// 读缓存数据
readCache();
+ loadState();
// 定时器
@@ -1064,15 +1065,17 @@
}
// Measurement -> LoadPort
- for (int s = 0; s < 4; s++) {
- PortType pt = pLoadPorts[s]->getPortType();
+ for (int p = 0; p < 4; p++) {
+ if (p != m_nContinuousWorkingPort) continue;
+ PortType pt = pLoadPorts[p]->getPortType();
if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_BakeCooling_Measurement)
- && !rmd.armState[0] && pLoadPorts[s]->isEnable()
+ && !rmd.armState[0] && pLoadPorts[p]->isEnable()
&& (pt == PortType::Unloading || pt == PortType::Both)
- && pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ && pLoadPorts[p]->getPortStatus() == PORT_INUSE) {
for (int slot = 0; slot < SLOT_MAX; slot++) {
+ if (slot != m_nContinuousWorkingSlot) continue;
m_pActiveRobotTask = createTransferTask_continuous_transfer(pMeasurement,
- 0, pLoadPorts[s], slot);
+ 0, pLoadPorts[p], slot);
if (m_pActiveRobotTask != nullptr) {
m_nContinuousTransferStep = CTStep_Measurement_LoadPort;
m_nContinuousTransferStep = CTStep_end;
@@ -1204,17 +1207,19 @@
}
// LoadPort -> Aligner
- for (int s = 0; s < 4; s++) {
- PortType pt = pLoadPorts[s]->getPortType();
+ for (int p = 0; p < 4; p++) {
+ PortType pt = pLoadPorts[p]->getPortType();
if ((m_nContinuousTransferStep == CTStep_Unknow || m_nContinuousTransferStep == CTStep_end)
- && !rmd.armState[0] && pLoadPorts[s]->isEnable()
+ && !rmd.armState[0] && pLoadPorts[p]->isEnable()
&& (pt == PortType::Loading || pt == PortType::Both)
- && pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ && pLoadPorts[p]->getPortStatus() == PORT_INUSE) {
for (int slot = 0; slot < SLOT_MAX; slot++) {
- m_pActiveRobotTask = createTransferTask_continuous_transfer(pLoadPorts[s],
+ m_pActiveRobotTask = createTransferTask_continuous_transfer(pLoadPorts[p],
slot, pAligner, 0);
if (m_pActiveRobotTask != nullptr) {
m_nContinuousTransferStep = CTStep_LoadPort_Aligner;
+ m_nContinuousWorkingPort = p;
+ m_nContinuousWorkingSlot = slot;
LOGI("<ContinuousTransfer>千传测试，开始搬送任务(LoadPort -> Aligner)...");
pEFEM->setContext(m_pActiveRobotTask->getContext());
goto CT_PORT_GET;
@@ -2076,7 +2081,7 @@
pTarSlot = pTarEq->getAvailableSlotForGlass(primaryType);
pSrcSlot = pSrcEq->getProcessedSlot(primaryType, bJobMode);
if (m_nTestFlag == 1) LOGD("createTransferTask 003 %x, %x", pTarSlot, pSrcSlot);
- if (pSrcSlot == nullptr || nullptr == pTarSlot && secondaryType != SERVO::MaterialsType::G0) {
+ if ((pSrcSlot == nullptr || nullptr == pTarSlot) && secondaryType != SERVO::MaterialsType::G0) {
pTarSlot = pTarEq->getAvailableSlotForGlass(secondaryType);
pSrcSlot = pSrcEq->getProcessedSlot(secondaryType, bJobMode);
}
@@ -2403,8 +2408,31 @@
temp.push_back(p);
}
}
-
m_processJobs = temp;
+
+
+ // 更新context
+ std::vector<uint8_t> newSlots;
+ std::vector<void*> newContexts;
+ for (auto pj : m_processJobs) {
+ for (auto& c : pj->carriers()) {
+ auto pPort = getPortWithCarrierId(c.carrierId);
+ if (pPort == nullptr) continue;
+
+ for (auto s : c.slots) {
+ auto pGlass = pPort->getGlassFromSlot(s);
+ if (pGlass == nullptr) continue;
+
+ newSlots.push_back(s);
+ newContexts.push_back(pGlass);
+ }
+
+ pj->setCarrierSlotsAndContexts(c.carrierId, newSlots, newContexts);
+ }
+ }
+
+
+
this->saveState();
return (int)m_processJobs.size();
@@ -2547,13 +2575,9 @@
return true;
}
- bool CMaster::loadState(const std::string& path)
+ bool CMaster::loadState()
{
- // 保存文件路径
- m_strStatePath = path;
-
-
- std::ifstream ifs(path, std::ios::binary);
+ std::ifstream ifs(m_strStatePath, std::ios::binary);
if (!ifs) return false;
// 文件头
@@ -2606,10 +2630,33 @@
m_pControlJob->setPJs(tempPjs);
+ // 更新contexts
+ auto pjs = m_pControlJob->getPjs();
+ for (auto pj : pjs) {
+ for (auto& c : pj->carriers()) {
+ auto p = getPortWithCarrierId(c.carrierId);
+ if (p == nullptr) continue;
+
+ std::vector<void*> contexts;
+ for (auto s : c.slots) {
+ auto g = getGlass(p->getIndex(), s - 1);
+ if (g == nullptr) continue;
+ contexts.push_back(g);
+ }
+ pj->setCarrierContexts(c.carrierId, contexts);
+ }
+ }
+
+
// 如果版本升级，可在这里判断 version 来加载新字段
return true;
+ }
+
+ void CMaster::setStateFile(const std::string& path)
+ {
+ m_strStatePath = path;
}
CProcessJob* CMaster::acquireNextProcessJob()
@@ -2752,6 +2799,50 @@
return nullptr;
}
+
+ bool CMaster::completeControlJob(std::string description)
+ {
+ if (m_pControlJob == nullptr || m_state != SERVO::MASTERSTATE::READY) {
+ return false;
+ }
+ for (auto item : m_processJobs) {
+ item->abort(description);
+ }
+ m_pControlJob->abort(description);
+
+
+ // 释放Job相关
+ for (auto item : m_processJobs) {
+ delete item;
+ }
+ m_processJobs.clear();
+ if (m_pControlJob != nullptr) {
+ delete m_pControlJob;
+ m_pControlJob = nullptr;
+ }
+
+ saveState();
+
+ return true;
+ }
+
+ bool CMaster::canCreateControlJob()
+ {
+ return m_pControlJob == nullptr;
+ }
+
+ bool CMaster::canCompleteControlJob()
+ {
+ return m_pControlJob != nullptr && m_state == SERVO::MASTERSTATE::READY;
+ }
+
+ bool CMaster::canDeleteControlJob()
+ {
+ return m_pControlJob != nullptr
+ && m_pControlJob->state() == CJState::NoState
+ && m_state == SERVO::MASTERSTATE::READY;
+ }
+
int CMaster::getWipGlasses(std::vector<CGlass*>& glasses)
{
for (auto eq : m_listEquipment) {
@@ -2782,4 +2873,65 @@
m_strLastError = "AOI检测未通过.";
}
}
+
+ bool CMaster::moveGlassToBuf(int eqid, int slotNo)
+ {
+ CEquipment* pEquipment = getEquipment(eqid);
+ if (pEquipment == nullptr) return false;
+
+ CSlot* pSlot = pEquipment->getSlotWithNo(slotNo);
+ if (pSlot == nullptr) return false;
+
+ CGlass* pGlass = (CGlass*)pSlot->getContext();
+ m_bufGlass.push_back(pGlass);
+ pGlass->addRef();
+ pSlot->setContext(nullptr);
+
+ m_bDataModify = TRUE;
+ if (m_listener.onEqDataChanged != nullptr) {
+ m_listener.onEqDataChanged(this, pEquipment, 0);
+ }
+
+ return true;
+ }
+
+ bool CMaster::moveGlassToSlot(int eqid, int slotNo)
+ {
+ CEquipment* pEquipment = getEquipment(eqid);
+ if (pEquipment == nullptr) return false;
+
+ CSlot* pSlot = pEquipment->getSlotWithNo(slotNo);
+ if (pSlot == nullptr) return false;
+ if (m_bufGlass.empty()) return false;
+
+ CGlass* pGlass = m_bufGlass.front();
+ m_bufGlass.pop_front();
+ if (pGlass == nullptr) return false;
+ pSlot->setContext(pGlass);
+ pGlass->release();
+
+ m_bDataModify = TRUE;
+ if (m_listener.onEqDataChanged != nullptr) {
+ m_listener.onEqDataChanged(this, pEquipment, 0);
+ }
+
+ return true;
+ }
+
+ CGlass* CMaster::getGlass(int scrPort, int scrSlot)
+ {
+ for (auto eq : m_listEquipment) {
+ std::vector<CGlass*> glasses;
+ eq->getAllGlass(glasses);
+ for (auto g : glasses) {
+ int p, s;
+ g->getOrginPort(p, s);
+ if (p == scrPort && s == scrSlot) {
+ return g;
+ }
+ }
+ }
+
+ return nullptr;
+ }
}
--
Gitblit v1.9.3