From e7a450d2fdc99bd501e1af7dd7c16c477cfea75e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 15 三月 2025 11:56:44 +0800
Subject: [PATCH] 1.CimMessageClear(清除Cim消息)测试通过； 2.增加VCREanbleStep(启用/禁用)VCR;
---
SourceCode/Bond/Servo/CEquipment.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index afd0c0e..7ef517b 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -72,6 +72,17 @@
return iter->second;
}
+ CStep* CEquipment::getStepWithName(const char* pszName)
+ {
+ for (auto item : m_mapStep) {
+ if (item.second->getName().compare(pszName) == 0) {
+ return item.second;
+ }
+ }
+
+ return nullptr;
+ }
+
int CEquipment::addStep(unsigned int addr, CStep* pStep)
{
auto iter = m_mapStep.find(addr);
@@ -135,6 +146,39 @@
const StationIdentifier& CEquipment::getStation()
{
return m_station;
+ }
+
+ void CEquipment::getAttributeVector(CAttributeVector& attrubutes)
+ {
+ attrubutes.clear();
+ attrubutes.addAttribute(new CAttribute("Network",
+ std::to_string(m_station.nNetNo).c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Station",
+ std::to_string(m_station.nStNo).c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("ID",
+ std::to_string(m_nID).c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Name",
+ m_strName.c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Description",
+ m_strDescription.c_str(), ""));
+ attrubutes.addAttribute(new CAttribute("Alive",
+ this->isAlive() ? _T("TRUE") : _T("FALSE"), ""));
+ attrubutes.addAttribute(new CAttribute("CIM State",
+ m_bCimState ? _T("ON") : _T("OFF"), ""));
+ attrubutes.addAttribute(new CAttribute("Upstream",
+ m_bUpstreamInline ? _T("Inline") : _T("Offline"), ""));
+ attrubutes.addAttribute(new CAttribute("Downstream",
+ m_bDownstreamInline ? _T("Inline") : _T("Offline"), ""));
+ attrubutes.addAttribute(new CAttribute("Local Alarm",
+ m_bLocalAlarm ? _T("TRUE") : _T("FALSE"), ""));
+ attrubutes.addAttribute(new CAttribute("Auto Recipe Change",
+ m_bAutoRecipeChange ? _T("TRUE") : _T("FALSE"), ""));
+ char szTemp[256];
+ for (int i = 0; i < VCR_MAX; i++) {
+ sprintf_s(szTemp, 256, "VCR-%d", i + 1);
+ attrubutes.addAttribute(new CAttribute(szTemp,
+ m_bVCREnable[i] ? _T("Enable") : _T("Disable"), ""));
+ }
}
void CEquipment::setReadBitBlock(unsigned int start, unsigned int end)
@@ -267,9 +311,16 @@
bFlag = isBitOn(pszData, size, index);
pStep = getStep(index);
if (pStep != nullptr) {
- pStep->onSignal(bFlag);
+ ((CReadStep*)pStep)->onReadSignal(bFlag);
}
}
+
+ index = 0x350;
+ bFlag = isBitOn(pszData, size, index);
+ pStep = getStep(index);
+ if (pStep != nullptr) {
+ ((CWriteStep*)pStep)->onRecvSignal(bFlag);
+ }
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
--
Gitblit v1.9.3