From 956cb65690500f099be756accc346f3c8d56be99 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 20 一月 2025 16:50:54 +0800
Subject: [PATCH] 1.SECS，实现S2F15（Equipment Constant Send）的回复，目前仅打印显示数据，待机器端确认相关逻辑后再保存和设置机器数据。 2.修改和完善S2F13，与S2F15靠拢，并使用相同的数据结构和回调函数到应用层；
---
SourceCode/Bond/Servo/HsmsPassive.cpp | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 4bf20df..38ceda5 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -65,6 +65,7 @@
void CHsmsPassive::setListener(SECSListener listener)
{
m_listener.onEQConstantRequest = listener.onEQConstantRequest;
+ m_listener.onEQConstantSend = listener.onEQConstantSend;
}
void CHsmsPassive::setActionTimeout(int nSecond)
@@ -189,7 +190,10 @@
replyEstablishCommunications(pMessage);
}
else if (nStream == 2 && pHeader->function == 13) {
- replyEquipmentConstant(pMessage);
+ replyEquipmentConstantRequest(pMessage);
+ }
+ else if (nStream == 2 && pHeader->function == 15) {
+ replyEquipmentConstantSend(pMessage);
}
else if (nStream == 2 && pHeader->function == 31) {
replyDatetime(pMessage);
@@ -386,7 +390,7 @@
}
// S2F13
-int CHsmsPassive::replyEquipmentConstant(IMessage* pRecv)
+int CHsmsPassive::replyEquipmentConstantRequest(IMessage* pRecv)
{
if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
return ER_NOTSELECT;
@@ -395,23 +399,24 @@
// 要获取的常量表表
BOOL bCheckData = FALSE;
- std::vector<unsigned int> ecids;
+ std::vector<EQConstant> eqcs;
{
ISECS2Item* pItem = pRecv->getBody();
int ecidSize = pItem->getSubItemSize();
for (int i = 0; i < ecidSize; i++) {
+ EQConstant eqc;
unsigned short id;
if (pItem->getSubItemU2(i, id)) {
- ecids.push_back((int)id);
+ eqc.id = id;
+ eqcs.push_back(eqc);
}
}
}
// 交由上层应用来获取机器常量值
- std::vector<unsigned int> ecvs;
if (m_listener.onEQConstantRequest != nullptr) {
- m_listener.onEQConstantRequest(this, ecids, ecvs);
+ m_listener.onEQConstantRequest(this, eqcs);
}
@@ -420,8 +425,8 @@
HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, pRecv->getHeader()->systemBytes);
ASSERT(pMessage);
ISECS2Item* pItem = pMessage->getBody();
- for (auto item : ecvs) {
- pItem->addU2Item(item, "ECV");
+ for (auto& item : eqcs) {
+ pItem->addItem(item.szValue, "ECV");
}
m_pPassive->sendMessage(pMessage);
@@ -431,6 +436,49 @@
return 0;
}
+// S2F15
+int CHsmsPassive::replyEquipmentConstantSend(IMessage* pRecv)
+{
+ if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+ return ER_NOTSELECT;
+ }
+
+
+ // 要设置的常量表表
+ BOOL bCheckData = FALSE;
+ std::vector<EQConstant> eqcs;
+ {
+ ISECS2Item* pItem = pRecv->getBody();
+ int ecidSize = pItem->getSubItemSize();
+ for (int i = 0; i < ecidSize; i++) {
+ ISECS2Item* pItemEqc = pItem->getSubItem(i);
+ if (pItemEqc != nullptr) {
+ EQConstant eqc;
+ unsigned short eqcid;
+ const char* pszValue;
+ if (pItemEqc->getSubItemU2(0, eqcid)
+ && pItemEqc->getSubItemString(1, pszValue)) {
+ eqc.id = eqcid;
+ strcpy_s(eqc.szValue, 256, pszValue);
+ eqcs.push_back(eqc);
+ }
+ }
+ }
+ }
+
+
+ // 交由上层应用来保存和设置机器常量值
+ 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;
+}
+
// S2F31
int CHsmsPassive::replyDatetime(IMessage* pRecv)
{
--
Gitblit v1.9.3