From a25fffe157ee044e65318998827398941e7a42a4 Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期一, 03 三月 2025 18:13:48 +0800
Subject: [PATCH] 1.修改添加报警记录的方法 2.添加获取最后一次添加的事件id的方法
---
SourceCode/Bond/Servo/CEquipment.cpp | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index d3bc8da..2c6b8e6 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -60,6 +60,7 @@
{
auto iter = m_mapStep.find(addr);
if (iter != m_mapStep.end()) return -1;
+ pStep->setEquipment(this);
pStep->setCcLink(m_pCclink);
m_mapStep[addr] = pStep;
return 0;
@@ -242,20 +243,16 @@
// 以下根据信号做流程处理
CStep* pStep;
- // Equipment Mode Change Report
- index = 0x360;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- pStep->onSignal(bFlag);
- }
-
- // Equipment Status Change Report
- index = 0x361;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- pStep->onSignal(bFlag);
+ // Equipment Mode Change Report(0x360)
+ // Equipment Status Change Report(0x361)
+ // Equipment Alarm Change Report(0x362 ~ 0x366)
+ for (int i = 0; i < 7; i++) {
+ index = 0x360 + i;;
+ bFlag = isBitOn(pszData, size, index);
+ pStep = getStep(index);
+ if (pStep != nullptr) {
+ pStep->onSignal(bFlag);
+ }
}
}
--
Gitblit v1.9.3