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/CWriteStep.cpp |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/CWriteStep.cpp b/SourceCode/Bond/Servo/CWriteStep.cpp
index 15f6a2a..6d79f55 100644
--- a/SourceCode/Bond/Servo/CWriteStep.cpp
+++ b/SourceCode/Bond/Servo/CWriteStep.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "CWriteStep.h"
 #include "Common.h"
+#include "CEquipment.h"
 
 
 namespace SERVO {
@@ -120,9 +121,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);
 				}
 			}
 		}
@@ -139,11 +139,12 @@
 	void CWriteStep::getAttributeVector(CAttributeVector& attrubutes)
 	{
 		CStep::getAttributeVector(attrubutes);
+		std::string temp;
 
 		attrubutes.addAttribute(new CAttribute("Current Step",
 			std::to_string(m_nCurStep).c_str(), ""));
 		attrubutes.addAttribute(new CAttribute("Signal Dev",
-			std::to_string(m_nWriteSignalDev).c_str(), ""));
+			("W" + CToolUnits::toHexString(m_nWriteSignalDev, temp)).c_str(), ""));
 	}
 
 	void CWriteStep::init()

--
Gitblit v1.9.3