From 247a2a9a9f3d699df42a009bf124d3b536ad6b37 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 25 七月 2025 14:23:55 +0800
Subject: [PATCH] 1.Master端，Line Event Report功能修改完善，并通过EAP模拟测试OK;

---
 SourceCode/Bond/Servo/HsmsPassive.h |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 7dbbbf6..6b7fe92 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -15,10 +15,12 @@
 #define VALUE_NAME_MAX			64
 
 
-#define ER_NOERROR			0
-#define ER_NOTSELECT		-1
-#define ER_BUSY				-2
-#define ER_PARAM_ERROR		-3
+#define ER_NOERROR				0
+#define ER_NOTSELECT			-1
+#define ER_BUSY					-2
+#define ER_PARAM_ERROR			-3
+#define ER_NO_EVENT				-4
+#define ER_UNLINK_EVENT_REPORT	-5
 
 
 /*
@@ -91,16 +93,11 @@
 	/* 设置软件版本号 最大长度 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);
+	void linkEventReport(unsigned int CEID, unsigned int RPTID);
 
 	// 取消连接report
 	void unlinkEventReport(unsigned int CEID);
-
-	unsigned int getCEID(int RPTID);
 
 	// define Report
 	SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);
@@ -133,7 +130,10 @@
 	// 取消/删除所有CollectionEvent
 	void clearAllCollectionEvent();
 
+	// 取得CCollectionEvent
+	SERVO::CCollectionEvent* getEvent(unsigned short CEID);
 
+	// 取得Report
 	SERVO::CReport* getReport(int rptid);
 
 	void setListener(SECSListener listener);
@@ -147,7 +147,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);
+	int requestEventReportSend(unsigned int DATAID, unsigned int CEID, const std::vector<std::string>& values);
 
 private:
 	void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
@@ -196,15 +196,6 @@
 	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;
-
-	// VID to Report
-	std::map<unsigned int, VALUE> m_mapValue;
-
 	// CVariable vector
 	std::vector<SERVO::CVariable*> m_variabels;
 
@@ -212,6 +203,6 @@
 	std::vector<SERVO::CReport*> m_reports;
 
 	// CollectionEvent vector
-	std::vector<SERVO::CCollectionEvent*> m_collectionEvent;
+	std::vector<SERVO::CCollectionEvent*> m_collectionEvents;
 };
 

--
Gitblit v1.9.3