From 1fd6271242b881c26a131289ddfcfe7fd68dbaed Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 14 一月 2025 17:39:20 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/HsmsPassive.h | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index cb3b047..ac820bb 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -17,6 +17,12 @@
~CHsmsPassive();
public:
+ /* 设置机器型号 最大长度 20 bytes */
+ void setEquipmentModelType(const char* pszMode);
+
+ /* 设置软件版本号 最大长度 20 bytes */
+ void setSoftRev(const char* pszRev);
+
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
void setActionTimeout(int nSecond);
@@ -24,12 +30,17 @@
int term();
public:
+ /* request开头的函数为主动发送数据的函数 */
int requestAreYouThere();
+ int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
private:
+ /* reply开头的函数为回复函数 */
int replyAreYouThere(unsigned int systemBytes);
int replyEstablishCommunications(unsigned int systemBytes);
int replyDatetime(IMessage* pRecv);
+ int replyEanbleDisableEventReport(IMessage* pRecv);
+ int replyEanbleDisableAlarmReport(IMessage* pRecv);
private:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
--
Gitblit v1.9.3