From 3426d4e0ee09c61ce379cfd1fe9a6e82de346d90 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 29 四月 2025 10:58:51 +0800
Subject: [PATCH] 1.增加CEqCurrentRecipeChangeStep

---
 SourceCode/Bond/Servo/CMaster.cpp |  353 ++++++++++++++++++++++++----------------------------------
 1 files changed, 145 insertions(+), 208 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 9d7a38d..d663e6f 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -34,7 +34,7 @@
 
 	CMaster::CMaster()
 	{
-		m_listener = {nullptr, nullptr, nullptr};
+		m_listener = {nullptr, nullptr, nullptr, nullptr};
 		m_bDataModify = FALSE;
 		m_hEventReadBitsThreadExit[0] = ::CreateEvent(NULL, TRUE, FALSE, NULL);
 		m_hEventReadBitsThreadExit[1] = ::CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -65,6 +65,7 @@
 		m_listener.onEqAlive = listener.onEqAlive;
 		m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
 		m_listener.onEqAlarm = listener.onEqAlarm;
+		m_listener.onEqVcrEventReport = listener.onEqVcrEventReport;
 	}
 
 	int CMaster::init()
@@ -99,14 +100,21 @@
 
 
 		// 初始化添加各子设备
-		addLoadPort(0);
-		addLoadPort(1);
-		addLoadPort(2);
-		addLoadPort(3);
+		CLoadPort* pPort1, * pPort2, * pPort3, * pPort4;
+		CEFEM* pEfem;
+		pPort1 = addLoadPort(0);
+		pPort2 = addLoadPort(1);
+		pPort3 = addLoadPort(2);
+		pPort4 = addLoadPort(3);
+		pEfem = addEFEM();
+		pEfem->setPort(0, pPort1);
+		pEfem->setPort(1, pPort1);
+		pEfem->setPort(2, pPort1);
+		pEfem->setPort(3, pPort1);
+
 		addFliper();
 		addVacuumBake();
 		addAligner();
-		addEFEM();
 		addBonder(0);
 		addBonder(1);
 		addBakeCooling();
@@ -199,6 +207,13 @@
 				m_listener.onEqAlarm(this, p, state, alarmId, unitId, level);
 			}
 		};
+		listener.onVcrEventReport = [&](void* pEquipment, void* pReport) -> void {
+			CEquipment* p = (CEquipment*)pEquipment;
+			CVcrEventReport* p2 = (CVcrEventReport*)pReport;
+			if (m_listener.onEqVcrEventReport != nullptr) {
+				m_listener.onEqVcrEventReport(this, p, p2);
+			}
+		};
 		listener.onDataChanged = [&](void* pEquipment, int code) -> void {
 			m_bDataModify = TRUE;
 		};
@@ -224,10 +239,11 @@
 		return nullptr;
 	}
 
-	/* 添加LoadPort1
+	/*
+	 * 添加LoadPort1
 	 * index -- 0~3
 	 */
