From 33f077385d8f15b0aec64e5be280738f451d6ae1 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 25 四月 2025 13:49:08 +0800
Subject: [PATCH] 1.补充完善CJobDataS的函数；
---
SourceCode/Bond/Servo/CWriteStep.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CWriteStep.cpp b/SourceCode/Bond/Servo/CWriteStep.cpp
index 34dc627..5414b12 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 {
@@ -98,14 +99,14 @@
// 2.给对方写ON
nextStep();
- m_pCclink->SetBitDevice(m_station, DeviceType::B, m_nWriteSignalDev);
+ m_pCclink->SetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);
// 3.等待对方ON
nextStep();
int nStep3Ret = ::WaitForSingleObject(m_hRecvSignalOn, TIMEOUT * 1000);
if (nStep3Ret == WAIT_TIMEOUT) {
- m_pCclink->ResetBitDevice(m_station, DeviceType::B, m_nWriteSignalDev);
+ m_pCclink->ResetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);
onTimeout();
goto RESET;
}
@@ -114,15 +115,14 @@
// 4.写OFF
nextStep();
- m_pCclink->ResetBitDevice(m_station, DeviceType::B, m_nWriteSignalDev);
+ m_pCclink->ResetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);
// 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