From 2d7e131c2e7f547df8d5e0d56fcea85cd49c712e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 21 二月 2025 14:17:15 +0800
Subject: [PATCH] 1.增加Equipment Status（机器和机器单元状态）获取；
---
SourceCode/Bond/Servo/CEquipment.cpp | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index fcc8002..d3bc8da 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -67,12 +67,8 @@
void CEquipment::init()
{
- CStep* pStep = new CStep();
- if (addStep(0x360, pStep) == 0) {
- pStep->init();
- }
- else {
- delete pStep;
+ for (auto item : m_mapStep) {
+ item.second->init();
}
}
@@ -244,11 +240,20 @@
// 以下根据信号做流程处理
+ CStep* pStep;
// Equipment Mode Change Report
index = 0x360;
bFlag = isBitOn(pszData, size, index);
- CStep* pStep = getStep(0x360);
+ pStep = getStep(index);
+ if (pStep != nullptr) {
+ pStep->onSignal(bFlag);
+ }
+
+ // Equipment Status Change Report
+ index = 0x361;
+ bFlag = isBitOn(pszData, size, index);
+ pStep = getStep(index);
if (pStep != nullptr) {
pStep->onSignal(bFlag);
}
--
Gitblit v1.9.3