From fd1333fbf52e00ff8f0b0d51ec0d707a66cc9141 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 16 六月 2025 11:20:16 +0800
Subject: [PATCH] 1.Robot状态和位置的监控,其中两个arm状态(是否有料),也作为调度的依据。

---
 SourceCode/Bond/Servo/CBonder.cpp |  195 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 148 insertions(+), 47 deletions(-)

diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 0167d1c..db7cf76 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -34,7 +34,8 @@
 	{
 		// 加入Pin初始化代码
 		LOGI("<CBonder>initPins");
-		addPin(SERVO::PinType::INPUT, _T("In"));
+		addPin(SERVO::PinType::INPUT, _T("In1"));
+		addPin(SERVO::PinType::INPUT, _T("In2"));
 		addPin(SERVO::PinType::OUTPUT, _T("Out"));
 	}
 
@@ -87,11 +88,15 @@
 		}
 
 		{
-			// eq process
-			CEqProcessStep* pStep = new CEqProcessStep();
+			CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0xab55 : 0xeb55), 538 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodeProcessDataReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
 			pStep->setName(STEP_PROCESS);
-			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x347 : 0x647);
-			pStep->setProcessDev(m_nIndex == 0 ? 0xab55 : 0xeb55);
+			pStep->setWriteSignalDev((m_nIndex == 0 ? 0x347 : 0x647));
 			if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
 				delete pStep;
 			}
@@ -235,40 +240,51 @@
 			}
 		}
 
+		// 使用CEqReadStep替换CEqJobEventStep
 		{
-			CEqJobEventStep* pStep = new CEqJobEventStep();
-			pStep->setName(STEP_EQ_RECEIVED_JOB_UPS1);
-			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x300 : 0x600);
-			pStep->setJobDataDev(m_nIndex == 0 ? 0x8c90 : 0xcc90);
-			if (addStep(STEP_ID_RECIVE_JOB_UPS1, pStep) != 0) {
-				delete pStep;
+			// Received Job Report Upstream #1~9
+			char szBuffer[256];
+			for (int i = 0; i < 9; i++) {
+				CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8c90 : 0xcc90) + 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);
+							}
+						}
+						return -1;
+					});
+				sprintf_s(szBuffer, "%s%d", STEP_EQ_RECEIVED_JOB_UPSn, i + 1);
+				pStep->setName(szBuffer);
+				pStep->setProp("Port", (void*)(__int64)(i + 1));
+				pStep->setWriteSignalDev((m_nIndex == 0 ? 0x300 : 0x600) + i);
+				if (addStep(STEP_ID_RECIVE_JOB_UPS1 + i, pStep) != 0) {
+					delete pStep;
+				}
 			}
 		}
 		{
-			CEqJobEventStep* pStep = new CEqJobEventStep();
-			pStep->setName(STEP_EQ_RECEIVED_JOB_UPS2);
-			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x301 : 0x601);
-			pStep->setJobDataDev(m_nIndex == 0 ? 0x8dd0 : 0xcdd0);
-			if (addStep(STEP_ID_RECIVE_JOB_UPS2, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqJobEventStep* pStep = new CEqJobEventStep();
-			pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS1);
-			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x30a : 0x60a);
-			pStep->setJobDataDev(m_nIndex == 0 ? 0x8000 : 0xc000);
-			if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqJobEventStep* pStep = new CEqJobEventStep();
-			pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS2);
-			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x30b : 0x60b);
-			pStep->setJobDataDev(m_nIndex == 0 ? 0x8140 : 0xc140);
-			if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS2, pStep) != 0) {
-				delete pStep;
+			// Sent Out Job Report Downstream #1~9
+			char szBuffer[256];
+			for (int i = 0; i < 9; i++) {
+				CEqReadStep* pStep = new CEqReadStep((m_nIndex == 0 ? 0x8000 : 0xc000) + 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);
+							}
+						}
+						return -1;
+					});
+				sprintf_s(szBuffer, "%s%d", STEP_EQ_SENT_OUT_JOB_DOWNSn, i + 1);
+				pStep->setName(szBuffer);
+				pStep->setProp("Port", (void*)(__int64)(i + 1));
+				pStep->setWriteSignalDev((m_nIndex == 0 ? 0x30a : 0x60a) + i);
+				if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1 + i, pStep) != 0) {
+					delete pStep;
+				}
 			}
 		}
 
