From 6d71f1d8264b929ca71bf133246b894ed955c079 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 12 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/Servo/CMaster.cpp |  407 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 332 insertions(+), 75 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index d536f7c..e5f2e60 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -279,6 +279,40 @@
 
 	unsigned CMaster::DispatchProc()
 	{
+		// 优先考虑的类型和次要类型
+		// 一种情况,如果不分主次,一直搬G1, 等到Bonder1和Bonder2都放了G1, Aligner也放了G1,
+		// Bonder1和Bonder2需要的G2就过不来了
+		// 最基本的实现,可以G2和G2轮流搬送,但最好根据Bonder的需求来决定
+		MaterialsType primaryType, secondaryType;
+
+
+		// 各种机器
+		CEFEM* pEFEM = (CEFEM*)getEquipment(EQ_ID_EFEM);
+		CLoadPort* pLoadPort1 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT1);
+		CLoadPort* pLoadPort2 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT2);
+		CLoadPort* pLoadPort3 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT3);
+		CLoadPort* pLoadPort4 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT4);
+		CFliper* pFliper = (CFliper*)getEquipment(EQ_ID_FLIPER);
+		CVacuumBake* pVacuumBack = (CVacuumBake*)getEquipment(EQ_ID_VACUUMBAKE);
+		CAligner* pAligner = (CAligner*)getEquipment(EQ_ID_ALIGNER);
+		CBonder* pBonder1 = (CBonder*)getEquipment(EQ_ID_Bonder1);
+		CBonder* pBonder2 = (CBonder*)getEquipment(EQ_ID_Bonder2);
+		CBakeCooling* pBakeCooling = (CBakeCooling*)getEquipment(EQ_ID_BAKE_COOLING);
+		CMeasurement* pMeasurement = (CMeasurement*)getEquipment(EQ_ID_MEASUREMENT);
+
+		ASSERT(pEFEM);
+		ASSERT(pLoadPort1);
+		ASSERT(pLoadPort2);
+		ASSERT(pLoadPort3);
+		ASSERT(pLoadPort4);
+		ASSERT(pFliper);
+		ASSERT(pVacuumBack);
+		ASSERT(pAligner);
+		ASSERT(pBonder1);
+		ASSERT(pBonder2);
+		ASSERT(pBakeCooling);
+		ASSERT(pMeasurement);
+
 		while (1) {
 			// 待退出信号或时间到
 			HANDLE hEvents[] = { m_hEventDispatchThreadExit[0], m_hDispatchEvent };
@@ -310,81 +344,201 @@
 			// 调度逻辑处理
 			else if (m_state == MASTERSTATE::RUNNING) {
 				unlock();
-				LOGI("调度处理中...");
+				// LOGI("调度处理中...");
 
 				lock();
 				if (m_pActiveRobotTask != nullptr) {
 					unlock();
 					// 检测到当前有正在下午的任务,确保当前任务完成或中止后继续
-					LOGI("检测到当前有正在下午的任务,确保当前任务完成或中止后继续...");
-					continue;
-				}
-
-				// LoadPort -> Fliper(G2)
-				CLoadPort* pLoadPort1 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT1);
-				CLoadPort* pLoadPort2 = (CLoadPort*)getEquipment(EQ_ID_LOADPORT2);
-				CFliper* pFliper = (CFliper*)getEquipment(EQ_ID_FLIPER);
-				CVacuumBake* pVacuumBack = (CVacuumBake*)getEquipment(EQ_ID_VACUUMBAKE);
-				ASSERT(pLoadPort1);
-				ASSERT(pLoadPort2);
-				ASSERT(pFliper);
-				ASSERT(pVacuumBack);
-
-				m_pActiveRobotTask = createTransferTask(pLoadPort1, pFliper);
-				if (m_pActiveRobotTask != nullptr) {
-					std::string strDescription = m_pActiveRobotTask->getDescription();
-					unlock();
-					LOGI("创建新任务<%s>...", strDescription.c_str());
-					continue;
-				}
-
-				m_pActiveRobotTask = createTransferTask(pLoadPort2, pFliper);
-				if (m_pActiveRobotTask != nullptr) {
-					std::string strDescription = m_pActiveRobotTask->getDescription();
-					unlock();
-					LOGI("创建新任务<%s>...", strDescription.c_str());
+					// LOGI("检测到当前有正在下午的任务,确保当前任务完成或中止后继续...");
 					continue;
 				}
 
 
-
-				// LoadPort -> VacuumBake(G1)
-				m_pActiveRobotTask = createTransferTask(pLoadPort1, pVacuumBack);
-				if (m_pActiveRobotTask != nullptr) {
-					std::string strDescription = m_pActiveRobotTask->getDescription();
-					unlock();
-					LOGI("创建新任务1<%s>...", strDescription.c_str());
-					continue;
+				// 此处检测优先类型和次要类型(G1或G2)
+				// 如果其中一Bonder有单个玻璃,优先取它的配对类型,否则无所谓了
+				primaryType = MaterialsType::G1;
+				secondaryType = MaterialsType::G2;
+				if ((!pBonder1->canPlaceGlassInSlot(0) && !pBonder1->canPlaceGlassInSlot(1))
+					&& (!pBonder2->canPlaceGlassInSlot(0) && !pBonder2->canPlaceGlassInSlot(1))) {
+					// 如果G1和G2都满了,那就看Aligner, 如果Aligner有玻璃为G1, 则取G2
+					CGlass* pGlass = pAligner->getGlassFromSlot(1);
+					if (pGlass != nullptr && pGlass->getType() == MaterialsType::G1) {
+						primaryType = MaterialsType::G2;
+						secondaryType = MaterialsType::G1;
+					}
 				}
-
-				m_pActiveRobotTask = createTransferTask(pLoadPort2, pVacuumBack);
-				if (m_pActiveRobotTask != nullptr) {
-					std::string strDescription = m_pActiveRobotTask->getDescription();
-					unlock();
-					LOGI("创建新任务2<%s>...", strDescription.c_str());
-					continue;
+				else if ((pBonder1->canPlaceGlassInSlot(0) && !pBonder1->canPlaceGlassInSlot(1))
+					|| (pBonder2->canPlaceGlassInSlot(0) && !pBonder2->canPlaceGlassInSlot(1))) {
+					primaryType = MaterialsType::G2;
+					secondaryType = MaterialsType::G1;
 				}
-
-
-
-				// Fliper(G2) -> Aligner
-
-
-				// VacuumBake(G1) -> Aligner
-
-
-				// Aligner -> Bonder
-
-
-				// Bonder -> BakeCooling
-
-
-				// BakeCooling ->Measurement
 
 
 				// Measurement -> LoadPort
+				CLoadPort* pEqLoadPort[] = { pLoadPort1, pLoadPort2, pLoadPort3, pLoadPort4 };
+				CEquipment* pEqTar[] = { pVacuumBack, pFliper };
+				if (primaryType == MaterialsType::G2) {
+					pEqTar[0] = pFliper;
+					pEqTar[1] = pVacuumBack;
+				}
+				for (int s = 0; s < 4; s++) {
+					if (pEqLoadPort[s]->isEnable()
+						&& pEqLoadPort[s]->getPortType() == PortType::Unloading
+						&& pEqLoadPort[s]->getPortMode() == PortMode::ReadyToUnload) {
+						m_pActiveRobotTask = createTransferTask(pMeasurement, pEqLoadPort[s], primaryType, secondaryType);
+						if (m_pActiveRobotTask != nullptr) {
+							goto PORT_PUT;
+						}
+					}
+				}
+
+			PORT_PUT:
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
 
 
+				// BakeCooling ->Measurement
+				m_pActiveRobotTask = createTransferTask_bakecooling_to_measurement(pBakeCooling, pMeasurement);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+				
+				// BakeCooling内部
+				// Bake -> Cooling
+				m_pActiveRobotTask = createTransferTask_bake_to_cooling(pBakeCooling);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+
+				// Bonder -> BakeCooling
+				m_pActiveRobotTask = createTransferTask_bonder_to_bakecooling(pBonder1, pBakeCooling);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+				m_pActiveRobotTask = createTransferTask_bonder_to_bakecooling(pBonder2, pBakeCooling);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+				// Aligner -> Bonder
+				m_pActiveRobotTask = createTransferTask(pAligner, pBonder1, primaryType, secondaryType);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+				m_pActiveRobotTask = createTransferTask(pAligner, pBonder2, primaryType, secondaryType);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+
+				// Fliper(G2) -> Aligner
+				// VacuumBake(G1) -> Aligner
+				m_pActiveRobotTask = createTransferTask(pFliper, pAligner, primaryType, secondaryType);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+				m_pActiveRobotTask = createTransferTask(pVacuumBack, pAligner, primaryType, secondaryType);
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
+
+
+				// LoadPort -> Fliper(G2)
+				// LoadPort -> VacuumBake(G1)
+				for (int s = 0; s < 4; s++) {
+					for (int t = 0; t < 2; t++) {
+						if (pEqLoadPort[s]->isEnable()
+							&& pEqLoadPort[s]->getPortType() == PortType::Loading
+							&& pEqLoadPort[s]->getPortMode() == PortMode::ReadyToLoad) {
+							m_pActiveRobotTask = createTransferTask(pEqLoadPort[s], pEqTar[t], primaryType, secondaryType);
+							if (m_pActiveRobotTask != nullptr) {
+								goto PORT_GET;
+							}
+						}
+					}
+				}
+
+PORT_GET:
+				if (m_pActiveRobotTask != nullptr) {
+					m_pActiveRobotTask->run();
+					std::string strDescription = m_pActiveRobotTask->getDescription();
+					unlock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_CREATE);
+					}
+					LOGI("创建新任务<%s>...", strDescription.c_str());
+					continue;
+				}
 
 				unlock();
 
@@ -409,17 +563,26 @@
 				break;
 			}
 
