From 904fd149e60f984f4459ff295cd6ae6505fa3f21 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期三, 12 二月 2025 17:48:14 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/HsmsPassive.h | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index ac820bb..670befa 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -2,12 +2,63 @@
#include <string>
#include <list>
#include "HsmsAction.h"
+#include <functional>
+#include <vector>
+#include <map>
+
+
+#define EQCONSTANT_VALUE_MAX 64
+#define COMMAND_NAME_MAX 64
+#define COMMAND_VALUE_MAX 64
+#define REPORT_NAME_MAX 64
#define ER_NOERROR 0
#define ER_NOTSELECT -1
#define ER_BUSY -2
#define ER_PARAM_ERROR -3
+
+
+/*
+ * 常量数据结构
+ */
+typedef struct _EQConstant
+{
+ unsigned int id;
+ char szValue[EQCONSTANT_VALUE_MAX];
+} EQConstant;
+
+/*
+ * Command 数据结构
+ */
+typedef struct _CommandParameter
+{
+ char szName[COMMAND_NAME_MAX];
+ char szValue[COMMAND_VALUE_MAX];
+} CommandParameter;
+
+/*
+ * Report 数据结构
+ */
+typedef struct _REPORT
+{
+ char szName[REPORT_NAME_MAX];
+ unsigned int id;
+} REPORT;
+
+
+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 struct _SECSListener
+{
+ SECSEQOFFLINE onEQOffLine;
+ SECSEQOFFLINE onEQOnLine;
+ SECSEQCONSTANTREQUEST onEQConstantRequest;
+ SECSEQCONSTANTREQUEST onEQConstantSend;
+ SECSCommand onCommand;
+} SECSListener;
+
class CModel;
class CHsmsPassive
@@ -23,6 +74,16 @@
/* 设置软件版本号 最大长度 20 bytes */
void setSoftRev(const char* pszRev);
+ /* 添加Report */
+ void addReport(unsigned int id, const char* pszName);
+
+ // 连接Report
+ void linkEventReport(unsigned int RPTID, unsigned int CEID);
+
+ // 取消连接report
+ void unlinkEventReport(unsigned int CEID);
+
+ void setListener(SECSListener listener);
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
void setActionTimeout(int nSecond);
@@ -35,12 +96,22 @@
int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
private:
+ void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
+
/* reply开头的函数为回复函数 */
- int replyAreYouThere(unsigned int systemBytes);
- int replyEstablishCommunications(unsigned int systemBytes);
+ 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);
+ int replyLinkEventReport(IMessage* pRecv);
int replyEanbleDisableEventReport(IMessage* pRecv);
+ int replyCommand(IMessage* pRecv);
int replyEanbleDisableAlarmReport(IMessage* pRecv);
+ int replyQueryPPIDList(IMessage* pRecv);
+ int replyTerminalDisplay(IMessage* pRecv);
private:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
@@ -61,9 +132,17 @@
std::list<CHsmsAction*> m_listActionSent;
private:
+ SECSListener m_listener;
BOOL m_bCimWorking;
HANDLE m_hCimWorkEvent;
HANDLE m_hCimWorkThreadHandle;
unsigned m_nCimWorkThrdaddr;
+
+private:
+ // RPTID to CEID
+ std::map<unsigned int, unsigned int> m_mapReportIdToCEID;
+
+ // RPTID to Report
+ std::map<unsigned int, REPORT> m_mapReport;
};
--
Gitblit v1.9.3