From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。
---
SourceCode/Bond/Servo/CEqStatusStep.h | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqStatusStep.h b/SourceCode/Bond/Servo/CEqStatusStep.h
index 09fc8f4..3423e84 100644
--- a/SourceCode/Bond/Servo/CEqStatusStep.h
+++ b/SourceCode/Bond/Servo/CEqStatusStep.h
@@ -1,22 +1,24 @@
#pragma once
-#include "CStep.h"
+#include "CReadStep.h"
namespace SERVO {
#define UNIT_MAX 6
#define STATUS_MAX (UNIT_MAX + 1)
- class CEqStatusStep : public CStep
+ class CEqStatusStep : public CReadStep
{
public:
CEqStatusStep();
- ~CEqStatusStep();
+ virtual ~CEqStatusStep();
public:
+ virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual int onReadData();
virtual int onComplete();
virtual int onTimeout();
void setStatusDev(int nDev);
+ int getStatus(unsigned int uint);
std::string& getStatusDescription(unsigned int unid, std::string& strDescription);
private:
--
Gitblit v1.9.3