From 5efff0895ad06eb0c5f04df7efe67a22b358beb3 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 18 二月 2025 16:10:23 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/Model.cpp | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 8bb0368..66cf9a7 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -58,18 +58,50 @@
SECSListener listener;
- listener.onEQConstantRequest = [&](void* pFrom, const std::vector<unsigned int>& ecids,
- std::vector<unsigned int>& ecvs) -> void {
- // 在此填充常量值，目前仅是加1后返回
- for (auto item : ecids) {
- ecvs.push_back(item + 1);
+ listener.onEQOffLine = [&](void* pFrom) -> void {
+ LOGI("远程请求OffLine");
+ };
+ 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) {
+ sprintf_s(item.szValue, 256, "Test%d", item.id+1);
+ }
+ };
+ listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
+ // 在此保存和设置机器常量值
+ for (auto& item : eqcs) {
+ LOGI("onEQConstantRequest: %d, %s", item.id, item.szValue);
+ }
+ };
+
m_hsmsPassive.setListener(listener);
m_hsmsPassive.setEquipmentModelType((LPTSTR)(LPCTSTR)strModeType);
m_hsmsPassive.setSoftRev((LPTSTR)(LPCTSTR)strSoftRev);
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"));
+
+ };
+ m_master.setListener(masterListener);
return 0;
}
@@ -78,6 +110,8 @@
{
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
+ m_master.term();
+
return 0;
}
--
Gitblit v1.9.3