From 1bc4fecb9cc1641ed3ad0a2fda30766fc06fb13e Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 01 四月 2025 16:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CReadStep.cpp | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index 0a2474f..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 {
@@ -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,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
@@ -110,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);
}
}
}
@@ -129,10 +130,12 @@
void CReadStep::getAttributeVector(CAttributeVector& attrubutes)
{
CStep::getAttributeVector(attrubutes);
+ std::string strTemp;
+
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, strTemp)).c_str(), ""));
}
void CReadStep::init()
--
Gitblit v1.9.3