From 32cbd98506d80bc0089b50389f7b187ab2eb012e Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期五, 14 二月 2025 17:51:01 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/HsmsPassive.h | 29 +++++++++
SourceCode/Bond/Servo/HsmsAction.h | 1
SourceCode/Bond/Servo/HsmsPassive.cpp | 114 +++++++++++++++++++++++++++++++++++++
Document/ESWIN_EAS_Equipment_Link_Signal_Specification_v1.1.docx | 0
Document/ESWIN_EAS_Bonder_Inline_Mapping_Address_v1.1.1.xlsx | 0
SourceCode/Bond/Servo/ServoDlg.cpp | 8 ++
6 files changed, 151 insertions(+), 1 deletions(-)
diff --git a/Document/ESWIN_EAS_Bonder_Inline_Mapping_Address_v1.1.1.xlsx b/Document/ESWIN_EAS_Bonder_Inline_Mapping_Address_v1.1.1.xlsx
new file mode 100644
index 0000000..26977da
--- /dev/null
+++ b/Document/ESWIN_EAS_Bonder_Inline_Mapping_Address_v1.1.1.xlsx
Binary files differ
diff --git a/Document/ESWIN_EAS_Equipment_Link_Signal_Specification_v1.1.docx b/Document/ESWIN_EAS_Equipment_Link_Signal_Specification_v1.1.docx
new file mode 100644
index 0000000..66c9a74
--- /dev/null
+++ b/Document/ESWIN_EAS_Equipment_Link_Signal_Specification_v1.1.docx
Binary files differ
diff --git a/SourceCode/Bond/Servo/HsmsAction.h b/SourceCode/Bond/Servo/HsmsAction.h
index e4f6910..5be2bbb 100644
--- a/SourceCode/Bond/Servo/HsmsAction.h
+++ b/SourceCode/Bond/Servo/HsmsAction.h
@@ -5,6 +5,7 @@
#define ACTION_IDLE 0
#define ACTION_HELLO 1 /* S1F1 */
#define ACTION_ALARM_REPORT 2 /* S5F1 */
+#define ACTION_EVENT_REPORT 3 /* S6F11 */
class CHsmsAction
{
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index f714e51..094f4fd 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -125,6 +125,35 @@
}
+unsigned int CHsmsPassive::getCEID(int RPTID)
+{
+ auto iter = m_mapReportIdToCEID.find(RPTID);
+ if (iter != m_mapReportIdToCEID.end()) return iter->second;
+ return 0;
+}
+
+void CHsmsPassive::deleteReport(unsigned int RPTID)
+{
+ for (auto it = m_mapValueIdToPRTID.begin(); it != m_mapValueIdToPRTID.end(); ) {
+ if (it->second == RPTID) {
+ m_mapValueIdToPRTID.erase(it++); // 更新迭代器
+ }
+ else {
+ ++it;
+ }
+ }
+}
+
+void CHsmsPassive::deleteAllReport()
+{
+ m_mapValueIdToPRTID.clear();
+}
+
+void CHsmsPassive::defineReport(unsigned int VID, unsigned int RPTID)
+{
+ m_mapValueIdToPRTID[VID] = RPTID;
+}
+
void CHsmsPassive::OnTimer(UINT nTimerid)
{
// 所有已发送的Action自加1
@@ -238,6 +267,9 @@
}
else if (nStream == 2 && pHeader->function == 31) {
replyDatetime(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 33) {
+ replyDefineReport(pMessage);
}
else if (nStream == 2 && pHeader->function == 35) {
replyLinkEventReport(pMessage);
@@ -597,6 +629,55 @@
return 0;
}
+// S2F33
+int CHsmsPassive::replyDefineReport(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ ISECS2Item* pBody = pRecv->getBody();
+ ISECS2Item* defineItem, *rptListItem, * vidListItem;
+ unsigned int dataId, rptid, vid;
+ if (!pBody->getSubItemU4(0, dataId)) goto MYREPLY;
+ rptListItem = pBody->getSubItem(1);
+ if (rptListItem == nullptr) goto MYREPLY;
+ if (rptListItem->getSubItemSize() == 0) {
+ deleteAllReport();
+ goto MYREPLY;
+ }
+ for (int i = 0; i < rptListItem->getSubItemSize(); i++) {
+ defineItem = rptListItem->getSubItem(i);
+ if (defineItem == nullptr) continue;
+ vidListItem = defineItem->getSubItem(1);
+ if (defineItem->getSubItemU4(0, rptid)
+ && vidListItem != nullptr) {
+ int vidCount = vidListItem->getSubItemSize();
+ if (vidCount == 0) {
+ deleteReport(rptid);
+ }
+ else {
+ for (int k = 0; k < vidCount; k++) {
+ if (vidListItem->getSubItemU4(k, vid)) {
+ defineReport(vid, rptid);
+ }
+ }
+ }
+ }
+ }
+
+
+MYREPLY:
+ // 检验结果是否正确
+ for (auto item : m_mapValueIdToPRTID) {
+ LOGE("=== vid:%d, prtid:%d", item.first, item.second);
+ }
+
+ replyAck(2, 34, pRecv->getHeader()->systemBytes, BYTE(0), "DRACK");
+ return 0;
+}
+
// S2F35
int CHsmsPassive::replyLinkEventReport(IMessage* pRecv)
{
@@ -605,7 +686,6 @@
}
- BOOL bCheckData = FALSE;
ISECS2Item* pBody = pRecv->getBody();
ISECS2Item* linkItem, *ceidListItem, *rptListItem;
unsigned int dataId, ceid, rptid;
@@ -874,4 +954,36 @@
return ER_NOERROR;
}
+// S6F11
+int CHsmsPassive::requestEventReportSend(unsigned int DATAID, unsigned int RPTID, const std::vector<std::string>& values)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+ Lock();
+ CHsmsAction* pAction = new CHsmsAction(ACTION_EVENT_REPORT, TRUE, m_nActionTimeout);
+ m_listAction.push_back(pAction);
+ IMessage* pMessage = NULL;
+ HSMS_Create1Message(pMessage, m_nSessionId, 6 | REPLY, 11, ++m_nSystemByte);
+ ASSERT(pMessage);
+ ISECS2Item* pItem = pMessage->getBody();
+ pItem->addU4Item(DATAID, "DATAID");
+ pItem->addU4Item(getCEID(RPTID), "CEID");
+ ISECS2Item* pItemList1 = pItem->addItem();
+ ISECS2Item* pItemList2 = pItemList1->addItem();
+ pItemList2->addU4Item(RPTID, "RPTID");
+ ISECS2Item* pItemList3 = pItemList2->addItem();
+ for (auto item : values) {
+ pItemList3->addItem(item.c_str(), "V");
+ }
+ pAction->setSendMessage(pMessage);
+
+ SetEvent(m_hCimWorkEvent);
+ Unlock();
+
+ return ER_NOERROR;
+}
+
+
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 670befa..44ce52c 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -11,6 +11,7 @@
#define COMMAND_NAME_MAX 64
#define COMMAND_VALUE_MAX 64
#define REPORT_NAME_MAX 64
+#define VALUE_NAME_MAX 64
#define ER_NOERROR 0
@@ -45,6 +46,15 @@
char szName[REPORT_NAME_MAX];
unsigned int id;
} REPORT;
+
+/*
+ * Value 数据结构
+ */
+typedef struct _VALUE
+{
+ char szName[VALUE_NAME_MAX];
+ unsigned int id;
+} VALUE;
typedef std::function<void(void* pFrom)> SECSEQOFFLINE;
@@ -83,6 +93,17 @@
// 取消连接report
void unlinkEventReport(unsigned int CEID);
+ unsigned int getCEID(int RPTID);
+
+ // define Report
+ void defineReport(unsigned int VID, unsigned int RPTID);
+
+ // 取消 define report
+ void deleteReport(unsigned int RPTID);
+
+ // 取消/删除所有 define report
+ void deleteAllReport();
+
void setListener(SECSListener listener);
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
@@ -94,6 +115,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);
@@ -106,6 +128,7 @@
int replyEquipmentConstantRequest(IMessage* pRecv);
int replyEquipmentConstantSend(IMessage* pRecv);
int replyDatetime(IMessage* pRecv);
+ int replyDefineReport(IMessage* pRecv);
int replyLinkEventReport(IMessage* pRecv);
int replyEanbleDisableEventReport(IMessage* pRecv);
int replyCommand(IMessage* pRecv);
@@ -144,5 +167,11 @@
// RPTID to Report
std::map<unsigned int, REPORT> m_mapReport;
+
+ // VID to RPTID
+ std::map<unsigned int, unsigned int> m_mapValueIdToPRTID;
+
+ // VID to Report
+ std::map<unsigned int, VALUE> m_mapValue;
};
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 0b50b45..f8bfb36 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -685,6 +685,14 @@
UpdateLogBtn();
LOGE("OnLogDlgHide");
+ unsigned int DATAID, RPTID;
+ DATAID = 111;
+ RPTID = 1001;
+ std::vector<std::string> v;
+ v.push_back("abc");
+ v.push_back("def");
+ theApp.m_model.m_hsmsPassive.requestEventReportSend(DATAID, RPTID, v);
+
return 0;
}
--
Gitblit v1.9.3