From 97e9c6896ffaedcc2c00fb4ea1bee6a5cdbc4a5d Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期五, 21 二月 2025 15:55:55 +0800
Subject: [PATCH] 1. 报警记录界面加载数据库的数据，并且实现过滤查找
---
SourceCode/Bond/Servo/CEquipment.cpp | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 33156a2..fcc8002 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -15,6 +15,7 @@
m_bLocalAlarm = FALSE;
m_bAutoRecipeChange = FALSE;
m_bVCREnable[0] = FALSE;
+ m_pCclink = nullptr;
InitializeCriticalSection(&m_criticalSection);
}
@@ -34,6 +35,20 @@
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);
@@ -45,6 +60,7 @@
{
auto iter = m_mapStep.find(addr);
if (iter != m_mapStep.end()) return -1;
+ pStep->setCcLink(m_pCclink);
m_mapStep[addr] = pStep;
return 0;
}
@@ -110,7 +126,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;
@@ -159,12 +175,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;
@@ -230,21 +247,11 @@
// Equipment Mode Change Report
index = 0x360;
- bFlag = isBitOn(pszData, size, ++index);
- static int i;
- i++;
- if (i > 10) bFlag = TRUE;
- if (i > 15) bFlag = FALSE;
- if (i > 110) bFlag = TRUE;
- if (i > 115) bFlag = FALSE;
- //if (i == 12) bFlag = FALSE;
+ 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