From a9e9f76d23ee7206ea0080a8f5a94e312c9d90f1 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 08 七月 2025 19:41:08 +0800
Subject: [PATCH] 1.UI分组启用和禁用，方便增加更多测试功能时代码整洁简单； 2.增加Are You There测试；
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 071ab51..7c53585 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -125,6 +125,13 @@
}
+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(); ) {
@@ -492,7 +499,7 @@
pList->addItem(m_strEquipmentModelType.c_str(), "MDLN");
pList->addItem(m_strSoftRev.c_str(), "SOFTREV");
m_pPassive->sendMessage(pMessage);
- LOGI("<HSMS>[SECS Msg SEND]S1F14 (SysByte=%u)", pMessage->getHeader()->systemBytes);
+ LOGI("<HSMS>[SECS Msg SEND]%s", pMessage->toString());
HSMS_Destroy1Message(pMessage);
return 0;
@@ -947,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;
+}
+
+
--
Gitblit v1.9.3