From 84925ada39fdef3f5bd7266005010103897713a6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 七月 2025 17:49:15 +0800
Subject: [PATCH] 1.EAP模拟器，启用或禁用警告上报功能实现和模拟测试； 2.Master端，收到EAP的启用或警告消息上报消息后，保存相关配置，如后续机器发生警告，根据配置决定是否上报警告消息；
---
SourceCode/Bond/Servo/CEqAlarmStep.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index db6f707..dcbd9b7 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -24,20 +24,21 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
attrubutes.addAttribute(new CAttribute("Alarm State",
- std::to_string(m_nAlarmState).c_str(), ""));
+ std::to_string(m_nAlarmState).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Unit ID",
- std::to_string(m_nUnitId).c_str(), ""));
+ std::to_string(m_nUnitId).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm Level",
- std::to_string(m_nAlarmLevel).c_str(), ""));
+ std::to_string(m_nAlarmLevel).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm Code",
- std::to_string(m_nAlarmCode).c_str(), ""));
+ std::to_string(m_nAlarmCode).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Alarm ID",
- std::to_string(m_nAlarmId).c_str(), ""));
+ std::to_string(m_nAlarmId).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Text",
- m_strText.c_str(), ""));
+ m_strText.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Description",
- m_strDescription.c_str(), ""));
+ m_strDescription.c_str(), "", weight++));
}
int CEqAlarmStep::onReadData()
@@ -57,7 +58,7 @@
m_nAlarmCode = (unsigned int)CToolUnits::toInt16(&szBuffer[6]);
m_nAlarmLevel = (unsigned int)CToolUnits::toInt16(&szBuffer[8]);
- LOGI("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>\n",
+ LOGI("<CEqAlarmStep> Equipment Alarm state Changed<State:%d, Unit:%d, Level:%d, Code:%d, ID:%d>",
m_nAlarmState, m_nUnitId, m_nAlarmLevel, m_nAlarmCode, m_nAlarmId,
m_strText.c_str(), m_strDescription.c_str());
--
Gitblit v1.9.3