From 5bcbdac9793e19713d41b58c9eeefbd0818d192b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 06 五月 2025 16:50:05 +0800
Subject: [PATCH] 1.暂存配方参数获取
---
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index 1aa6dac..db6f707 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -5,7 +5,7 @@
namespace SERVO {
- CEqAlarmStep::CEqAlarmStep() : CStep()
+ CEqAlarmStep::CEqAlarmStep() : CReadStep()
{
m_nAlarmDev = 0;
m_nAlarmState = 0;
@@ -22,7 +22,7 @@
void CEqAlarmStep::getAttributeVector(CAttributeVector& attrubutes)
{
- CStep::getAttributeVector(attrubutes);
+ CReadStep::getAttributeVector(attrubutes);
attrubutes.addAttribute(new CAttribute("Alarm State",
std::to_string(m_nAlarmState).c_str(), ""));
@@ -42,7 +42,7 @@
int CEqAlarmStep::onReadData()
{
- CStep::onReadData();
+ CReadStep::onReadData();
char szBuffer[64];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W,
@@ -66,7 +66,7 @@
int CEqAlarmStep::onComplete()
{
- CStep::onComplete();
+ CReadStep::onComplete();
LOGI("<CEqAlarmStep> onComplete.");
return 0;
@@ -74,15 +74,14 @@
int CEqAlarmStep::onTimeout()
{
- CStep::onTimeout();
+ CReadStep::onTimeout();
LOGI("<CEqAlarmStep> onTimeout.");
return 0;
}
- void CEqAlarmStep::setAlarmDev(int nDev)
- {
- m_nAlarmDev = nDev;
+ void CEqAlarmStep::setAlarmDev(int nAlarmDev) {
+ m_nAlarmDev = nAlarmDev;
}
int CEqAlarmStep::getAlarmState()
--
Gitblit v1.9.3