From 956cb65690500f099be756accc346f3c8d56be99 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 20 一月 2025 16:50:54 +0800
Subject: [PATCH] 1.SECS，实现S2F15（Equipment Constant Send）的回复，目前仅打印显示数据，待机器端确认相关逻辑后再保存和设置机器数据。 2.修改和完善S2F13，与S2F15靠拢，并使用相同的数据结构和回调函数到应用层；
---
SourceCode/Bond/Servo/HsmsPassive.h | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index da96cbd..9048e86 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -11,13 +11,24 @@
#define ER_BUSY -2
#define ER_PARAM_ERROR -3
-typedef std::function<void(void* pFrom, const std::vector<unsigned int>& ecids,
- std::vector<unsigned int>& ecvs)> SECSEQCONSTANTREQUEST;
-typedef std::function<void(void* pFrom, int error)> ONDATAERROR;
+
+/*
+ * 常量数据结构
+ */
+typedef struct _EQConstant
+{
+ unsigned int id;
+ char szValue[256];
+} EQConstant;
+
+
+typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
typedef struct _SECSListener
{
SECSEQCONSTANTREQUEST onEQConstantRequest;
+ SECSEQCONSTANTREQUEST onEQConstantSend;
} SECSListener;
+
class CModel;
class CHsmsPassive
@@ -51,7 +62,8 @@
/* reply开头的函数为回复函数 */
int replyAreYouThere(IMessage* pRecv);
int replyEstablishCommunications(IMessage* pRecv);
- int replyEquipmentConstant(IMessage* pRecv);
+ int replyEquipmentConstantRequest(IMessage* pRecv);
+ int replyEquipmentConstantSend(IMessage* pRecv);
int replyDatetime(IMessage* pRecv);
int replyEanbleDisableEventReport(IMessage* pRecv);
int replyEanbleDisableAlarmReport(IMessage* pRecv);
--
Gitblit v1.9.3