From b13e43c3eb3881d56f0da797a4171f070bcf2413 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期四, 20 二月 2025 18:05:23 +0800
Subject: [PATCH] 1.修复状态错误的问题 2.SECS运行表完成SystemDV表和EqpDV的增删改查，并且把DV数据和SV数据的增删改查提取成一个通用函数
---
SourceCode/Bond/Servo/CMaster.cpp | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index c7e1a14..51f34a6 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);
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;
}
@@ -121,6 +128,10 @@
CEquipment* CMaster::getEquipment(int id)
{
+ for (auto item : m_listEquipment) {
+ if (item->getID() == id) return item;
+ }
+
return nullptr;
}
--
Gitblit v1.9.3