From 2de4eb139c0cc595db761fedd822549384822fc9 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 七月 2025 16:25:00 +0800
Subject: [PATCH] 1.EAP模拟器,Eanble/Disable Event对话框,可以模拟EAP下发 Enable/Disable Event Report; 2.Master, 增加接口设置 Enable/Disable Event Report,目前仅处理enable/disable所有 event上报;
---
SourceCode/Bond/Servo/HsmsPassive.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 616732e..dbabb8a 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -60,6 +60,8 @@
typedef std::function<void(void* pFrom)> SECSEQOFFLINE;
typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
typedef std::function<void(void* pFrom, const char*, std::vector<CommandParameter>&)> SECSCommand;
+typedef std::function<void(void* pFrom, SYSTEMTIME& time)> DATETIMESYNC;
+typedef std::function<void(void* pFrom, bool bEnable, std::vector<unsigned int>& ids)> EDEVENTREPORT;
typedef struct _SECSListener
{
SECSEQOFFLINE onEQOffLine;
@@ -67,6 +69,8 @@
SECSEQCONSTANTREQUEST onEQConstantRequest;
SECSEQCONSTANTREQUEST onEQConstantSend;
SECSCommand onCommand;
+ DATETIMESYNC onDatetimeSync;
+ EDEVENTREPORT onEnableDisableEventReport;
} SECSListener;
@@ -93,6 +97,8 @@
// 取消连接report
void unlinkEventReport(unsigned int CEID);
+ unsigned int getCEID(int RPTID);
+
// define Report
void defineReport(unsigned int VID, unsigned int RPTID);
@@ -113,6 +119,7 @@
/* request开头的函数为主动发送数据的函数 */
int requestAreYouThere();
int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
+ int requestEventReportSend(unsigned int DATAID, unsigned int RPTID, const std::vector<std::string>& values);
private:
void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
--
Gitblit v1.9.3