From 1ea724d777948a9e70ba30a06d3db28641d61d0c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 21 二月 2025 17:43:57 +0800
Subject: [PATCH] 1.添加警告CEqAlarmStep

---
 SourceCode/Bond/Servo/CMaster.cpp |   73 +++++++++++++++++++++++++++++++++++-
 1 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index e2d3f3c..5e0cb50 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -38,7 +38,6 @@
 		// 	cclink
 		if (m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1)) != 0) {
 			LOGE("连接CC-Link失败.");
-			return -1;
 		}
 		else {
 			LOGI("连接CC-Link成功.");
@@ -69,8 +68,70 @@
 			pEquipment->setName("EFEM(ROBOT)");
 			pEquipment->setDescription("EFEM(ROBOT).");
 			pEquipment->setReadBitBlock(0x4000, 0x45ff);
-			pEquipment->setStation(1, 2);
+			pEquipment->setStation(0, 255);
 			addEquipment(pEquipment);
+
+
+			// 添加 step
+			{
+				CEqModeStep* pStep = new CEqModeStep();
+				pStep->setWriteSignalDev(0x30);
+				pStep->setModeDev(0x4a8c);
+				if (pEquipment->addStep(0x360, pStep) != 0) {
+					delete pStep;
+				}
+			}
+			{
+				CEqStatusStep* pStep = new CEqStatusStep();
+				pStep->setWriteSignalDev(0x31);
+				pStep->setStatusDev(0x4a68);
+				if (pEquipment->addStep(0x361, pStep) != 0) {
+					delete pStep;
+				}
+			}
+			{
+				CEqAlarmStep* pStep = new CEqAlarmStep();
+				pStep->setWriteSignalDev(0x32);
+				pStep->setAlarmDev(0x4c1d);
+				if (pEquipment->addStep(0x362, pStep) != 0) {
+					delete pStep;
+				}
+			}
+			{
+				CEqAlarmStep* pStep = new CEqAlarmStep();
+				pStep->setWriteSignalDev(0x33);
+				pStep->setAlarmDev(0x4c4a);
+				if (pEquipment->addStep(0x363, pStep) != 0) {
+					delete pStep;
+				}
+			}
+			{
+				CEqAlarmStep* pStep = new CEqAlarmStep();
+				pStep->setWriteSignalDev(0x34);
+				pStep->setAlarmDev(0x4c77);
+				if (pEquipment->addStep(0x364, pStep) != 0) {
+					delete pStep;
+				}
+			}
+			{
+				CEqAlarmStep* pStep = new CEqAlarmStep();
+				pStep->setWriteSignalDev(0x35);
+				pStep->setAlarmDev(0x4ca4);
+				if (pEquipment->addStep(0x365, pStep) != 0) {
+					delete pStep;
+				}
+			}
+			{
+				CEqAlarmStep* pStep = new CEqAlarmStep();
+				pStep->setWriteSignalDev(0x36);
+				pStep->setAlarmDev(0x4cd1);
+				if (pEquipment->addStep(0x366, pStep) != 0) {
+					delete pStep;
+				}
+			}
+			
+
+			pEquipment->init();
 			LOGE("已添加“EFEM(ROBOT)”.");
 		}
 		/*
@@ -96,6 +157,11 @@
 
 	int CMaster::term()
 	{
+		LOGI("<Master>正在结束程序.");
+		for (auto item : m_listEquipment) {
+			item->term();
+		}
+
 		return 0;
 	}
 
@@ -115,6 +181,7 @@
 			}
 		};
 		pEquipment->setListener(listener);
+		pEquipment->setCcLink(&m_cclink);
 		m_listEquipment.push_back(pEquipment);
 
 		return 0;
@@ -145,7 +212,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