From 2d25068c16bd644c24754eb42086a24a415b7837 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 20 一月 2025 16:22:01 +0800
Subject: [PATCH] 1.SECS通讯, 实现S2F13（Equipment Constant Request）的回复，目前仅返回模拟结果，真实数据待机器端确认后再返回真实数据。
---
SourceCode/Bond/Servo/HsmsPassive.h | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index cb3b047..da96cbd 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -2,12 +2,22 @@
#include <string>
#include <list>
#include "HsmsAction.h"
+#include <functional>
+#include <vector>
#define ER_NOERROR 0
#define ER_NOTSELECT -1
#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 _SECSListener
+{
+ SECSEQCONSTANTREQUEST onEQConstantRequest;
+} SECSListener;
class CModel;
class CHsmsPassive
@@ -17,6 +27,13 @@
~CHsmsPassive();
public:
+ /* 设置机器型号 最大长度 20 bytes */
+ void setEquipmentModelType(const char* pszMode);
+
+ /* 设置软件版本号 最大长度 20 bytes */
+ void setSoftRev(const char* pszRev);
+
+ void setListener(SECSListener listener);
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
void setActionTimeout(int nSecond);
@@ -24,12 +41,22 @@
int term();
public:
+ /* request开头的函数为主动发送数据的函数 */
int requestAreYouThere();
+ int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
private:
- int replyAreYouThere(unsigned int systemBytes);
- int replyEstablishCommunications(unsigned int systemBytes);
+ void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
+
+ /* reply开头的函数为回复函数 */
+ int replyAreYouThere(IMessage* pRecv);
+ int replyEstablishCommunications(IMessage* pRecv);
+ int replyEquipmentConstant(IMessage* pRecv);
int replyDatetime(IMessage* pRecv);
+ int replyEanbleDisableEventReport(IMessage* pRecv);
+ int replyEanbleDisableAlarmReport(IMessage* pRecv);
+ int replyQueryPPIDList(IMessage* pRecv);
+ int replyTerminalDisplay(IMessage* pRecv);
private:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
@@ -50,6 +77,7 @@
std::list<CHsmsAction*> m_listActionSent;
private:
+ SECSListener m_listener;
BOOL m_bCimWorking;
HANDLE m_hCimWorkEvent;
HANDLE m_hCimWorkThreadHandle;
--
Gitblit v1.9.3