From 02d1df7b4fa1a0e686c112e7bf3c8e794ba42b82 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 10:04:26 +0800
Subject: [PATCH] 1. 添加设备配方绑定

---
 SourceCode/Bond/Servo/CLoadPort.cpp |  145 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 101 insertions(+), 44 deletions(-)

diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 6e19e45..81361bc 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -51,37 +51,18 @@
 		// 加入Pin初始化代码
 		LOGI("<CLoadPort>initPins");
 		addPin(SERVO::PinType::INPUT, _T("In"));
-		addPin(SERVO::PinType::OUTPUT, _T("Out1"));
-		addPin(SERVO::PinType::OUTPUT, _T("Out2"));
+		addPin(SERVO::PinType::OUTPUT, _T("Out"));
 	}
 
 	// 必须要实现的虚函数,在此初始化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()
@@ -111,7 +92,7 @@
 			// Type
 			static char* pszName[] = { STEP_EQ_PORT1_TYPE, STEP_EQ_PORT2_TYPE, STEP_EQ_PORT3_TYPE, STEP_EQ_PORT4_TYPE };
 			static int dev[] = { 0x6010 , 0x6020, 0x6030, 0x6040 };
-			static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
+			static int writeSignalDev[] = { 0x90, 0x91, 0x92, 0x93 };
 			static int addr[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE, STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -132,7 +113,7 @@
 			// Mode
 			static char* pszName[] = { STEP_EQ_PORT1_MODE, STEP_EQ_PORT2_MODE, STEP_EQ_PORT3_MODE, STEP_EQ_PORT4_MODE };
 			static int dev[] = { 0x6011, 0x6021, 0x6031, 0x6041 };
-			static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
+			static int writeSignalDev[] = { 0x98, 0x99, 0x9a, 0x9b };
 			static int addr[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE, STEP_ID_PORT3_MODE_CHANGE, STEP_ID_PORT4_MODE_CHANGE };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -153,7 +134,7 @@
 			// Cassette type
 			static char* pszName[] = { STEP_EQ_PORT1_CASSETTE_TYPE, STEP_EQ_PORT2_CASSETTE_TYPE, STEP_EQ_PORT3_CASSETTE_TYPE, STEP_EQ_PORT4_CASSETTE_TYPE };
 			static int dev[] = { 0x6012, 0x6022, 0x6032, 0x6042 };
-			static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
+			static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
 			static 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 };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -174,7 +155,7 @@
 			// Transfer type
 			static char* pszName[] = { STEP_EQ_PORT1_TRANSFER_MODE, STEP_EQ_PORT2_TRANSFER_MODE, STEP_EQ_PORT3_TRANSFER_MODE, STEP_EQ_PORT4_TRANSFER_MODE };
 			static int dev[] = { 0x6014, 0x6024, 0x6034, 0x6044 };
-			static int writeSignalDev[] = { 0xb8, 0xb9, 0xba, 0xbb };
+			static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
 			static 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 };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -195,7 +176,7 @@
 			// Port enable
 			static char* pszName[] = { STEP_EQ_PORT1_ENABLE, STEP_EQ_PORT2_ENABLE, STEP_EQ_PORT3_ENABLE, STEP_EQ_PORT4_ENABLE };
 			static int dev[] = { 0x6015, 0x6025, 0x6035, 0x6045 };
-			static int writeSignalDev[] = { 0xc0, 0xc1, 0xc2, 0xc3 };
+			static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
 			static 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 };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -366,6 +347,50 @@
 				}
 			}
 		}
+		
+		{
+			// 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;
+			}
+		}
 	}
 
 	void CLoadPort::onTimer(UINT nTimerid)
@@ -379,23 +404,23 @@
 
 		if (ar.IsStoring()) {
 			ar << m_nIndex;
-			ar << (int)m_portType;
-			ar << (int)m_portMode;
-			ar << (int)m_cassetteType;
-			ar << (int)m_transferMode;
-			ar << m_bEnable;
-			ar << m_bAutoChangeEnable;
+			//ar << (int)m_portType;
+			//ar << (int)m_portMode;
+			//ar << (int)m_cassetteType;
+			//ar << (int)m_transferMode;
+			//ar << m_bEnable;
+			//ar << m_bAutoChangeEnable;
 			m_portStatusReport.serialize(ar);
 		}
 		else {
 			int temp;
 			ar >> m_nIndex;
-			ar >> temp; m_portType = (PortType)temp;
-			ar >> temp; m_portMode = (PortMode)temp;
-			ar >> temp; m_cassetteType = (CassetteType)temp;
-			ar >> temp; m_transferMode = (TransferMode)temp;
-			ar >> m_bEnable;
-			ar >> m_bAutoChangeEnable;
+			//ar >> temp; m_portType = (PortType)temp;
+			//ar >> temp; m_portMode = (PortMode)temp;
+			//ar >> temp; m_cassetteType = (CassetteType)temp;
+			//ar >> temp; m_transferMode = (TransferMode)temp;
+			//ar >> m_bEnable;
+			//ar >> m_bAutoChangeEnable;
 			m_portStatusReport.serialize(ar);
 		}
 	}
@@ -839,6 +864,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,
@@ -1078,6 +1105,36 @@
 		return 0;
 	}
 
+	void CLoadPort::localEanblePort(BOOL bEnable)
+	{
+		m_bEnable = bEnable;
+	}
+
+	void CLoadPort::localSetPortType(PortType type)
+	{
+		m_portType = type;
+	}
+
+	void CLoadPort::localSetPortMode(PortMode mode)
+	{
+		m_portMode = mode;
+	}
+
+	void CLoadPort::localSetCessetteType(CassetteType type)
+	{
+		m_cassetteType = type;
+	}
+
+	void CLoadPort::localSetTransferMode(TransferMode mode)
+	{
+		m_transferMode = mode;
+	}
+
+	void CLoadPort::localAutoChangeEnable(BOOL bEnable)
+	{
+		m_bAutoChangeEnable = bEnable;
+	}
+
 	/*
 	 * 生成测试用的玻璃列表
 	 */
@@ -1099,7 +1156,7 @@
 
 		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;

--
Gitblit v1.9.3