@@ -281,7 +297,7 @@
 						if (code == ROK && pszData != nullptr && size > 0) {
 							int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
 							if (port > 0) {
-								decodeFetchedOutJobReport(port, pszData, size);
+								decodeFetchedOutJobReport((CStep*)pFrom, port, pszData, size);
 							}
 						}
 						return -1;
@@ -305,7 +321,7 @@
 						if (code == ROK && pszData != nullptr && size > 0) {
 							int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
 							if (port > 0) {
-								decodeStoredJobReport(port, pszData, size);
+								decodeStoredJobReport((CStep*)pFrom, port, pszData, size);
 							}
 						}
 						return -1;
@@ -319,6 +335,55 @@
 				}
 			}
 		}
+
+		{
+			// Panel Data Report
+			CEqReadStep* pStep = new CEqReadStep(0xA17f, 386 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodePanelDataReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
+			pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
+			pStep->setProp("Port", (void*)1);
+			pStep->setWriteSignalDev(0x45e);
+			if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+		{
+			// FAC Data Report
+			CEqReadStep* pStep = new CEqReadStep(0xA60E, 108 * 2,
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+					if (code == ROK && pszData != nullptr && size > 0) {
+						decodePanelDataReport((CStep*)pFrom, pszData, size);
+					}
+					return -1;
+				});
+			pStep->setName(STEP_EQ_FAC_DATA_REPORT);
+			pStep->setProp("Port", (void*)1);
+			pStep->setWriteSignalDev(0x34d);
+			if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
+				delete pStep;
+			}
+		}
+	}
+
+	// 必须要实现的虚函数,在此初始化Slot信息
+	void CBonder::initSlots()
+	{
+		m_slot[0].enable();
+		m_slot[0].setPosition(m_nID);
+		m_slot[0].setNo(1);
+		m_slot[0].setName("Slot 1(G2)");
+		m_slot[0].setType(MaterialsType::G2);
+		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);
 	}
 
 	void CBonder::onTimer(UINT nTimerid)
@@ -341,16 +406,6 @@
 		return __super::recvIntent(pPin, pIntent);
 	}
 
-	BOOL CBonder::glassWillArrive(CGlass* pGlass)
-	{
-		BOOL bRet = __super::glassWillArrive(pGlass);
-		if (!bRet) {
-			return FALSE;
-		}
-
-		return m_glassList.empty();
-	}
-
 	void CBonder::setIndex(unsigned int index)
 	{
 		m_nIndex = index;
@@ -360,4 +415,50 @@
 	{
 		return m_nIndex;
 	}
+
+	int CBonder::onProcessData(CProcessData* pProcessData)
+	{
+		CEquipment::onProcessData(pProcessData);
+
+
+		// 检查数据,当前两片玻璃,一片为G1, 一片为G2, 且pProcessData中的id能匹配G1或G2
+		Lock();
+		CGlass* pGlass1 = getGlassFromSlot(1);
+		CGlass* pGlass2 = getGlassFromSlot(2);
+		if (pGlass1 == nullptr || pGlass2 == nullptr) {
+			LOGE("<CBonder-%s>onProcessData,错误!不满足两片玻璃且分别为G1与G2的条件,请检查数据是否正确!", m_strName.c_str());
+			Unlock();
+			return -1;
+		}
+		if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
+			LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被绑定,请检查数据是否正确!", m_strName.c_str());
+			Unlock();
+			return -1;
+		}
+
+		if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
+			LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被贴合,请检查数据是否正确!", m_strName.c_str());
+			Unlock();
+			return -1;
+		}
+
+		if (pGlass1->getType() == pGlass2->getType()) {
+			LOGE("<CBonder-%s>onProcessData,错误!两片玻璃未匹配,必须分别为G1和G2类型,请检查数据是否正确!", m_strName.c_str());
+			Unlock();
+			return -1;
+		}
+
+		pGlass1->setBuddy(pGlass2);
+		pGlass2->setBuddy(pGlass1);
+		LOGE("<CBonder-%s>onProcessData,%s和%s已贴合!", m_strName.c_str(),
+			pGlass1->getID().c_str(), pGlass2->getID().c_str());
+		Unlock();
+
+		return 0;
+	}
+
+	int CBonder::getIndexerOperationModeBaseValue()
+	{
+		return m_nIndex == 0 ? 15000 : 20000;
+	}
 }

--
Gitblit v1.9.3