+			// 读标志位
 			for (auto item : m_listEquipment) {
-				if (item->getID() == EQ_ID_Bonder1 ||
-					item->getID() == EQ_ID_Bonder2) {
-					const StationIdentifier& station = item->getStation();
-					MemoryBlock& block = item->getReadBitBlock();
+				//if (item->getID() == EQ_ID_Bonder1 ||
+				//	item->getID() == EQ_ID_Bonder2) {
+				//	const StationIdentifier& station = item->getStation();
+				//	MemoryBlock& block = item->getReadBitBlock();
 
-					int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
-						block.start, block.size, block.buffer);
-					if (0 == nRet) {
-						item->onReceiveLBData(block.buffer, block.size);
-					}
+				//	int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
+				//		block.start, block.size, block.buffer);
+				//	if (0 == nRet) {
+				//		item->onReceiveLBData(block.buffer, block.size);
+				//	}
+				//}
+				const StationIdentifier& station = item->getStation();
+				MemoryBlock& block = item->getReadBitBlock();
+
+				int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
+					block.start, block.size, block.buffer);
+				if (0 == nRet) {
+					item->onReceiveLBData(block.buffer, block.size);
 				}
 			}
 		}
@@ -552,6 +715,9 @@
 
 
 					lock();
+					if (m_listener.onRobotTaskEvent != nullptr) {
+						m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_FINISH);
+					}
 					delete m_pActiveRobotTask;
 					m_pActiveRobotTask = nullptr;
 				}
