From b54cb6d1d8742e94bd79623d4f410b3ff5abde86 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 26 六月 2025 08:47:12 +0800
Subject: [PATCH] 6.定时轮询比特位,修改为只轮询EFEM, Bonder1, Bonder2, BakeCooling, VacuuumBake, Measurent, 其它只是以上的子单元,共用CC-Link的数据块。 7.修改一处转换机械手的放置目标POS时的错误 问题。 8.增加机械手状态和托盘是否有物料的信息打印,以便于创建搬送任务时观察和调试

---
 SourceCode/Bond/Servo/CLoadPort.cpp |  108 +++++++++++++++++++++++++++--------------------------
 1 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index cbae095..c6591e7 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -12,6 +12,14 @@
 	}																		\
 }
 
+#define CHECK_WRITE_STEP_SIGNAL2(addr, data, size) {							\
+	BOOL bFlag = isBitOn(data, size, addr);									\
+	SERVO::CStep* pStep = getStep(addr);									\
+	if (pStep != nullptr) {													\
+		((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0);				\
+	}																		\
+}
+
 namespace SERVO {
 	CLoadPort::CLoadPort() : CEquipment()
 	{
@@ -300,7 +308,7 @@
 			pStep->setName(pszName[m_nIndex]);
 			pStep->setWriteSignalDev(0x128 + m_nIndex);
 			pStep->setDataDev(dev[m_nIndex]);
-			if (addStep(STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+			if (addStep(STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
 				delete pStep;
 			}
 		}
@@ -346,50 +354,6 @@
 				if (addStep(addr[i][m_nIndex], pStep) != 0) {
 					delete pStep;
 				}
-			}
-		}
-		
-		{
-			// Fetched Out Job Report #1~15
-			char szBuffer[256];
-			CEqReadStep* pStep = new CEqReadStep(0x5c31 + 18 * m_nIndex, 18 * 2,
-				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
-					if (code == ROK && pszData != nullptr && size > 0) {
-						int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
-						if (port > 0) {
-							decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
-						}
-					}
-					return -1;
-				});
-			sprintf_s(szBuffer, "%s%d", STEP_EQ_FETCHED_OUT_JOBn, m_nIndex + 1);
-			pStep->setName(szBuffer);
-			pStep->setProp("Port", (void*)(__int64)(m_nIndex + 1));
-			pStep->setWriteSignalDev(0x023 + m_nIndex);
-			if (addStep(STEP_ID_FETCHED_OUT_JOB_REPORT1 + m_nIndex, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		{
-			// Store Job Report #1~15
-			char szBuffer[256];
-			CEqReadStep* pStep = new CEqReadStep(0x5b23 + 18 * m_nIndex, 18 * 2,
-				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
-					if (code == ROK && pszData != nullptr && size > 0) {
-						int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
-						if (port > 0) {
-							decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
-						}
-					}
-					return -1;
-				});
-			sprintf_s(szBuffer, "%s%d", STEP_EQ_STORED_JOBn, m_nIndex + 1);
-			pStep->setName(szBuffer);
-			pStep->setProp("Port", (void*)(__int64)(m_nIndex + 1));
-			pStep->setWriteSignalDev(0x014 + m_nIndex);
-			if (addStep(STEP_ID_STORE_JOB_REPORT1 + m_nIndex, pStep) != 0) {
-				delete pStep;
 			}
 		}
 	}
@@ -911,12 +875,12 @@
 		static int cassetteTypeReply[] = { STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY,
 			STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY };
 
-		CHECK_READ_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
 	}
 
 	int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -1166,9 +1130,9 @@
 
 			CJobDataS js;
 			js.setCassetteSequenceNo(getNextCassetteSequenceNo());
-			js.setJobSequenceNo(i);
+			js.setJobSequenceNo(m_slot[i].getNo());
 			sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
-			js.setGlass1Id(szBuffer);
+			//js.setGlass1Id(szBuffer);
 			js.setJobType(1);
 			js.setMaterialsType((int)type);
 
@@ -1184,4 +1148,42 @@
 		return 0;
 	}
 
+	int CLoadPort::testGenerateGlassListFromConfig(const SERVO::PortConfig& config)
+	{
+		char szBuffer[64];
+		for (const auto& slot : config.vecSlot) {
+			int nSlotIndex = slot.nSlotID - 1;
+			if (nSlotIndex < 0 || nSlotIndex >= SLOT_MAX) {
+				continue;
+			}
+			if (!slot.isEnabled) {
+				m_slot[nSlotIndex].setContext(nullptr);
+				continue;
+			}
+
+			CJobDataS js;
+			js.setCassetteSequenceNo(getNextCassetteSequenceNo());
+			js.setJobSequenceNo(m_slot[nSlotIndex].getNo());
+
+			sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
+			js.setJobType(1);
+			js.setMaterialsType(config.nMaterialType);
+
+			js.setLotId(config.strLotID.c_str());
+			js.setProductId(config.strProductID.c_str());
+			js.setOperationId(config.strOperationID.c_str());
+			js.setGlass1Id(szBuffer);
+
+			CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+			pGlass->addPath(m_nID, 0);
+			pGlass->processEnd(m_nID, 0);
+			pGlass->setID(szBuffer);
+			pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));
+			pGlass->setJobDataS(&js);
+
+			m_slot[nSlotIndex].setContext(pGlass);
+		}
+
+		return 0;
+	}
 }

--
Gitblit v1.9.3