From e48a55eb3cc807fa5a45cf398b6f523e96aa5312 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 15 七月 2025 15:10:31 +0800
Subject: [PATCH] 1.Variable列表显示到界面； 2.从文件中加载CReport列表；
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 474 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 402 insertions(+), 72 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 39f7e68..19b97dc 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
#include "HsmsPassive.h"
#include "Log.h"
#include "Model.h"
@@ -8,7 +8,12 @@
#include <time.h>
#include <stdlib.h>
#include <string.h>
+#include <regex>
+
+const char ACK[2] = {0, 1};
+const char* ACK0 = &ACK[0];
+const char* ACK1 = &ACK[1];
unsigned __stdcall CimWorkThreadFunction(LPVOID lpParam)
{
@@ -68,11 +73,7 @@
void CHsmsPassive::setListener(SECSListener listener)
{
- m_listener.onEQOffLine = listener.onEQOffLine;
- m_listener.onEQOnLine = listener.onEQOnLine;
- m_listener.onCommand = listener.onCommand;
- m_listener.onEQConstantRequest = listener.onEQConstantRequest;
- m_listener.onEQConstantSend = listener.onEQConstantSend;
+ m_listener = listener;
}
void CHsmsPassive::setActionTimeout(int nSecond)
@@ -97,13 +98,70 @@
}
+void CHsmsPassive::addReport(unsigned int id, const char* pszName)
+{
+ Lock();
+ REPORT report;
+ report.id = id;
+ strcpy_s(report.szName, REPORT_NAME_MAX, pszName);
+ m_mapReport[id] = report;
+ Unlock();
+}
+
+void CHsmsPassive::linkEventReport(unsigned int RPTID, unsigned int CEID)
+{
+ m_mapReportIdToCEID[RPTID] = CEID;
+}
+
+void CHsmsPassive::unlinkEventReport(unsigned int CEID)
+{
+ for (auto it = m_mapReportIdToCEID.begin(); it != m_mapReportIdToCEID.end(); ) {
+ if (it->second == CEID) {
+ m_mapReportIdToCEID.erase(it++); // 鏇存柊杩唬鍣�
+ }
+ else {
+ ++it;
+ }
+ }
+
+}
+
+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
+ // 鎵�鏈夊凡鍙戦�佺殑Action鑷姞1
Lock();
for (auto iter = m_listActionSent.begin(); iter != m_listActionSent.end();) {
if ((*iter)->incrementAndCheckTimeout()) {
- TRACE("CHsmsPassive::超时\n");
+ TRACE("CHsmsPassive::瓒呮椂\n");
delete (*iter);
m_listActionSent.erase(iter++);
}
@@ -121,7 +179,7 @@
CHsmsAction* pAction = nullptr;
for (auto iter = m_listActionSent.begin(); iter != m_listActionSent.end(); iter++) {
if ((*iter)->getSendMessage()->getHeader()->systemBytes == pMessage->getHeader()->systemBytes) {
- LOGI("CHsmsPassive::找到");
+ LOGI("CHsmsPassive::鎵惧埌");
pAction = (*iter);
m_listActionSent.erase(iter);
break;
@@ -130,12 +188,171 @@
Unlock();
if (pAction != nullptr) {
- LOGI("onRecvMsg::相应处理");
+ LOGI("onRecvMsg::鐩稿簲澶勭悊");
delete pAction;
}
return 0;
+}
+
+int CHsmsPassive::loadVarialbles(const char* pszFilepath)
+{
+ CStdioFile file;
+ if (!file.Open(pszFilepath, CFile::modeRead)) {
+ return -1;
+ }
+
+ std::regex pattern("^\\d+,.*"); // 鍖归厤浠ユ暟瀛�+閫楀彿寮�澶寸殑瀛楃涓�
+ std::vector<SERVO::CVariable*> variables;
+ int index, last;
+ CString strLine;
+ CString strId, strName, strFormat, strRemark;
+ while (file.ReadString(strLine)) {
+ if (!std::regex_match((LPTSTR)(LPCTSTR)strLine, pattern)) {
+ continue;
+ }
+
+ last = 0;
+ index = strLine.Find(",", last);
+ if (index < 0) continue;
+ strId = strLine.Left(index);
+ last = index + 1;
+
+ index = strLine.Find(",", last);
+ if (index < 0) continue;
+ strName = strLine.Mid(last, index - last);
+ last = index + 1;
+
+ index = strLine.Find(",", last);
+ if (index < 0) continue;
+ strFormat = strLine.Mid(last, index - last);
+ strRemark = strLine.Right(strLine.GetLength() - index - 1);
+ strRemark.Replace(_T("\\r\\n"), _T("\r\n"));
+
+ SERVO::CVariable* pVarialble = new SERVO::CVariable(
+ (LPTSTR)(LPCTSTR)strId, (LPTSTR)(LPCTSTR)strName, (LPTSTR)(LPCTSTR)strFormat, (LPTSTR)(LPCTSTR)strRemark);
+ variables.push_back(pVarialble);
+ }
+
+ if (!variables.empty()) {
+ clearAllVariabel();
+ for (auto item : variables) {
+ m_variabels.push_back(item);
+ }
+ }
+
+
+ file.Close();
+ return 0;
+}
+
+std::vector<SERVO::CVariable*>& CHsmsPassive::getVariables()
+{
+ return m_variabels;
+}
+
+SERVO::CVariable* CHsmsPassive::getVariable(int variableId)
+{
+ for (auto item : m_variabels) {
+ if (item->getVarialbleId() == variableId) {
+ return item;
+ }
+ }
+
+ return nullptr;
+}
+
+void CHsmsPassive::clearAllVariabel()
+{
+ for (auto item : m_variabels) {
+ delete item;
+ }
+ m_variabels.clear();
+}
+
+int CHsmsPassive::loadReports(const char* pszFilepath)
+{
+ CStdioFile file;
+ if (!file.Open(pszFilepath, CFile::modeRead)) {
+ return -1;
+ }
+
+ std::regex pattern("^\\d+,\\(\\d+(,\\d+)*\\).*"); // 鍖归厤浠ユ暟瀛�+閫楀彿寮�澶寸殑瀛楃涓�
+ std::vector<SERVO::CReport*> reports;
+ int index;
+ CString strLine, strVariable;
+ CString strId, strName, strFormat, strRemark;
+ while (file.ReadString(strLine)) {
+ if (!std::regex_match((LPTSTR)(LPCTSTR)strLine, pattern)) {
+ continue;
+ }
+
+ index = strLine.Find(",", 0);
+ if (index < 0) continue;
+ strId = strLine.Left(index);
+ strVariable = strLine.Right(strLine.GetLength() - index - 1);
+ strVariable.Delete(0);
+ strVariable.Delete(strVariable.GetLength() - 1);
+ auto vids = parseVidList(strVariable);
+
+
+ SERVO::CReport* pReport = new SERVO::CReport(atoi((LPTSTR)(LPCTSTR)strId));
+ for (auto vid : vids) {
+ SERVO::CVariable* pVariable = getVariable(vid);
+ if (pVariable != nullptr) {
+ pReport->addVariable(pVariable);
+ }
+ }
+
+ reports.push_back(pReport);
+ }
+
+ if (!reports.empty()) {
+ clearAllReport();
+ for (auto item : reports) {
+ m_reports.push_back(item);
+ }
+ }
+
+
+ file.Close();
+ return 0;
+}
+
+std::vector<SERVO::CReport*>& CHsmsPassive::getReports()
+{
+ return m_reports;
+}
+
+void CHsmsPassive::clearAllReport()
+{
+ for (auto item : m_reports) {
+ delete item;
+ }
+ m_reports.clear();
+}
+
+std::vector<int> CHsmsPassive::parseVidList(CString& strNums)
+{
+ // 1. 鍏堝幓鎺夊彲鑳藉嚭鐜扮殑绌虹櫧绗︼紙绌烘牸銆佸埗琛ㄧ绛夛級
+ strNums.Trim();
+
+ // 2锔�.
+ std::vector<int> result;
+ int i = 0;
+ CString strVid;
+ while (1) {
+ if (!AfxExtractSubString(strVid, (LPCTSTR)strNums, i, ',')) {
+ break;
+ }
+ if (!strVid.IsEmpty()) // 闃插尽鎬ф鏌�
+ result.push_back(std::stoi((LPTSTR)(LPCTSTR)strVid));
+ i++;
+
+ }
+
+ return result;
}
int CHsmsPassive::init(CModel* pModel, const char* pszName, unsigned int port)
@@ -148,8 +365,8 @@
auto onStatusChanged = [&](void* pFrom, STATE state) -> void {
m_pModel->notifyInt(RX_CODE_PASSIVE_STATUS_CHANGED, (int)state);
- // 连上之后发S1F1
- // 修改为不主动发送，而是响应
+ // 杩炰笂涔嬪悗鍙慡1F1
+ // 淇敼涓轰笉涓诲姩鍙戦�侊紝鑰屾槸鍝嶅簲
/*
if (STATE::SELECTED == state) {
m_bAreYouThereRequest = FALSE;
@@ -188,7 +405,7 @@
HEADER* pHeader = pMessage->getHeader();
int nStream = (pHeader->stream & 0x7F);
- LOGI("<HSMS>收到消息 S%dF%d", nStream, pHeader->function);
+ LOGI("<HSMS>鏀跺埌娑堟伅 S%dF%d", nStream, pHeader->function);
if (nStream == 1 && pHeader->function == 1) {
// S1F1
replyAreYouThere(pMessage);
@@ -210,6 +427,12 @@
}
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);
}
else if (nStream == 2 && pHeader->function == 37) {
replyEanbleDisableEventReport(pMessage);
@@ -236,7 +459,7 @@
listener.funError = onError;
m_pPassive->setListener(listener);
- // 启动工作线程
+ // 鍚姩宸ヤ綔绾跨▼
m_bCimWorking = TRUE;
m_hCimWorkThreadHandle = (HANDLE)_beginthreadex(NULL, 0, ::CimWorkThreadFunction, this,
0, &m_nCimWorkThrdaddr);
@@ -249,7 +472,7 @@
int CHsmsPassive::term()
{
- // 结束线程
+ // 缁撴潫绾跨▼
m_bCimWorking = FALSE;
SetEvent(m_hCimWorkEvent);
if (m_hCimWorkThreadHandle != NULL) {
@@ -263,6 +486,8 @@
m_pPassive = NULL;
}
+ clearAllVariabel();
+
return 0;
}
@@ -270,12 +495,12 @@
{
while (m_bCimWorking) {
- // 待退出信号或时间到
+ // 寰呴��鍑轰俊鍙锋垨鏃堕棿鍒�
int nRet = WaitForSingleObject(m_hCimWorkEvent, INFINITE);
ResetEvent(m_hCimWorkEvent);
if (!m_bCimWorking) break;
- // 取出请求列表并进行处理
+ // 鍙栧嚭璇锋眰鍒楄〃骞惰繘琛屽鐞�
std::list<CHsmsAction*> list;
Lock();
list.splice(list.end(), m_listAction);
@@ -294,14 +519,14 @@
LOGI("<HSMS> [SEND] SysByte=%u sessionId:%d", pMessage->getHeader()->systemBytes, pMessage->getHeader()->sessionId);
if (pAction->isNeedWaitReply()) {
- // 如果需要等待回复
+ // 濡傛灉闇�瑕佺瓑寰呭洖澶�
int nRet = WaitForSingleObject(pAction->getEvent(), pAction->getTimeout() * 1000);
if (nRet == WAIT_TIMEOUT) {
TRACE("Timeout...\n");
CContext* pContext = pAction->getContext();
if (pContext != NULL) {
//pContext->setRetCode(CRC_TIMEOUT);
- //pContext->setRetMsg("超时");
+ //pContext->setRetMsg("瓒呮椂");
//pContext->setEvent();
}
}
@@ -327,7 +552,7 @@
return 0;
}
-// 通用的reply ack函数
+// 閫氱敤鐨剅eply ack鍑芥暟
void CHsmsPassive::replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName)
{
IMessage* pMessage = NULL;
@@ -390,13 +615,13 @@
}
- // 交由上层应用来获取机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヨ幏鍙栨満鍣ㄥ父閲忓��
if (m_listener.onEQOffLine != nullptr) {
m_listener.onEQOffLine(this);
}
- // 回复
+ // 鍥炲
replyAck(1, 16, pRecv->getHeader()->systemBytes, BYTE(0), "OFLACK");
return 0;
}
@@ -409,13 +634,13 @@
}
- // 交由上层应用来获取机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヨ幏鍙栨満鍣ㄥ父閲忓��
if (m_listener.onEQOnLine != nullptr) {
m_listener.onEQOnLine(this);
}
- // 回复
+ // 鍥炲
replyAck(1, 18, pRecv->getHeader()->systemBytes, BYTE(0), "ONLACK");
return 0;
}
@@ -431,12 +656,12 @@
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
- pItem->addBinaryItem(BYTE(0), "COMMACK");
+ pItem->addBinaryItem(ACK0, 1, "COMMACK");
ISECS2Item* pList = pItem->addItem();
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;
@@ -450,7 +675,7 @@
}
- // 要获取的常量表表
+ // 瑕佽幏鍙栫殑甯搁噺琛ㄨ〃
BOOL bCheckData = FALSE;
std::vector<EQConstant> eqcs;
{
@@ -467,13 +692,13 @@
}
- // 交由上层应用来获取机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヨ幏鍙栨満鍣ㄥ父閲忓��
if (m_listener.onEQConstantRequest != nullptr) {
m_listener.onEQConstantRequest(this, eqcs);
}
- // 回复
+ // 鍥炲
IMessage* pMessage = NULL;
HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
@@ -497,7 +722,7 @@
}
- // 要设置的常量表表
+ // 瑕佽缃殑甯搁噺琛ㄨ〃
BOOL bCheckData = FALSE;
std::vector<EQConstant> eqcs;
{
@@ -512,7 +737,7 @@
if (pItemEqc->getSubItemU2(0, eqcid)
&& pItemEqc->getSubItemString(1, pszValue)) {
eqc.id = eqcid;
- strcpy_s(eqc.szValue, 256, pszValue);
+ strcpy_s(eqc.szValue, EQCONSTANT_VALUE_MAX, pszValue);
eqcs.push_back(eqc);
}
}
@@ -520,14 +745,14 @@
}
- // 交由上层应用来保存和设置机器常量值
+ // 浜ょ敱涓婂眰搴旂敤鏉ヤ繚瀛樺拰璁剧疆鏈哄櫒甯搁噺鍊�
std::vector<unsigned int> ecvs;
if (m_listener.onEQConstantSend != nullptr) {
m_listener.onEQConstantSend(this, eqcs);
}
- // 回复
+ // 鍥炲
replyAck(2, 16, pRecv->getHeader()->systemBytes, BYTE(0), "EACK");
return 0;
}
@@ -542,7 +767,7 @@
if (pBody == nullptr || pBody->getType() != SITYPE::A) ER_PARAM_ERROR;
const char* pszMessage;
if (pBody->getString(pszMessage)) {
- // 更新时间
+ // 鏇存柊鏃堕棿
SYSTEMTIME time;
char szBuffer[20];
memcpy(szBuffer, pszMessage, 16);
@@ -560,9 +785,106 @@
time.wYear = atoi(&szBuffer[0]);
time.wMilliseconds = 0;
SetLocalTime(&time);
+ if (m_listener.onDatetimeSync != nullptr) {
+ m_listener.onDatetimeSync(this, time);
+ }
}
replyAck(2, 32, pRecv->getHeader()->systemBytes, BYTE(0), "TIACK");
+ 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)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ ISECS2Item* pBody = pRecv->getBody();
+ ISECS2Item* linkItem, *ceidListItem, *rptListItem;
+ unsigned int dataId, ceid, rptid;
+ if (!pBody->getSubItemU4(0, dataId)) goto MYREPLY;
+ ceidListItem = pBody->getSubItem(1);
+ if (ceidListItem == nullptr) goto MYREPLY;
+ for (int i = 0; i < ceidListItem->getSubItemSize(); i++) {
+ linkItem = ceidListItem->getSubItem(i);
+ if (linkItem == nullptr) continue;
+ rptListItem = linkItem->getSubItem(1);
+ if (linkItem->getSubItemU4(0, ceid)
+ && rptListItem != nullptr) {
+ int prtCount = rptListItem->getSubItemSize();
+ if (prtCount == 0) {
+ unlinkEventReport(ceid);
+ }
+ else {
+ for (int k = 0; k < prtCount; k++) {
+ if (rptListItem->getSubItemU4(k, rptid)) {
+ linkEventReport(rptid, ceid);
+ }
+ }
+ }
+ }
+ }
+
+
+ // 妫�楠岀粨鏋滄槸鍚︽纭�
+ for (auto item : m_mapReportIdToCEID) {
+ LOGE("=== prtid:%d, ceid:%d", item.first, item.second);
+ }
+
+MYREPLY:
+ replyAck(2, 36, pRecv->getHeader()->systemBytes, BYTE(0), "LRACK");
return 0;
}
@@ -594,15 +916,15 @@
}
}
bCheckData = TRUE;
- LOGI("EanbleDisableAlarm bEnable:%s", bEnable ? _T("YES") : _T("NO"));
- for (auto item : ids) {
- LOGI("ID:%u", item);
+ if (m_listener.onEnableDisableEventReport != nullptr) {
+ m_listener.onEnableDisableEventReport(this, bEnable, ids);
}
}
MYREPLY:
- replyAck(2, 38, pRecv->getHeader()->systemBytes, BYTE(0), "ERACK");
+ replyAck(2, 38, pRecv->getHeader()->systemBytes,
+ bCheckData ? BYTE(0) : BYTE(1), "ERACK");
return 0;
}
@@ -634,8 +956,8 @@
&& pItemParam->getSubItemString(0, pszParamName)
&& pItemParam->getSubItemString(1, pszParamValue)) {
CommandParameter cp;
- strcpy_s(cp.szName, 256, pszParamName);
- strcpy_s(cp.szValue, 256, pszParamValue);
+ strcpy_s(cp.szName, COMMAND_NAME_MAX, pszParamName);
+ strcpy_s(cp.szValue, COMMAND_VALUE_MAX, pszParamValue);
params.push_back(cp);
}
}
@@ -643,7 +965,7 @@
}
- // 回调到应用层
+ // 鍥炶皟鍒板簲鐢ㄥ眰
if (bCheckData) {
if (m_listener.onCommand != nullptr) {
m_listener.onCommand(this, pszCmdName, params);
@@ -677,36 +999,9 @@
if (!pItem->getSubItemU4(1, ALID)) goto MYREPLY;
bCheckData = TRUE;
LOGI("EanbleDisableAlarmReport ALED:0x%02x, ALID:%d", ALED[0], ALID);
-
- double d;
- float f;
- pItem->getSubItemF4(2, f);
- pItem->getSubItemF8(3, d);
- LOGI("EanbleDisableAlarmReport d:%lf, f:%f",
- d, f);
- /*
- unsigned long long n1;
- unsigned int n2;
- unsigned short n3;
- unsigned char n4;
- long long sn1;
- int sn2;
- short sn3;
- char sn4;
- pItem->getSubItemU8(2, n1);
- pItem->getSubItemU4(3, n2);
- pItem->getSubItemU2(4, n3);
- pItem->getSubItemU1(5, n4);
- pItem->getSubItemI8(6, sn1);
- pItem->getSubItemI4(7, sn2);
- pItem->getSubItemI2(8, sn3);
- pItem->getSubItemI1(9, sn4);
-
- LOGI("EanbleDisableAlarmReport n1:%llu, n2:%u, n3:%hu, n4:%hhu",
- n1, n2, n3, n4);
- LOGI("EanbleDisableAlarmReport sn1:%lld, sn2:%d, sn3:%hd, sn4:%hhd",
- sn1, sn2, sn3, sn4);
- */
+ if (m_listener.onEnableDisableAlarmReport != nullptr) {
+ m_listener.onEnableDisableAlarmReport(this, ALED[0] != 0, ALID);
+ }
}
@@ -779,6 +1074,9 @@
return ER_NOTSELECT;
}
+ char szALCD[1];
+ szALCD[0] = ALCD & 0xff;
+
Lock();
CHsmsAction* pAction = new CHsmsAction(ACTION_ALARM_REPORT, TRUE, m_nActionTimeout);
m_listAction.push_back(pAction);
@@ -786,7 +1084,7 @@
HSMS_Create1Message(pMessage, m_nSessionId, 5 | REPLY, 1, ++m_nSystemByte);
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
- pItem->addBinaryItem(BYTE(ALCD & 0xff), "ALCD");
+ pItem->addBinaryItem(szALCD, 1, "ALCD");
pItem->addU4Item(ALID, "ALID");
pItem->addItem(ALTX, "ALTX");
pAction->setSendMessage(pMessage);
@@ -797,4 +1095,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