From e1b3a1f5e35b09be95d694bc259b0ba92c4d3436 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 26 四月 2025 10:55:23 +0800
Subject: [PATCH] 1.再一次修改地址；
---
SourceCode/Bond/Servo/CReadStep.cpp | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index 6c948de..a482c7a 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 {
@@ -19,6 +20,7 @@
m_hWorkThreadHandle = nullptr;
m_hReadSignalOn = ::CreateEvent(NULL, TRUE, FALSE, NULL);
m_hReadSignalOff = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+ m_nSignalType = 0;
m_nCurStep = 0;
}
@@ -38,13 +40,14 @@
m_nWriteSignalDev = dev;
}
- void CReadStep::onReadSignal(BOOL bSignal)
+ void CReadStep::onReadSignal(int nSignalType)
{
Lock();
- if (m_nCurStep == 0 && bSignal) {
+ m_nSignalType = nSignalType;
+ if (m_nCurStep == 0 && nSignalType != 0) {
SetEvent(m_hReadSignalOn);
}
- else if (m_nCurStep == 3 && !bSignal) {
+ else if (m_nCurStep == 3 && nSignalType == 0) {
SetEvent(m_hReadSignalOff);
}
@@ -81,21 +84,20 @@
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
nextStep();
- m_pCclink->SetBitDevice(m_station, DeviceType::B, m_nWriteSignalDev);
+ m_pCclink->SetBitDeviceEx(m_station, (long)DeviceType::B, m_nWriteSignalDev);
// 3.等待对方OFF
nextStep();
int nStep3Ret = ::WaitForSingleObject(m_hReadSignalOff, 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;
}
@@ -104,15 +106,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