From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CEqAlarmStep.h |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.h b/SourceCode/Bond/Servo/CEqAlarmStep.h
index 45510bf..b00c538 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.h
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.h
@@ -1,19 +1,25 @@
 #pragma once
-#include "CStep.h"
+#include "CReadStep.h"
 
 
 namespace SERVO {
-	class CEqAlarmStep : public CStep
+	class CEqAlarmStep : public CReadStep
 	{
 	public:
 		CEqAlarmStep();
-		~CEqAlarmStep();
+		virtual ~CEqAlarmStep();
 
 	public:
+		virtual void getAttributeVector(CAttributeVector& attrubutes);
 		virtual int onReadData();
 		virtual int onComplete();
 		virtual int onTimeout();
 		void setAlarmDev(int nDev);
+		int getAlarmState();
+		int getUnitId();
+		int getAlarmLevel();
+		int getAlarmCode();
+		int getAlarmId();
 
 	private:
 		int m_nAlarmDev;

--
Gitblit v1.9.3