From f2ec2ff2640e8f02507e6fa44cd1ba1487a303ea Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 21 二月 2025 09:15:43 +0800
Subject: [PATCH] 1.定义派生于CStep的类CEqModeStep，用于处理设备模式改变的事件。
---
SourceCode/Bond/Servo/CEquipment.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 5fe849f..b435ca9 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -15,11 +15,17 @@
m_bLocalAlarm = FALSE;
m_bAutoRecipeChange = FALSE;
m_bVCREnable[0] = FALSE;
+ m_pCclink = nullptr;
InitializeCriticalSection(&m_criticalSection);
}
CEquipment::~CEquipment()
{
+ for (auto item : m_mapStep) {
+ delete item.second;
+ }
+ m_mapStep.clear();
+
DeleteCriticalSection(&m_criticalSection);
}
@@ -29,14 +35,48 @@
m_listener.onCimStateChanged = listener.onCimStateChanged;
}
+ void CEquipment::setCcLink(CCCLinkIEControl* pCcLink)
+ {
+ m_pCclink = pCcLink;
+ }
+
+ void CEquipment::getProperties(std::vector<std::pair<std::string, std::string>>& container)
+ {
+ container.clear();
+ // 示例：将一些属性添加到容器
+ container.push_back(std::make_pair("DeviceName", "ServoMotor"));
+ container.push_back(std::make_pair("SerialNumber", "123456789"));
+ container.push_back(std::make_pair("Version", "1.0"));
+ }
+
+ CStep* CEquipment::getStep(unsigned int addr)
+ {
+ auto iter = m_mapStep.find(addr);
+ if (iter == m_mapStep.end()) return nullptr;
+ return iter->second;
+ }
+
+ int CEquipment::addStep(unsigned int addr, CStep* pStep)
+ {
+ auto iter = m_mapStep.find(addr);
+ if (iter != m_mapStep.end()) return -1;
+ pStep->setCcLink(m_pCclink);
+ m_mapStep[addr] = pStep;
+ return 0;
+ }
+
void CEquipment::init()
{
-
+ for (auto item : m_mapStep) {
+ item.second->init();
+ }
}
void CEquipment::term()
{
-
+ for (auto item : m_mapStep) {
+ item.second->term();
+ }
}
void CEquipment::setID(int nID)
@@ -82,7 +122,7 @@
void CEquipment::setReadBitBlock(unsigned int start, unsigned int end)
{
- m_blockReadBit.type = (unsigned int)DeviceType::LB;;
+ m_blockReadBit.type = (unsigned int)DeviceType::B;
m_blockReadBit.start = start;
m_blockReadBit.end = end;
m_blockReadBit.size = (m_blockReadBit.end - m_blockReadBit.start + 1) / 8;
@@ -131,12 +171,13 @@
void CEquipment::onReceiveLBData(const char* pszData, size_t size)
{
+ /*
TRACE("%s onReceiveLBData: %d bytes\n", m_strName.c_str(), size);
for (unsigned int i = 0; i < size; i++) {
if (pszData[i] != 0)
TRACE("%d[%x]\n", i, pszData[i]);
}
-
+ */
// 以下解释和处理数据
BOOL bFlag;
@@ -196,6 +237,17 @@
if (!equalBool(m_bVCREnable[0], bFlag)) {
m_bVCREnable[0] = bFlag;
}
+
+
+ // 以下根据信号做流程处理
+
+ // Equipment Mode Change Report
+ index = 0x360;
+ bFlag = isBitOn(pszData, size, index);
+ CStep* pStep = getStep(0x360);
+ if (pStep != nullptr) {
+ pStep->onSignal(bFlag);
+ }
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
--
Gitblit v1.9.3