From 57056db746cec1ad5c0cc5dad93b8f3474d2562d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 29 三月 2025 15:18:13 +0800
Subject: [PATCH] 1.添加载具搬送状态类(CEqCassetteTransferStateStep)
---
SourceCode/Bond/Servo/CReadStep.cpp | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index 0a2474f..c633c2f 100644
--- a/SourceCode/Bond/Servo/CReadStep.cpp
+++ b/SourceCode/Bond/Servo/CReadStep.cpp
@@ -19,6 +19,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 +39,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);
}
@@ -129,10 +131,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