From a50ee893d90f98974de664e365f8802198ad2539 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 11:33:49 +0800
Subject: [PATCH] 1. 添加生产履历管理器 2. 删除报警管理器的设置数据库的接口，防止野指针
---
SourceCode/Bond/Servo/CEqStatusStep.cpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqStatusStep.cpp b/SourceCode/Bond/Servo/CEqStatusStep.cpp
index 697e384..52eaa0f 100644
--- a/SourceCode/Bond/Servo/CEqStatusStep.cpp
+++ b/SourceCode/Bond/Servo/CEqStatusStep.cpp
@@ -5,7 +5,7 @@
namespace SERVO {
- CEqStatusStep::CEqStatusStep() : CStep()
+ CEqStatusStep::CEqStatusStep() : CReadStep()
{
m_nStatusDev = 0;
for (int i = 0; i < STATUS_MAX; i++) {
@@ -23,7 +23,7 @@
void CEqStatusStep::getAttributeVector(CAttributeVector& attrubutes)
{
- CStep::getAttributeVector(attrubutes);
+ CReadStep::getAttributeVector(attrubutes);
char szName[256];
for (int i = 0; i < STATUS_MAX; i++) {
@@ -35,8 +35,9 @@
std::to_string(m_nReasonCode[i]).c_str(), ""));
}
+ std::string strTemp;
attrubutes.addAttribute(new CAttribute("Status Dev",
- std::to_string(m_nStatusDev).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nStatusDev, strTemp)).c_str(), ""));
}
int CEqStatusStep::getStatus(unsigned int uint)
@@ -49,7 +50,7 @@
}
int CEqStatusStep::onReadData()
{
- CStep::onReadData();
+ CReadStep::onReadData();
char szBuffer[64];
int nRet = m_pCclink->ReadData2(m_station, DeviceType::W,
@@ -82,7 +83,7 @@
int CEqStatusStep::onComplete()
{
- CStep::onComplete();
+ CReadStep::onComplete();
LOGI("<CEqStatusStep> onComplete.");
return 0;
@@ -90,7 +91,7 @@
int CEqStatusStep::onTimeout()
{
- CStep::onTimeout();
+ CReadStep::onTimeout();
LOGI("<CEqStatusStep> onTimeout.");
return 0;
--
Gitblit v1.9.3