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/Model.cpp | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index d9cf032..38ad39f 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -64,6 +64,12 @@
listener.onEQOnLine = [&](void* pFrom) -> void {
LOGI("远程请求OnLine");
};
+ listener.onCommand = [&](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
+ LOGI("onCommand:%s", pszName);
+ for (auto& item : params) {
+ LOGI("param:%s,%s", item.szName, item.szValue);
+ }
+ };
listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
// 在此填充常量值，目前仅是加1后返回
for (auto& item : eqcs) {
@@ -83,6 +89,30 @@
m_hsmsPassive.init(this, "APP", 7000);
+ SERVO::MasterListener masterListener;
+ masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
+ LOGI("<CModel>Equipment onAlive:%s(%s).\n", pEquipment->getName().c_str(),
+ bAlive ? _T("ON") : _T("OFF"));
+ notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
+
+ };
+ masterListener.onEqCimStateChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bOn) -> void {
+ LOGI("<CModel>Equipment Cim State:%s(%s).\n", pEquipment->getName().c_str(),
+ bOn ? _T("ON") : _T("OFF"));
+ notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
+
+ };
+ masterListener.onEqStepEvent = [&](SERVO::CStep* pStep, int code, void* pData) -> void {
+ if (code == STEP_EVENT_READDATA) {
+ LOGI("<CModel>onEqStepEvent,数据变化:%s(%s, 0x%x).\n", pStep->getEquipment()->getName().c_str(),
+ pStep->getName().c_str(), pData);
+ notifyPtr(RX_CODE_STEP_EVENT_READDATA, pStep);
+
+ }
+ };
+
+ m_master.setListener(masterListener);
+
return 0;
}
@@ -90,6 +120,8 @@
{
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
+ m_master.term();
+
return 0;
}
--
Gitblit v1.9.3