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.h | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.h b/SourceCode/Bond/Servo/CEqAlarmStep.h
index 98cc3bc..7c33958 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.h
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.h
@@ -1,44 +1,25 @@
#pragma once
-#include "CStep.h"
+#include "CReadStep.h"
namespace SERVO {
- class CEqAlarmStep : public CStep
+ class CEqAlarmStep : public CReadStep
{
public:
CEqAlarmStep();
~CEqAlarmStep();
public:
+ virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual int onReadData();
virtual int onComplete();
virtual int onTimeout();
-
- // Getter 和 Setter 声明
- int getAlarmDev() const;
- void setAlarmDev(int nAlarmDev);
-
- int getAlarmState() const;
- void setAlarmState(int nAlarmState);
-
- int getUnitId() const;
- void setUnitId(int nUnitId);
-
- int getAlarmLevel() const;
- void setAlarmLevel(int nAlarmLevel);
-
- int getAlarmCode() const;
- void setAlarmCode(int nAlarmCode);
-
- int getAlarmId() const;
- void setAlarmId(int nAlarmId);
-
- std::string getText() const;
- void setText(const std::string& strText);
-
- std::string getDescription() const;
- void setDescription(const std::string& strDescription);
-
+ void setAlarmDev(int nDev);
+ int getAlarmState();
+ int getUnitId();
+ int getAlarmLevel();
+ int getAlarmCode();
+ int getAlarmId();
private:
int m_nAlarmDev;
--
Gitblit v1.9.3