@@ -630,7 +796,7 @@
 		pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
 		pEquipment->setName("VacuumBake(G1)");
 		pEquipment->setDescription("VacuumBake(G1).");
-		pEquipment->setReadBitBlock(0x4000, 0x45ff);
+		pEquipment->setReadBitBlock(0x5c00, 0x66ff);
 		pEquipment->setStation(0, 255);
 		addToEquipmentList(pEquipment);
 
@@ -741,7 +907,7 @@
 		pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
 		pEquipment->setName("BakeCooling");
 		pEquipment->setDescription("BakeCooling.");
-		pEquipment->setReadBitBlock(0x4000, 0x45ff);
+		pEquipment->setReadBitBlock(0x5100, 0x5bff);
 		pEquipment->setStation(0, 255);
 		addToEquipmentList(pEquipment);
 
@@ -969,21 +1135,23 @@
 	}
 
 	static int taskSeqNo = 0;
-	CRobotTask* CMaster::createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq)
+	CRobotTask* CMaster::createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
+		MaterialsType primaryType/* = MaterialsType::G1*/, MaterialsType secondaryType/* = MaterialsType::G2*/)
 	{
 		CRobotTask* pTask = nullptr;
 		CSlot* pSrcSlot, * pTarSlot;
-		pTarSlot = pTarEq->getAvailableSlotForGlass(MaterialsType::G1);
-		pSrcSlot = pSrcEq->getNonEmptySlot(MaterialsType::G1);
+		pTarSlot = pTarEq->getAvailableSlotForGlass(primaryType);
+		pSrcSlot = pSrcEq->getProcessedSlot(primaryType);
 		if (pSrcSlot == nullptr || nullptr == pTarSlot) {
-			pTarSlot = pTarEq->getAvailableSlotForGlass(MaterialsType::G2);
-			pSrcSlot = pSrcEq->getNonEmptySlot(MaterialsType::G2);
+			pTarSlot = pTarEq->getAvailableSlotForGlass(secondaryType);
+			pSrcSlot = pSrcEq->getProcessedSlot(secondaryType);
 		}
 
 
 		if (pSrcSlot != nullptr && nullptr != pTarSlot) {
 			pTask = new CRobotTask();
 			pTask->setContext(pSrcSlot->getContext());
+			pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
 			pTask->setRobotTransferParam(++taskSeqNo, 1, pSrcSlot->getPosition(),
 				pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
 		}
@@ -991,4 +1159,93 @@
 
 		return pTask;
 	}
+
+	CRobotTask* CMaster::createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq)
+	{
+		std::vector<int> slots = {1, 2};
+
+		CRobotTask* pTask = nullptr;
+		CSlot* pSrcSlot, * pTarSlot;
+		pTarSlot = pTarEq->getAvailableSlotForGlass2(MaterialsType::G1, slots);
+		pSrcSlot = pSrcEq->getProcessedSlot(MaterialsType::G1);
+
+		if (pSrcSlot != nullptr && nullptr != pTarSlot) {
+			pTask = new CRobotTask();
+			pTask->setContext(pSrcSlot->getContext());
+			pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
+			pTask->setRobotTransferParam(++taskSeqNo, 1, pSrcSlot->getPosition(),
+				pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
+		}
+
+
+		return pTask;
+	}
+
+	CRobotTask* CMaster::createTransferTask_bake_to_cooling(CEquipment* pSrcEq)
+	{
+		std::vector<int> slotsTar = { 3, 4 };
+		std::vector<int> slotsSrc = { 1, 2 };
+
+		CRobotTask* pTask = nullptr;
+		CSlot* pSrcSlot, * pTarSlot;
+		pTarSlot = pSrcEq->getAvailableSlotForGlass2(MaterialsType::G1, slotsTar);
+		pSrcSlot = pSrcEq->getProcessedSlot2(MaterialsType::G1, slotsSrc);
+
+		if (pSrcSlot != nullptr && nullptr != pTarSlot) {
+			pTask = new CRobotTask();
+			pTask->setContext(pSrcSlot->getContext());
+			pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
+			pTask->setRobotTransferParam(++taskSeqNo, 1, pSrcSlot->getPosition(),
+				pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
+		}
+
+
+		return pTask;
+	}
+
+	CRobotTask* CMaster::createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq)
+	{
+		std::vector<int> slots = { 3, 4 };
+
+		CRobotTask* pTask = nullptr;
+		CSlot* pSrcSlot, * pTarSlot;
+		pTarSlot = pTarEq->getAvailableSlotForGlass(MaterialsType::G1);
+		pSrcSlot = pSrcEq->getProcessedSlot2(MaterialsType::G1, slots);
+
+		if (pSrcSlot != nullptr && nullptr != pTarSlot) {
+			pTask = new CRobotTask();
+			pTask->setContext(pSrcSlot->getContext());
+			pTask->setEFEM((CEFEM*)getEquipment(EQ_ID_EFEM));
+			pTask->setRobotTransferParam(++taskSeqNo, 1, pSrcSlot->getPosition(),
+				pTarSlot->getPosition(), pSrcSlot->getNo(), pTarSlot->getNo());
+		}
+
+
+		return pTask;
+	}
+
+	int CMaster::abortCurrentTask()
+	{
+		lock();
+		if (m_pActiveRobotTask != nullptr) {
+			m_pActiveRobotTask->abort();
+		}
+		unlock();
+
+		if (m_listener.onRobotTaskEvent != nullptr) {
+			m_listener.onRobotTaskEvent(this, m_pActiveRobotTask, ROBOT_EVENT_ABORT);
+		}
+
+		lock();
+		if (m_pActiveRobotTask != nullptr) {
+			delete m_pActiveRobotTask;
+			m_pActiveRobotTask = nullptr;
+		}
+		unlock();
+
+		// 当前任务手动中止后,停止调度,需要操作员在解决问题后,重新启动
+		stop();
+
+		return 0;
+	}
 }

--
Gitblit v1.9.3