From 6df6302161eb6021ad3c324d7a3f5494c63dc21e Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 08:39:53 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Model.cpp | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index d9cf032..a7db1b4 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,13 @@
m_hsmsPassive.init(this, "APP", 7000);
+ SERVO::MasterListener masterListener;
+ masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
+ LOGI("<CModel>Equipment onAlive:%d.\n", pEquipment->getName().c_str(),
+ bAlive ? _T("ON") : _T("OFF"));
+ };
+ m_master.setListener(masterListener);
+
return 0;
}
@@ -90,6 +103,8 @@
{
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
+ m_master.term();
+
return 0;
}
--
Gitblit v1.9.3