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 | 82 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index d3bc8da..7ef517b 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -16,6 +16,7 @@
m_bAutoRecipeChange = FALSE;
m_bVCREnable[0] = FALSE;
m_pCclink = nullptr;
+ m_nBaseAlarmId = 0;
InitializeCriticalSection(&m_criticalSection);
}
@@ -40,6 +41,16 @@
m_pCclink = pCcLink;
}
+ void CEquipment::setBaseAlarmId(int nBaseId)
+ {
+ m_nBaseAlarmId = nBaseId;
+ }
+
+ int CEquipment::getBaseAlarmId()
+ {
+ return m_nBaseAlarmId;
+ }
+
void CEquipment::getProperties(std::vector<std::pair<std::string, std::string>>& container)
{
container.clear();
@@ -49,6 +60,11 @@
container.push_back(std::make_pair("Version", "1.0"));
}
+ std::map<unsigned int, CStep*>& CEquipment::getSteps()
+ {
+ return m_mapStep;
+ }
+
CStep* CEquipment::getStep(unsigned int addr)
{
auto iter = m_mapStep.find(addr);
@@ -56,10 +72,22 @@
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);
if (iter != m_mapStep.end()) return -1;
+ pStep->setEquipment(this);
pStep->setCcLink(m_pCclink);
m_mapStep[addr] = pStep;
return 0;
@@ -118,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)
@@ -242,20 +303,23 @@
// 以下根据信号做流程处理
CStep* pStep;
- // Equipment Mode Change Report
- index = 0x360;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- pStep->onSignal(bFlag);
+ // Equipment Mode Change Report(0x360)
+ // Equipment Status Change Report(0x361)
+ // Equipment Alarm Change Report(0x362 ~ 0x366)
+ for (int i = 0; i < 7; i++) {
+ index = 0x360 + i;;
+ bFlag = isBitOn(pszData, size, index);
+ pStep = getStep(index);
+ if (pStep != nullptr) {
+ ((CReadStep*)pStep)->onReadSignal(bFlag);
+ }
}
- // Equipment Status Change Report
- index = 0x361;
+ index = 0x350;
bFlag = isBitOn(pszData, size, index);
pStep = getStep(index);
if (pStep != nullptr) {
- pStep->onSignal(bFlag);
+ ((CWriteStep*)pStep)->onRecvSignal(bFlag);
}
}
--
Gitblit v1.9.3