From 4cc9fd5bb0c0224e88ca702e6e736e1bc138dce6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 20 二月 2025 11:36:16 +0800
Subject: [PATCH] 1.测试通过Equipment Mode Change Report流程；
---
SourceCode/Bond/Servo/CMaster.cpp | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index bee8f05..2bbfe86 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 {
@@ -37,7 +38,6 @@
// cclink
if (m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1)) != 0) {
LOGE("连接CC-Link失败.");
- return -1;
}
else {
LOGI("连接CC-Link成功.");
@@ -64,12 +64,14 @@
// 初始化添加各子设备
{
CEFEM* pEquipment = new CEFEM();
- pEquipment->setID(1);
+ pEquipment->setID(EQ_ID_EFEM);
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
- pEquipment->setStation(1, 2);
+ pEquipment->setStation(0, 255);
addEquipment(pEquipment);
+
+ pEquipment->init();
LOGE("已添加“EFEM(ROBOT)”.");
}
/*
@@ -95,6 +97,11 @@
int CMaster::term()
{
+ LOGI("<Master>正在结束程序.");
+ for (auto item : m_listEquipment) {
+ item->term();
+ }
+
return 0;
}
@@ -114,6 +121,7 @@
}
};
pEquipment->setListener(listener);
+ pEquipment->setCcLink(&m_cclink);
m_listEquipment.push_back(pEquipment);
return 0;
@@ -144,7 +152,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