From 4acd7cfd96f2099772497713e17ca8bfaf5cf4ec Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 25 二月 2025 14:35:17 +0800
Subject: [PATCH] 1.CStep完善；

---
 SourceCode/Bond/Servo/CMaster.cpp |  138 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 126 insertions(+), 12 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 5ea975d..f3a0c07 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "Common.h"
 #include "CMaster.h"
 
 namespace SERVO {
@@ -12,7 +13,7 @@
 
 	CMaster::CMaster()
 	{
-		m_listener = {nullptr};
+		m_listener = {nullptr, nullptr, nullptr};
 	}
 
 	CMaster::~CMaster()
@@ -26,6 +27,8 @@
 	void CMaster::setListener(MasterListener listener)
 	{
 		m_listener.onEqAlive = listener.onEqAlive;
+		m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
+		m_listener.onEqStepEvent = listener.onEqStepEvent;
 	}
 
 	int CMaster::init()
@@ -33,10 +36,18 @@
 		LOGI("<Master>正在初始化...");
 
 
+		StepListener listener;
+		listener.onEvent = [&](void* pStep, int code, void* pData) -> void {
+			TRACE("<CEquipment>onEvent<%d, 0x%x>.\n", code, pData);
+			if (m_listener.onEqStepEvent != nullptr) {
+				m_listener.onEqStepEvent(this, (CStep*)pStep, code, pData);
+			}
+		};
+
+
 		// 	cclink
 		if (m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1)) != 0) {
 			LOGE("连接CC-Link失败.");
-			return -1;
 		}
 		else {
 			LOGI("连接CC-Link成功.");
@@ -61,15 +72,8 @@
 
 
 		// 初始化添加各子设备
-		{
-			CEFEM* pEquipment = new CEFEM();
-			pEquipment->setName("EFEM(ROBOT)");
-			pEquipment->setDescription("EFEM(ROBOT).");
-			pEquipment->setReadBitBlock(0x4000, 0x45ff);
-			pEquipment->setStation(1, 2);
-			addEquipment(pEquipment);
-			LOGE("已添加“EFEM(ROBOT)”.");
-		}
+		addEFEM(listener);
+
 		/*
 		{
 			CBonder* pBonder = new CBonder();
@@ -93,6 +97,11 @@
 
 	int CMaster::term()
 	{
+		LOGI("<Master>正在结束程序.");
+		for (auto item : m_listEquipment) {
+			item->term();
+		}
+
 		return 0;
 	}
 
@@ -105,9 +114,114 @@
 				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);
+		pEquipment->setCcLink(&m_cclink);
 		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;
+	}
+
+	int CMaster::addEFEM(StepListener& listener)
+	{
+		CEFEM* pEquipment = new CEFEM();
+		pEquipment->setID(EQ_ID_EFEM);
+		pEquipment->setName("EFEM(ROBOT)");
+		pEquipment->setDescription("EFEM(ROBOT).");
+		pEquipment->setReadBitBlock(0x4000, 0x45ff);
+		pEquipment->setStation(0, 255);
+		addEquipment(pEquipment);
+
+
+		// 添加 step
+		{
+			CEqModeStep* pStep = new CEqModeStep();
+			pStep->setName("EQMode");
+			pStep->setListener(listener);
+			pStep->setWriteSignalDev(0x30);
+			pStep->setModeDev(0x4a8c);
+			if (pEquipment->addStep(0x360, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
+			CEqStatusStep* pStep = new CEqStatusStep();
+			pStep->setName("EQStatus");
+			pStep->setListener(listener);
+			pStep->setWriteSignalDev(0x31);
+			pStep->setStatusDev(0x4a68);
+			if (pEquipment->addStep(0x361, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
+			CEqAlarmStep* pStep = new CEqAlarmStep();
+			pStep->setName("EQAlarm1");
+			pStep->setListener(listener);
+			pStep->setWriteSignalDev(0x32);
+			pStep->setAlarmDev(0x4c1d);
+			if (pEquipment->addStep(0x362, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
+			CEqAlarmStep* pStep = new CEqAlarmStep();
+			pStep->setName("EQAlarm2");
+			pStep->setListener(listener);
+			pStep->setWriteSignalDev(0x33);
+			pStep->setAlarmDev(0x4c4a);
+			if (pEquipment->addStep(0x363, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
+			CEqAlarmStep* pStep = new CEqAlarmStep();
+			pStep->setName("EQAlarm3");
+			pStep->setListener(listener);
+			pStep->setWriteSignalDev(0x34);
+			pStep->setAlarmDev(0x4c77);
+			if (pEquipment->addStep(0x364, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
+			CEqAlarmStep* pStep = new CEqAlarmStep();
+			pStep->setName("EQAlarm4");
+			pStep->setListener(listener);
+			pStep->setWriteSignalDev(0x35);
+			pStep->setAlarmDev(0x4ca4);
+			if (pEquipment->addStep(0x365, pStep) != 0) {
+				delete pStep;
+			}
+		}
+		{
+			CEqAlarmStep* pStep = new CEqAlarmStep();
+			pStep->setName("EQAlarm5");
+			pStep->setListener(listener);
+			pStep->setWriteSignalDev(0x36);
+			pStep->setAlarmDev(0x4cd1);
+			if (pEquipment->addStep(0x366, pStep) != 0) {
+				delete pStep;
+			}
+		}
+
+
+		pEquipment->init();
+		LOGE("已添加“EFEM(ROBOT)”.");
 		return 0;
 	}
 
@@ -127,7 +241,7 @@
 				const StationIdentifier& station = item->getStation();
 				MemoryBlock& block = item->getReadBitBlock();
 
-				int nRet = m_cclink.ReadData2(station, (short)block.type,
+				int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
 					block.start, block.size, block.buffer);
 				if (0 == nRet) {
 					item->onReceiveLBData(block.buffer, block.size);

--
Gitblit v1.9.3