From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CVacuumBake.cpp |  349 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 318 insertions(+), 31 deletions(-)

diff --git a/SourceCode/Bond/Servo/CVacuumBake.cpp b/SourceCode/Bond/Servo/CVacuumBake.cpp
index 0dec6ba..3ad0dbd 100644
--- a/SourceCode/Bond/Servo/CVacuumBake.cpp
+++ b/SourceCode/Bond/Servo/CVacuumBake.cpp
@@ -188,12 +188,13 @@
 			// master recipe list report
 			CEqReadStep* pStep = new CEqReadStep(0x16955, 255 * 2,
 				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+					short ret = MRLRC_OK;
 					if (code == ROK && pszData != nullptr && size > 0) {
 						// 此处解释配方数据
-						short ret = decodeRecipeListReport(pszData, size);
-						pStep->setReturnCode(ret);
+						ret = decodeRecipeListReport(pszData, size);
 					}
-					pStep->setReturnCode(MRLRC_OK);
+					pTmpStep->setReturnCode(ret);
 					return -1;
 				});
 			pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
@@ -206,40 +207,41 @@
 
 		{
 			// 请求配方参数
-			//CEqWriteStep* pStep = new CEqWriteStep();
-			//pStep->setName(STEP_EQ_RECIPE_PARAMETER_REQ);
-			//pStep->setWriteSignalDev(0xc67);
-			//pStep->setDataDev(0x379b);
-			//if (addStep(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pStep) != 0) {
-			//	delete pStep;
-			//}
+			CEqWriteStep* pStep = new CEqWriteStep();
+			pStep->setName(STEP_EQ_RECIPE_PARAMETER_REQ);
+			pStep->setWriteSignalDev(0xc67);
+			pStep->setDataDev(0x2e4b);
+			if (addStep(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pStep) != 0) {
+				delete pStep;
+			}
 		}
 
 		{
 			// recipe parameter report
-			//CEqReadStep* pStep = new CEqReadStep(0x1aa54, 257 * 2,
-			//	[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
-			//		if (code == ROK && pszData != nullptr && size > 0) {
-			//			// 此处解释配方数据
-			//			short ret = decodeRecipeParameterReport(pszData, size);
-			//			pStep->setReturnCode(ret);
-			//		}
-			//		pStep->setReturnCode(MRLRC_OK);
-			//		return -1;
-			//	});
-			//pStep->setName(STEP_EQ_RECIPE_PARAMETER);
-			//pStep->setWriteSignalDev(0xc4c);
-			//pStep->setReturnDev(m_nIndex == 0 ? 0x126c : 0x1bbc);
-			//if (addStep(STEP_ID_RECIPE_PARAMETER_REPORT, pStep) != 0) {
-			//	delete pStep;
-			//}
+			CEqReadStep* pStep = new CEqReadStep(0x16a54, 257 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+					if (code == ROK && pszData != nullptr && size > 0) {
+						// 此处解释配方数据
+						short ret = decodeRecipeParameterReport(pszData, size);
+						pTmpStep->setReturnCode(ret);
+					}
+					pTmpStep->setReturnCode(MRLRC_OK);
+					return -1;
+				});
+			pStep->setName(STEP_EQ_RECIPE_PARAMETER);
+			pStep->setWriteSignalDev(0xc4c);
+			pStep->setReturnDev(0x2ec);
+			if (addStep(STEP_ID_RECIPE_PARAMETER_REPORT, pStep) != 0) {
+				delete pStep;
+			}
 		}
 
 		// 使用CEqReadStep替换CEqJobEventStep
 		{
 			// Received Job Report Upstream #1~9
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep(0x14c90 + 320 * i, 320 * 2,
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
@@ -263,13 +265,13 @@
 		{
 			// Sent Out Job Report Downstream #1~9
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep(0x14000 + 320 * i, 320 * 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) {
-								decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
+								decodeSentOutJobReport((CStep*)pFrom, port, pszData, size);
 							}
 						}
 						return -1;
@@ -287,7 +289,7 @@
 		{
 			// Fetched Out Job Report #1~15
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep(0x15c31 + 18 * i, 18 * 2,
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
@@ -311,7 +313,7 @@
 		{
 			// Stored Job Report #1~15
 			char szBuffer[256];
-			for (int i = 0; i < 1; i++) {
+			for (int i = 0; i < 2; i++) {
 				CEqReadStep* pStep = new CEqReadStep(0x15b23 + 18 * i, 18 * 2,
 					[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 						if (code == ROK && pszData != nullptr && size > 0) {
@@ -331,6 +333,60 @@
 				}
 			}
 		}
+
+		// FAC Data Report
+		addFacDataReportStep(0x16589, 0xc4d, 1);
+		/*
+		{
+			CEqReadStep* pStep = new CEqReadStep(0x16589, 133 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodeFacDataReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
+			pStep->setName(STEP_EQ_FAC_DATA_REPORT);
+			pStep->setProp("Port", (void*)1);
+			pStep->setWriteSignalDev(0xc4d);
+			if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		*/
+
+		// process start/end report
+		{
+			CEqReadStep* pStep = new CEqReadStep(0x15D3F, 13 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodeJobProcessStartReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
+			pStep->setName(STEP_EQ_JOB_PROCESS_START_REPORT);
+			pStep->setProp("Port", (void*)1);
+			pStep->setWriteSignalDev(0xc33);
+			if (addStep(STEP_ID_JOB_PROCESS_START_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+		{
+			CEqReadStep* pStep = new CEqReadStep(0x15D4C, 13 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodeJobProcessEndReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
+			pStep->setName(STEP_EQ_JOB_PROCESS_END_REPORT);
+			pStep->setProp("Port", (void*)1);
+			pStep->setWriteSignalDev(0xc34);
+			if (addStep(STEP_ID_JOB_PROCESS_END_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+
 	}
 
 	// 必须要实现的虚函数,在此初始化Slot信息
@@ -341,6 +397,13 @@
 		m_slot[0].setNo(1);
 		m_slot[0].setName("Slot 1(G1)");
 		m_slot[0].setType(MaterialsType::G1);
+		m_slot[0].setLinkSignalPath(0);
+		m_slot[1].enable();
+		m_slot[1].setPosition(m_nID);
+		m_slot[1].setNo(2);
+		m_slot[1].setName("Slot 2(G1)");
+		m_slot[1].setType(MaterialsType::G1);
+		m_slot[1].setLinkSignalPath(1);
 	}
 
 	void CVacuumBake::onTimer(UINT nTimerid)
@@ -367,4 +430,228 @@
 	{
 		return 30000;
 	}
+
+	int CVacuumBake::parsingParams(const char* pszData, size_t size, std::vector<CParam>& params)
+	{
+		ASSERT(pszData);
+		if (size < 250) return 0;
+		int i = 0, v;
+
+
+		// 1.A_腔加热时间
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("A_腔加热时间", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 2.B_腔加热时间
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("B_腔加热时间", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 3.A_腔破真空时间
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("A_腔破真空时间", "", this->getName().c_str(), v * 0.01f));
+		i += 2;
+
+		// 4.B_腔破真空时间
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("B_腔破真空时间", "", this->getName().c_str(), v * 0.01f));
+		i += 2;
+
+		// 5.A_腔真空到达值
+		params.push_back(CParam("A_腔真空到达值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+		// 6.B_腔真空到达值
+		params.push_back(CParam("B_腔真空到达值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+		// 7.A_腔温控表主控温度设定
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("A_腔温控表主控温度设定", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 8.B_腔温控表主控温度设定
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("B_腔温控表主控温度设定", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+
+		return (int)params.size();
+	}
+
+	int CVacuumBake::parsingProcessData(const char* pszData, size_t size, std::vector<CParam>& params)
+	{
+		ASSERT(pszData);
+		if (size < 250) return 0;
+		int i = 0, v;
+
+
+		// 1.工艺参数序号
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("工艺参数序号", "", this->getName().c_str(), v));
+		i += 2;
+
+		if (v == 1) {
+			// 2.A_腔加热时间
+			v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+			params.push_back(CParam("A_腔加热时间", "", this->getName().c_str(), v * 0.1f));
+			i += 2;
+
+			// 3.A_腔破真空时间
+			v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+			params.push_back(CParam("A_腔破真空时间", "", this->getName().c_str(), v * 0.01f));
+			i += 2;
+
+			// 4.A_腔真空到达值
+			params.push_back(CParam("A_腔真空到达值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+			i += 4;
+
+			// 5.A_腔温控表主控温度设定
+			v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+			params.push_back(CParam("A_腔温控表主控温度设定", "", this->getName().c_str(), v * 0.1f));
+			i += 4;
+		}
+		else if (v == 1) {
+			// 2.B_腔加热时间
+			v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+			params.push_back(CParam("B_腔加热时间", "", this->getName().c_str(), v * 0.1f));
+			i += 2;
+
+			// 3.A_腔破真空时间
+			v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+			params.push_back(CParam("B_腔破真空时间", "", this->getName().c_str(), v * 0.01f));
+			i += 2;
+
+			// 4.A_腔真空到达值
+			params.push_back(CParam("B_腔真空到达值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+			i += 4;
+
+			// 5.A_腔温控表主控温度设定
+			v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+			params.push_back(CParam("B_腔温控表主控温度设定", "", this->getName().c_str(), v * 0.1f));
+			i += 4;
+		}
+
+		return (int)params.size();
+	}
+
+	int CVacuumBake::parsingSVData(const char* pszData, size_t size, std::vector<CParam>& params)
+	{
+		/*
+		1	A腔工艺运行步骤	1Word	123456
+			2	A腔体真空规值	FLOAT	123.456
+			3	A腔温控表1当前值	2Word	12345.6
+			4	A腔温控表2当前值	2Word	12345.6
+			5	A腔温控表4当前值	2Word	12345.6
+			6	A腔温控表5当前值	2Word	12345.6
+			7	A腔温控表6当前值	2Word	12345.6
+			8	A腔温控表7当前值	2Word	12345.6
+			9	A腔烘烤剩余时间	1Word	12345.6
+			10	B腔工艺运行步骤	1Word	123456
+			11	B腔体真空规值	FLOBT	123.456
+			12	B腔温控表1当前值	2Word	12345.6
+			13	B腔温控表2当前值	2Word	12345.6
+			14	B腔温控表4当前值	2Word	12345.6
+			15	B腔温控表5当前值	2Word	12345.6
+			16	B腔温控表6当前值	2Word	12345.6
+			17	B腔温控表7当前值	2Word	12345.6
+			18	B腔烘烤剩余时间	1Word	12345.6
+	*/
+
+		ASSERT(pszData);
+		if (size < 125) return 0;
+		int i = 0, v;
+
+
+		// 1.A腔工艺运行步骤
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("A腔工艺运行步骤", "", this->getName().c_str(), v));
+		i += 2;
+
+		// 2.A腔体真空规值
+		params.push_back(CParam("A腔体真空规值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+		// 3.A腔温控表1当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("A腔温控表1当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 4.A腔温控表2当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("A腔温控表2当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 5.A腔温控表4当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("A腔温控表4当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 6.A腔温控表5当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("A腔温控表5当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 7.A腔温控表6当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("A腔温控表6当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 8.A腔温控表7当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("A腔温控表7当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 9.A腔烘烤剩余时间
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("A腔烘烤剩余时间", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		// 10.B腔工艺运行步骤
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("B腔工艺运行步骤", "", this->getName().c_str(), v));
+		i += 2;
+
+		// 11.A腔体真空规值
+		params.push_back(CParam("B腔体真空规值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
+		i += 4;
+
+		// 12.B腔温控表1当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("B腔温控表1当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 13.B腔温控表2当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("B腔温控表2当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 14.B腔温控表4当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("B腔温控表4当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 15.B腔温控表5当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("B腔温控表5当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 16.B腔温控表6当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("B腔温控表6当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 17.B腔温控表7当前值
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
+		params.push_back(CParam("B腔温控表7当前值", "", this->getName().c_str(), v * 0.1f));
+		i += 4;
+
+		// 18.B腔烘烤剩余时间
+		v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+		params.push_back(CParam("B腔烘烤剩余时间", "", this->getName().c_str(), v * 0.1f));
+		i += 2;
+
+		return (int)params.size();
+	}
 }

--
Gitblit v1.9.3