-	int CMaster::addLoadPort(int index)
+	CLoadPort* CMaster::addLoadPort(int index)
 	{
 		ASSERT(index == 0 || index == 1 || index == 2 || index == 3);
 		static char* pszCassetteCtrlCmd[] = { 
@@ -244,6 +260,7 @@
 		char szName[64];
 		sprintf_s(szName, 64, "LoadPort %d", index + 1);
 		CLoadPort* pEquipment = new CLoadPort();
+		pEquipment->setIndex(index);
 		pEquipment->setID(EQ_ID_LOADPORT1 + index);
 		pEquipment->setName(szName);
 		pEquipment->setDescription(szName);
@@ -262,11 +279,102 @@
 		}
 
 
+		{
+			// Type
+			char* pszName[] = { STEP_EQ_PORT1_TYPE, STEP_EQ_PORT2_TYPE, STEP_EQ_PORT3_TYPE, STEP_EQ_PORT4_TYPE };
+			int dev[] = { 0x6010 , 0x6020, 0x6030, 0x6040 };
+			int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
+			int addr[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE, STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
+
+			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+			pStep->setName(pszName[index]);
+			pStep->setWriteSignalDev(writeSignalDev[index]);
+			if (pEquipment->addStep(addr[index], pStep) != 0) {
+				delete pStep;
+			}
+		}
+		
+		{
+			// Mode
+			char* pszName[] = { STEP_EQ_PORT1_MODE, STEP_EQ_PORT2_MODE, STEP_EQ_PORT3_MODE, STEP_EQ_PORT4_MODE };
+			int dev[] = { 0x6011, 0x6021, 0x6031, 0x6041};
+			int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
+			int addr[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE, STEP_ID_PORT3_MODE_CHANGE, STEP_ID_PORT4_MODE_CHANGE };
+
+			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+			pStep->setName(pszName[index]);
+			pStep->setWriteSignalDev(writeSignalDev[index]);
+			if (pEquipment->addStep(addr[index], pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+		{
+			// Cassette type
+			char* pszName[] = { STEP_EQ_PORT1_CASSETTE_TYPE, STEP_EQ_PORT2_CASSETTE_TYPE, STEP_EQ_PORT3_CASSETTE_TYPE, STEP_EQ_PORT4_CASSETTE_TYPE };
+			int dev[] = { 0x6012, 0x6022, 0x6032, 0x6042 };
+			int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
+			int addr[] = { STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, STEP_ID_PORT4_CASSETTE_TYPE_CHANGE };
+
+			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+			pStep->setName(pszName[index]);
+			pStep->setWriteSignalDev(writeSignalDev[index]);
+			if (pEquipment->addStep(addr[index], pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+		{
+			// Transfer type
+			char* pszName[] = { STEP_EQ_PORT1_TRANSFER_MODE, STEP_EQ_PORT2_TRANSFER_MODE, STEP_EQ_PORT3_TRANSFER_MODE, STEP_EQ_PORT4_TRANSFER_MODE };
+			int dev[] = { 0x6014, 0x6024, 0x6034, 0x6044 };
+			int writeSignalDev[] = { 0xb8, 0xb9, 0xba, 0xbb };
+			int addr[] = { STEP_ID_PORT1_TRANSFER_MODE_CHANGE, STEP_ID_PORT2_TRANSFER_MODE_CHANGE, STEP_ID_PORT3_TRANSFER_MODE_CHANGE, STEP_ID_PORT4_TRANSFER_MODE_CHANGE };
+
+			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+			pStep->setName(pszName[index]);
+			pStep->setWriteSignalDev(writeSignalDev[index]);
+			if (pEquipment->addStep(addr[index], pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+		{
+			// Port enable
+			char* pszName[] = { STEP_EQ_PORT1_ENABLE, STEP_EQ_PORT2_ENABLE, STEP_EQ_PORT3_ENABLE, STEP_EQ_PORT4_ENABLE };
+			int dev[] = { 0x6015, 0x6025, 0x6035, 0x6045 };
+			int writeSignalDev[] = { 0xc0, 0xc1, 0xc2, 0xc3 };
+			int addr[] = { STEP_ID_PORT1_ENABLE_MODE_CHANGE, STEP_ID_PORT2_ENABLE_MODE_CHANGE, STEP_ID_PORT3_ENABLE_MODE_CHANGE, STEP_ID_PORT4_ENABLE_MODE_CHANGE };
+
+			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+			pStep->setName(pszName[index]);
+			pStep->setWriteSignalDev(writeSignalDev[index]);
+			if (pEquipment->addStep(addr[index], pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+		{
+			// Type auto change
+			char* pszName[] = { STEP_EQ_PORT1_TYPE_ATUO, STEP_EQ_PORT2_TYPE_ATUO, STEP_EQ_PORT3_TYPE_ATUO, STEP_EQ_PORT4_TYPE_ATUO };
+			int dev[] = { 0x6016, 0x6026, 0x6036, 0x6046 };
+			int writeSignalDev[] = { 0xc8, 0xc9, 0xca, 0xcb };
+			int addr[] = { STEP_ID_PORT1_TYPE_AUTO_CHANGE, STEP_ID_PORT2_TYPE_AUTO_CHANGE, STEP_ID_PORT3_TYPE_AUTO_CHANGE, STEP_ID_PORT4_TYPE_AUTO_CHANGE };
+
+			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+			pStep->setName(pszName[index]);
+			pStep->setWriteSignalDev(writeSignalDev[index]);
+			if (pEquipment->addStep(addr[index], pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+
 		pEquipment->init();
 		LOGE("已添加“%s”.", pEquipment->getName().c_str());
 
 
-		return 0;
+		return pEquipment;
 	}
 
 	int CMaster::addFliper()
@@ -320,7 +428,7 @@
 		return 0;
 	}
 
-	int CMaster::addEFEM()
+	CEFEM* CMaster::addEFEM()
 	{
 		CEFEM* pEquipment = new CEFEM();
 		pEquipment->setID(EQ_ID_EFEM);
@@ -433,6 +541,17 @@
 			}
 		}
 		{
+			// VCR1 Event Report
+			CEqVcrEventStep* pStep = new CEqVcrEventStep();
+			pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
+			pStep->setWriteSignalDev(0x4a);
+			pStep->setReturnDev(0x91e);
+			pStep->setVcrEventReportDev(0x5fef);
+			if (pEquipment->addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
 			CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
 			pStep->setName(STEP_CIM_MESSAGE_CLEAR);
 			pStep->setWriteSignalDev(0x72);
@@ -468,207 +587,15 @@
 				delete pStep;
 			}
 		}
-
-		// Port1
 		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6010);
-			pStep->setName(STEP_EQ_PORT1_TYPE);
-			pStep->setWriteSignalDev(0xa0);
-			if (pEquipment->addStep(STEP_ID_PORT1_TYPE_CHANGE, pStep) != 0) {
+			CEqCurrentRecipeChangeStep* pStep = new CEqCurrentRecipeChangeStep();
+			pStep->setName(STEP_EQ_RURRENT_RECIPE_CHANGE);
+			pStep->setWriteSignalDev(0x48);
+			pStep->setDataDev(0x6850);
+			if (pEquipment->addStep(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pStep) != 0) {
 				delete pStep;
 			}
 		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6011);
-			pStep->setName(STEP_EQ_PORT1_MODE);
-			pStep->setWriteSignalDev(0xa8);
-			if (pEquipment->addStep(STEP_ID_PORT1_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6012);
-			pStep->setName(STEP_EQ_PORT1_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0xb0);
-			if (pEquipment->addStep(STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6014);
-			pStep->setName(STEP_EQ_PORT1_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0xb8);
-			if (pEquipment->addStep(STEP_ID_PORT1_TRANSFER_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6015);
-			pStep->setName(STEP_EQ_PORT1_ENABLE);
-			pStep->setWriteSignalDev(0xc0);
-			if (pEquipment->addStep(STEP_ID_PORT1_ENABLE_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6016);
-			pStep->setName(STEP_EQ_PORT1_TYPE_ATUO);
-			pStep->setWriteSignalDev(0xc8);
-			if (pEquipment->addStep(STEP_ID_PORT1_TYPE_AUTO_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		// Port2
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6020);
-			pStep->setName(STEP_EQ_PORT2_TYPE);
-			pStep->setWriteSignalDev(0xa1);
-			if (pEquipment->addStep(STEP_ID_PORT2_TYPE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6021);
-			pStep->setName(STEP_EQ_PORT2_MODE);
-			pStep->setWriteSignalDev(0xa9);
-			if (pEquipment->addStep(STEP_ID_PORT2_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6022);
-			pStep->setName(STEP_EQ_PORT2_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0xb1);
-			if (pEquipment->addStep(STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6024);
-			pStep->setName(STEP_EQ_PORT2_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0xb9);
-			if (pEquipment->addStep(STEP_ID_PORT2_TRANSFER_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6025);
-			pStep->setName(STEP_EQ_PORT2_ENABLE);
-			pStep->setWriteSignalDev(0xc1);
-			if (pEquipment->addStep(STEP_ID_PORT2_ENABLE_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6026);
-			pStep->setName(STEP_EQ_PORT2_TYPE_ATUO);
-			pStep->setWriteSignalDev(0xc9);
-			if (pEquipment->addStep(STEP_ID_PORT2_TYPE_AUTO_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		// Port3
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6030);
-			pStep->setName(STEP_EQ_PORT3_TYPE);
-			pStep->setWriteSignalDev(0xa2);
-			if (pEquipment->addStep(STEP_ID_PORT3_TYPE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6031);
-			pStep->setName(STEP_EQ_PORT3_MODE);
-			pStep->setWriteSignalDev(0xaa);
-			if (pEquipment->addStep(STEP_ID_PORT3_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6032);
-			pStep->setName(STEP_EQ_PORT3_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0xb2);
-			if (pEquipment->addStep(STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6034);
-			pStep->setName(STEP_EQ_PORT3_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0xba);
-			if (pEquipment->addStep(STEP_ID_PORT3_TRANSFER_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6035);
-			pStep->setName(STEP_EQ_PORT3_ENABLE);
-			pStep->setWriteSignalDev(0xc2);
-			if (pEquipment->addStep(STEP_ID_PORT3_ENABLE_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6036);
-			pStep->setName(STEP_EQ_PORT3_TYPE_ATUO);
-			pStep->setWriteSignalDev(0xca);
-			if (pEquipment->addStep(STEP_ID_PORT3_TYPE_AUTO_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		// Port4
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6040);
-			pStep->setName(STEP_EQ_PORT4_TYPE);
-			pStep->setWriteSignalDev(0xa3);
-			if (pEquipment->addStep(STEP_ID_PORT4_TYPE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6041);
-			pStep->setName(STEP_EQ_PORT4_MODE);
-			pStep->setWriteSignalDev(0xab);
-			if (pEquipment->addStep(STEP_ID_PORT4_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6042);
-			pStep->setName(STEP_EQ_PORT4_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0xb3);
-			if (pEquipment->addStep(STEP_ID_PORT4_CASSETTE_TYPE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6044);
-			pStep->setName(STEP_EQ_PORT4_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0xbb);
-			if (pEquipment->addStep(STEP_ID_PORT4_TRANSFER_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6045);
-			pStep->setName(STEP_EQ_PORT4_ENABLE);
-			pStep->setWriteSignalDev(0xc3);
-			if (pEquipment->addStep(STEP_ID_PORT4_ENABLE_MODE_CHANGE, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6046);
-			pStep->setName(STEP_EQ_PORT4_TYPE_ATUO);
-			pStep->setWriteSignalDev(STEP_ID_PORT4_TYPE_AUTO_CHANGE);
-			if (pEquipment->addStep(0xcb, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
 
 		// CEqCassetteTranserStateStep
 		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_EMPTY, 0xd8, 
@@ -722,7 +649,8 @@
 
 		pEquipment->init();
 		LOGE("已添加“EFEM(ROBOT)”.");
-		return 0;
+
+		return pEquipment;
 	}
 
 	/* 添加bonder1 或 bonder2 
@@ -834,6 +762,15 @@
 			}
 		}
 		{
+			CEqCurrentRecipeChangeStep* pStep = new CEqCurrentRecipeChangeStep();
+			pStep->setName(STEP_EQ_RURRENT_RECIPE_CHANGE);
+			pStep->setWriteSignalDev(index == 0 ? 0x348 : 0x648);
+			pStep->setDataDev(index == 0 ? 0xa850 : 0xe850);
+			if (pEquipment->addStep(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
 			// CIM Message Confirm
 			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, index == 0 ? 0x9d80 : 0xdd80);
 			pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);

--
Gitblit v1.9.3