From e731e05bb712765bf85a359ff4d505e39ca09c02 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 14:19:01 +0800
Subject: [PATCH] 1.Port Status 测试; 2.Cassette ctrl cmd测试和修改地址;

---
 SourceCode/Bond/Servo/CLoadPort.cpp |  188 +++++++++++++++++++++++++++-------------------
 1 files changed, 110 insertions(+), 78 deletions(-)

diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index bafeca1..aa096e3 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()
 	{
@@ -22,6 +30,7 @@
 		m_transferMode = TransferMode::AGVMode;
 		m_bEnable = FALSE;
 		m_bAutoChangeEnable = FALSE;
+		m_nNextCassetteSequenceNo = 0;
 	}
 
 	CLoadPort::~CLoadPort()
@@ -57,30 +66,12 @@
 	// 必须要实现的虚函数,在此初始化Slot信息
 	void CLoadPort::initSlots()
 	{
-		m_slot[0].enable();
-		m_slot[0].setPosition(m_nID);
-		m_slot[0].setNo(1);
-		m_slot[0].setName("Slot 1");
-		m_slot[1].enable();
-		m_slot[1].setPosition(m_nID);
-		m_slot[1].setNo(2);
-		m_slot[1].setName("Slot 2");
-		m_slot[2].setPosition(m_nID);
-		m_slot[2].enable();
-		m_slot[2].setNo(3);
-		m_slot[2].setName("Slot 3");
-		m_slot[3].setPosition(m_nID);
-		m_slot[3].enable();
-		m_slot[3].setNo(4);
-		m_slot[3].setName("Slot 4");
-		m_slot[4].setPosition(m_nID);
-		m_slot[4].enable();
-		m_slot[4].setNo(5);
-		m_slot[4].setName("Slot 5");
-		m_slot[5].setPosition(m_nID);
-		m_slot[5].enable();
-		m_slot[5].setNo(6);
-		m_slot[5].setName("Slot 6");
+		for (int i = 0; i < SLOT_MAX; i++) {
+			m_slot[i].enable();
+			m_slot[i].setPosition(m_nID);
+			m_slot[i].setNo(i + 1);
+			m_slot[i].setName((std::string("Slot") + std::to_string(i+1)).c_str());
+		}
 	}
 
 	void CLoadPort::initSteps()
@@ -92,15 +83,15 @@
 
 		{
 			// Cassette Ctrl Cmd
-			static char* pszName[] = { STEP_EQ_P1_CASSETTE_CTRL_CMD,	STEP_EQ_P2_CASSETTE_CTRL_CMD, STEP_EQ_P3_CASSETTE_CTRL_CMD,	STEP_EQ_P4_CASSETTE_CTRL_CMD };
-			static int writeSignalDev[] = { 0x120, 0x121, 0x122, 0x123 };
+			static char* pszName[] = { STEP_EQ_P1_CASSETTE_CTRL_CMD, STEP_EQ_P2_CASSETTE_CTRL_CMD, STEP_EQ_P3_CASSETTE_CTRL_CMD, STEP_EQ_P4_CASSETTE_CTRL_CMD };
+			static int writeSignalDev[] = { 0x130, 0x131, 0x132, 0x133 };
 			static int dev[] = { 0x45, 0x1a5, 0x305, 0x465 };
-			static int addr[] = { 0x480, 0x481, 0x482, 0x483 };
+			static int addr[] = { STEP_ID_PROT1_CASSETTE_CTR_CMD_REPLY, STEP_ID_PROT2_CASSETTE_CTR_CMD_REPLY, STEP_ID_PROT3_CASSETTE_CTR_CMD_REPLY, STEP_ID_PROT4_CASSETTE_CTR_CMD_REPLY };
 
-			CEqCassetteCtrlCmdStep* pStep = new CEqCassetteCtrlCmdStep();
+			CEqWriteStep* pStep = new CEqWriteStep();
 			pStep->setName(pszName[m_nIndex]);
 			pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
-			pStep->setCtrlCmdDev(dev[m_nIndex]);
+			pStep->setDataDev(dev[m_nIndex]);
 			if (addStep(addr[m_nIndex], pStep) != 0) {
 				delete pStep;
 			}
@@ -317,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;
 			}
 		}
@@ -333,12 +324,12 @@
 			};
 			static int dev[] = { 0x6050, 0x6070, 0x6090, 0x60b0 };
 			static int writeSignalDev[6][4] = {
+				{0xc8, 0xc9, 0xca, 0xcb},
+				{0xd0, 0xd1, 0xd2, 0xd3},
 				{0xd8, 0xd9, 0xda, 0xdb},
 				{0xe0, 0xe1, 0xe2, 0xe3},
 				{0xe8, 0xe9, 0xea, 0xeb},
-				{0xf0, 0xf1, 0xf2, 0xf3},
-				{0xf8, 0xf9, 0xfa, 0xfb},
-				{0x100, 0x101, 0x102, 0x103}
+				{0xf0, 0xf1, 0xf2, 0xf3}
 			};
 			static int addr[6][4] = {
 				{ STEP_ID_PORT1_EMPTY, STEP_ID_PORT2_EMPTY, STEP_ID_PORT3_EMPTY, STEP_ID_PORT4_EMPTY },
@@ -354,6 +345,7 @@
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
 							decodePortStatusReport((CStep*)pFrom, pszData, size);
+							return 0;
 						}
 						return -1;
 					});
