From 3628a707a38e1c590216c5983c9b97b9c742f86c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 24 三月 2025 09:01:42 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Model.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 2429f3a..114fe5d 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -145,12 +145,15 @@
else {
LOGE("<CModel> Failed to add alarm.");
}
+
+ notifyPtr(RX_CODE_ALARM_SET, pStep);
}
else {
alarmManager.clearAlarmByAttributes(pEqAlarmStep->getAlarmId(),
pEqAlarmStep->getEquipment()->getID(),
pEqAlarmStep->getUnitId(),
CToolUnits::getCurrentTimeString());
+ notifyPtr(RX_CODE_ALARM_CLEAR, pStep);
}
m_hsmsPassive.requestAlarmReport(pEqAlarmStep->getAlarmState(),
--
Gitblit v1.9.3