From 19261d011387ec57d646decc945aadaf8913eeab Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 09:05:54 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 74 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index 1aa6dac..67247eb 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,73 @@
int CEqAlarmStep::onTimeout()
{
- CStep::onTimeout();
+ CReadStep::onTimeout();
LOGI("<CEqAlarmStep> onTimeout.");
return 0;
}
- void CEqAlarmStep::setAlarmDev(int nDev)
- {
- m_nAlarmDev = nDev;
+ // 获取和设置 AlarmDev
+ int CEqAlarmStep::getAlarmDev() const {
+ return m_nAlarmDev;
+ }
+
+ void CEqAlarmStep::setAlarmDev(int nAlarmDev) {
+ m_nAlarmDev = nAlarmDev;
+ }
+
+ // 获取和设置 AlarmState
+ int CEqAlarmStep::getAlarmState() const {
+ return m_nAlarmState;
+ }
+
+ void CEqAlarmStep::setAlarmState(int nAlarmState) {
+ m_nAlarmState = nAlarmState;
+ }
+
+ // 获取和设置 UnitId
+ int CEqAlarmStep::getUnitId() const {
+ return m_nUnitId;
+ }
+
+ void CEqAlarmStep::setUnitId(int nUnitId) {
+ m_nUnitId = nUnitId;
+ }
+
+ // 获取和设置 AlarmLevel
+ int CEqAlarmStep::getAlarmLevel() const {
+ return m_nAlarmLevel;
+ }
+
+ void CEqAlarmStep::setAlarmLevel(int nAlarmLevel) {
+ m_nAlarmLevel = nAlarmLevel;
+ }
+
+ // 获取和设置 AlarmCode
+ int CEqAlarmStep::getAlarmCode() const {
+ return m_nAlarmCode;
+ }
+
+ void CEqAlarmStep::setAlarmCode(int nAlarmCode) {
+ m_nAlarmCode = nAlarmCode;
+ }
+
+ // 获取和设置 AlarmId
+ int CEqAlarmStep::getAlarmId() const {
+ return m_nAlarmId;
+ }
+
+ void CEqAlarmStep::setAlarmId(int nAlarmId) {
+ m_nAlarmId = nAlarmId;
+ }
+
+ // 获取和设置 Text
+ std::string CEqAlarmStep::getText() const {
+ return m_strText;
+ }
+
+ void CEqAlarmStep::setText(const std::string& strText) {
+ m_strText = strText;
}
int CEqAlarmStep::getAlarmState()
--
Gitblit v1.9.3