@@ -431,17 +423,22 @@
 		int jobExistenceSize,
 		short slotProcess,
 		short jopCount,
-		CJobDataA* pJobDataA)
+		CJobDataA* pJobDataA,
+		ONWRITED onWritedBlock)
 	{
-		int id = getID();
-		if ( !(id == EQ_ID_LOADPORT1 || id == EQ_ID_LOADPORT2) ) {
-			return -1;
-		}
-
-
-		SERVO::CEqCassetteCtrlCmdStep* pStep = (SERVO::CEqCassetteCtrlCmdStep*)getCassetteCtrlCmdStep();
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getCassetteCtrlCmdStep();
 		ASSERT(pStep);
-		return pStep->sendCtrlCmd(cmd, jobExistence, jobExistenceSize, slotProcess, jopCount, pJobDataA);
+
+		ASSERT(jobExistenceSize == 12);
+		ASSERT(pJobDataA);
+
+		char szBuffer[1024] = { 0 };
+		memcpy(&szBuffer[0], &cmd, sizeof(short));
+		memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
+		memcpy(&szBuffer[26], &slotProcess, sizeof(short));
+		memcpy(&szBuffer[36], &jopCount, sizeof(short));
+		int nLen = pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+		return pStep->writeDataEx(szBuffer, 352 * 2, onWritedBlock);
 	}
 
 	CStep* CLoadPort::getCassetteCtrlCmdStep()
@@ -459,6 +456,16 @@
 		Unlock();
 
 		return pStep;
+	}
+
+	short CLoadPort::getNextCassetteSequenceNo()
+	{
+		m_nNextCassetteSequenceNo++;
+		if (m_nNextCassetteSequenceNo >= 1000) {
+			m_nNextCassetteSequenceNo = 0;
+		}
+
+		return (m_nIndex + 1) * 1000 + m_nNextCassetteSequenceNo;
 	}
 
 	void CLoadPort::setIndex(unsigned int index)
@@ -838,6 +845,8 @@
 
 	void CLoadPort::onReceiveLBData(const char* pszData, size_t size)
 	{
+		__super::onReceiveLBData(pszData, size);
+
 		static int type[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE,
 			STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
 		static int mode[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE,
@@ -872,12 +881,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)
@@ -890,15 +899,16 @@
 
 		// 缓存Attribute,用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		m_portStatusReport.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
 
-
-		LOGI("<CCassetteTranserStateStep>decodePortStatusReport<Status:%d, CassetteSequenceNo:%d>",
-			m_portStatusReport.getPortStatus(), m_portStatusReport.getCassetteSequenceNo());
-
-
+		LOGI("<CCassetteTranserStateStep>decodePortStatusReport<Status:%d, CassetteSequenceNo:%d, CassetteId:%s>",
+			m_portStatusReport.getPortStatus(), m_portStatusReport.getCassetteSequenceNo(), 
+			m_portStatusReport.getCassetteId().c_str());
+		if (m_portStatusReport.getPortStatus() == 3) {
+			LOGI("<CCassetteTranserStateStep>InUse<JobExistenceSlot:%d>",
+				m_portStatusReport.getJobExistenceSlot());
+		}
 		return nRet;
 	}
 
@@ -1110,13 +1120,8 @@
 	/*
 	 * 生成测试用的玻璃列表
 	 */
-	int CLoadPort::testGenerateGlassList(MaterialsType type, const char* pszPrefix, int startSuffix)
+	int CLoadPort::testGenerateGlassList(MaterialsType type)
 	{
-		static unsigned short nJobSequenceNo = 0;
-		static unsigned short nCassetteSequenceNo = 0;
-		nCassetteSequenceNo++;
-
-
 		// 如果非空就不生成了
 		Lock();
 		if (hasGlass()) {
@@ -1127,32 +1132,21 @@
 
 
 		char szBuffer[64];
-		int suffix = startSuffix;
-		for (int i = 0; i < SLOT_MAX; i++) {
+		for (int i = 0; i < 1; i++) {
 			if (!m_slot[i].isEnable()) continue;
 
-			CJobDataB jb;
 			CJobDataS js;
-
-			sprintf_s(szBuffer, "%s%d", pszPrefix, suffix++);
-			jb.setGlassId(szBuffer);
-			jb.setCassetteSequenceNo(nCassetteSequenceNo);
-			jb.setJobSequenceNo(++nJobSequenceNo);
+			js.setCassetteSequenceNo(getNextCassetteSequenceNo());
+			js.setJobSequenceNo(m_slot[i].getNo());
+			sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
+			//js.setGlass1Id(szBuffer);
+			js.setJobType(1);
 			js.setMaterialsType((int)type);
-			js.setCassetteSequenceNo(nCassetteSequenceNo);
-			js.setJobSequenceNo(nJobSequenceNo);
-			if (type == MaterialsType::G1) {
-				js.setGlass1Id(szBuffer);
-			}
-			else if (type == MaterialsType::G2) {
-				js.setGlass2Id(szBuffer);
-			}
 
 			CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
 			pGlass->addPath(m_nID, 0);
 			pGlass->processEnd(m_nID, 0);
 			pGlass->setID(szBuffer);
-			pGlass->setJobDataB(&jb);
 			pGlass->setType(type);
 			pGlass->setJobDataS(&js);
 			m_slot[i].setContext(pGlass);
@@ -1161,4 +1155,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