From 87c5da242b0502626deac934d75579559032c2c8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 12 四月 2025 09:01:16 +0800
Subject: [PATCH] 1.CIM Message set（下发CIM消息到PLC），测试成功 2.CIM Message clear(清除PLC中的指定CIM消息)， 测试成功 3.CIM Message Confirm（PLC确认CIM消息事件检测和获取），测试成功
---
SourceCode/Bond/Servo/CReadStep.cpp | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index c633c2f..7e05c00 100644
--- a/SourceCode/Bond/Servo/CReadStep.cpp
+++ b/SourceCode/Bond/Servo/CReadStep.cpp
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include "CReadStep.h"
#include "Common.h"
+#include "CEquipment.h"
namespace SERVO {
@@ -83,9 +84,8 @@
nextStep();
ASSERT(m_pCclink);
if (0 == onReadData()) {
- if (m_listener.onEvent != nullptr) {
- m_listener.onEvent(this, STEP_EVENT_READDATA, nullptr);
- }
+ ASSERT(m_pEquipment);
+ m_pEquipment->onStepEvent(this, STEP_EVENT_READDATA);
}
// 2.给对方写ON
@@ -112,9 +112,8 @@
// 6.完成
nextStep();
if (0 == onComplete()) {
- if (m_listener.onEvent != nullptr) {
- m_listener.onEvent(this, STEP_EVENT_COMPLETE, nullptr);
- }
+ ASSERT(m_pEquipment);
+ m_pEquipment->onStepEvent(this, STEP_EVENT_COMPLETE);
}
}
}
--
Gitblit v1.9.3