From ccbda3e4f7ed430843fbc0190e8ee0d0f0e3a721 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 21 一月 2025 11:06:16 +0800
Subject: [PATCH] 1.SECS实现Off-Line和On-Line消息处理回调应用层，如何切换状态需待和机器端确定。
---
SourceCode/Bond/Servo/HsmsPassive.h | 5 +++++
SourceCode/Bond/Servo/HsmsPassive.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
SourceCode/Bond/Servo/Model.cpp | 6 ++++++
3 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 38ceda5..b77ee1a 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -64,6 +64,8 @@
void CHsmsPassive::setListener(SECSListener listener)
{
+ m_listener.onEQOffLine = listener.onEQOffLine;
+ m_listener.onEQOnLine = listener.onEQOnLine;
m_listener.onEQConstantRequest = listener.onEQConstantRequest;
m_listener.onEQConstantSend = listener.onEQConstantSend;
}
@@ -188,6 +190,12 @@
}
else if (nStream == 1 && pHeader->function == 13) {
replyEstablishCommunications(pMessage);
+ }
+ else if (nStream == 1 && pHeader->function == 15) {
+ replyOffLine(pMessage);
+ }
+ else if (nStream == 1 && pHeader->function == 17) {
+ replyOnLine(pMessage);
}
else if (nStream == 2 && pHeader->function == 13) {
replyEquipmentConstantRequest(pMessage);
@@ -366,7 +374,44 @@
return 0;
}
-// S1F14
+// S1F15
+int CHsmsPassive::replyOffLine(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ // 交由上层应用来获取机器常量值
+ if (m_listener.onEQOffLine != nullptr) {
+ m_listener.onEQOffLine(this);
+ }
+
+
+ // 回复
+ replyAck(1, 16, pRecv->getHeader()->systemBytes, BYTE(0), "OFLACK");
+ return 0;
+}
+
+// S1F17
+int CHsmsPassive::replyOnLine(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ // 交由上层应用来获取机器常量值
+ if (m_listener.onEQOnLine != nullptr) {
+ m_listener.onEQOnLine(this);
+ }
+
+
+ // 回复
+ replyAck(1, 18, pRecv->getHeader()->systemBytes, BYTE(0), "ONLACK");
+ return 0;
+}
+
int CHsmsPassive::replyEstablishCommunications(IMessage* pRecv)
{
if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 9048e86..88125df 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -23,8 +23,11 @@
typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
+typedef std::function<void(void* pFrom)> SECSEQOFFLINE;
typedef struct _SECSListener
{
+ SECSEQOFFLINE onEQOffLine;
+ SECSEQOFFLINE onEQOnLine;
SECSEQCONSTANTREQUEST onEQConstantRequest;
SECSEQCONSTANTREQUEST onEQConstantSend;
} SECSListener;
@@ -62,6 +65,8 @@
/* reply开头的函数为回复函数 */
int replyAreYouThere(IMessage* pRecv);
int replyEstablishCommunications(IMessage* pRecv);
+ int replyOnLine(IMessage* pRecv);
+ int replyOffLine(IMessage* pRecv);
int replyEquipmentConstantRequest(IMessage* pRecv);
int replyEquipmentConstantSend(IMessage* pRecv);
int replyDatetime(IMessage* pRecv);
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 5acc459..d9cf032 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -58,6 +58,12 @@
SECSListener listener;
+ listener.onEQOffLine = [&](void* pFrom) -> void {
+ LOGI("远程请求OffLine");
+ };
+ listener.onEQOnLine = [&](void* pFrom) -> void {
+ LOGI("远程请求OnLine");
+ };
listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
// 在此填充常量值，目前仅是加1后返回
for (auto& item : eqcs) {
--
Gitblit v1.9.3