From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；
---
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index 9f4bdc9..f488927 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;
@@ -20,9 +20,30 @@
}
+ void CEqAlarmStep::getAttributeVector(CAttributeVector& attrubutes)
+ {
+ CReadStep::getAttributeVector(attrubutes);
+
+ unsigned int weight = 31;
+ attrubutes.addAttribute(new CAttribute("Alarm State",
+ std::to_string(m_nAlarmState).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Unit ID",
+ std::to_string(m_nUnitId).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Alarm Level",
+ std::to_string(m_nAlarmLevel).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Alarm Code",
+ std::to_string(m_nAlarmCode).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Alarm ID",
+ std::to_string(m_nAlarmId).c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Text",
+ m_strText.c_str(), "", weight++));
+ attrubutes.addAttribute(new CAttribute("Description",
+ m_strDescription.c_str(), "", weight++));
+ }
+
int CEqAlarmStep::onReadData()
{
- CStep::onReadData();
+ CReadStep::onReadData();
char szBuffer[64];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W,
@@ -46,7 +67,7 @@
int CEqAlarmStep::onComplete()
{
- CStep::onComplete();
+ CReadStep::onComplete();
LOGI("<CEqAlarmStep> onComplete.");
return 0;
@@ -54,15 +75,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