From 3a0ee214cfefcd1823b48ffe800b1932187eed0b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 18 二月 2025 17:49:30 +0800
Subject: [PATCH] 1.增加Upstream Inline Mode Downstream Inline Mode Local Alarm State Auto Recipe Change Mode VCR#1 Enable Mode 数据的解释,访问函数接口;

---
 SourceCode/Bond/Servo/CMaster.cpp |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 85bf38e..bee8f05 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -12,7 +12,7 @@
 
 	CMaster::CMaster()
 	{
-
+		m_listener = {nullptr, nullptr};
 	}
 
 	CMaster::~CMaster()
@@ -21,6 +21,12 @@
 			delete item;
 		}
 		m_listEquipment.clear();
+	}
+
+	void CMaster::setListener(MasterListener listener)
+	{
+		m_listener.onEqAlive = listener.onEqAlive;
+		m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
 	}
 
 	int CMaster::init()
@@ -58,6 +64,7 @@
 		// 初始化添加各子设备
 		{
 			CEFEM* pEquipment = new CEFEM();
+			pEquipment->setID(1);
 			pEquipment->setName("EFEM(ROBOT)");
 			pEquipment->setDescription("EFEM(ROBOT).");
 			pEquipment->setReadBitBlock(0x4000, 0x45ff);
@@ -93,8 +100,32 @@
 
 	int CMaster::addEquipment(CEquipment* pEquipment)
 	{
+		EquipmentListener listener;
+		listener.onAlive = [&](void* pEquipment, BOOL bAlive) -> void {
+			CEquipment* p = (CEquipment*)pEquipment;
+			if (m_listener.onEqAlive != nullptr) {
+				m_listener.onEqAlive(this, p, bAlive);
+			}
+		};
+		listener.onCimStateChanged = [&](void* pEquipment, BOOL bOn) -> void {
+			CEquipment* p = (CEquipment*)pEquipment;
+			if (m_listener.onEqCimStateChanged != nullptr) {
+				m_listener.onEqCimStateChanged(this, p, bOn);
+			}
+		};
+		pEquipment->setListener(listener);
 		m_listEquipment.push_back(pEquipment);
+
 		return 0;
+	}
+
+	CEquipment* CMaster::getEquipment(int id)
+	{
+		for (auto item : m_listEquipment) {
+			if (item->getID() == id) return item;
+		}
+
+		return nullptr;
 	}
 
 	void CMaster::onTimer(UINT nTimerid)
@@ -104,7 +135,7 @@
 		}
 
 
-		// 以下为测试代码
+		// 按一定频率扫描LB数据
 		static int i = 0;
 		i++;
 		if (i % (4 * 1) == 0) {
@@ -113,14 +144,11 @@
 				const StationIdentifier& station = item->getStation();
 				MemoryBlock& block = item->getReadBitBlock();
 
-				char szBuffer[1024];
 				int nRet = m_cclink.ReadData2(station, (short)block.type,
-					block.start, block.size, szBuffer);
-				for (unsigned int i = 0; i < block.size; i++) {
-					if(szBuffer[i] != 0)
-						TRACE("%d[%x]\n", i, szBuffer[i]);
+					block.start, block.size, block.buffer);
+				if (0 == nRet) {
+					item->onReceiveLBData(block.buffer, block.size);
 				}
-				TRACE("nRet=%d\n", nRet);
 			}
 		}
 	}

--
Gitblit v1.9.3