From 3a0ee214cfefcd1823b48ffe800b1932187eed0b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 18 二月 2025 17:49:30 +0800
Subject: [PATCH] 1.增加Upstream Inline Mode Downstream Inline Mode Local Alarm State Auto Recipe Change Mode VCR#1 Enable Mode 数据的解释,访问函数接口;
---
SourceCode/Bond/Servo/CEquipment.cpp | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 103 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 6534f88..5fe849f 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -5,10 +5,16 @@
namespace SERVO {
- CEquipment::CEquipment()
+ CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
+ m_listener = { nullptr, nullptr };
m_alive = {FALSE, 0, FALSE};
- m_listener.onAlive = {nullptr};
+ m_bCimState = FALSE;
+ m_bUpstreamInline = FALSE;
+ m_bDownstreamInline = FALSE;
+ m_bLocalAlarm = FALSE;
+ m_bAutoRecipeChange = FALSE;
+ m_bVCREnable[0] = FALSE;
InitializeCriticalSection(&m_criticalSection);
}
@@ -20,6 +26,7 @@
void CEquipment::setListener(EquipmentListener listener)
{
m_listener.onAlive = listener.onAlive;
+ m_listener.onCimStateChanged = listener.onCimStateChanged;
}
void CEquipment::init()
@@ -30,6 +37,16 @@
void CEquipment::term()
{
+ }
+
+ void CEquipment::setID(int nID)
+ {
+ m_nID = nID;
+ }
+
+ int CEquipment::getID()
+ {
+ return m_nID;
}
void CEquipment::setName(const char* pszName)
@@ -121,10 +138,15 @@
}
- // 解释数据
- BOOL bAliveFlag = isBitOn(pszData, size, 0x340);
- if (m_alive.flag != bAliveFlag) {
- m_alive.flag = bAliveFlag;
+ // 以下解释和处理数据
+ BOOL bFlag;
+ int index = 0x340;
+
+
+ // alive
+ bFlag = isBitOn(pszData, size, index);
+ if (!equalBool(m_alive.flag, bFlag)) {
+ m_alive.flag = bFlag;
m_alive.count = 0;
// 状态
@@ -134,6 +156,45 @@
m_listener.onAlive(this, m_alive.alive);
}
}
+ }
+
+ // CIM State
+ bFlag = isBitOn(pszData, size, ++index);
+ if (!equalBool(m_bCimState, bFlag)) {
+ m_bCimState = bFlag;
+ if (m_listener.onCimStateChanged != nullptr) {
+ m_listener.onCimStateChanged(this, m_bCimState);
+ }
+ }
+
+ // UpstreamInline
+ bFlag = isBitOn(pszData, size, ++index);
+ if (!equalBool(m_bUpstreamInline, bFlag)) {
+ m_bUpstreamInline = bFlag;
+ }
+
+ // DownstreamInline
+ bFlag = isBitOn(pszData, size, ++index);
+ if (!equalBool(m_bDownstreamInline, bFlag)) {
+ m_bDownstreamInline = bFlag;
+ }
+
+ // LocalAlarm
+ bFlag = isBitOn(pszData, size, ++index);
+ if (!equalBool(m_bLocalAlarm, bFlag)) {
+ m_bLocalAlarm = bFlag;
+ }
+
+ // AutoRecipeChange
+ bFlag = isBitOn(pszData, size, ++index);
+ if (!equalBool(m_bAutoRecipeChange, bFlag)) {
+ m_bAutoRecipeChange = bFlag;
+ }
+
+ // AutoRecipeChange
+ bFlag = isBitOn(pszData, size, ++index);
+ if (!equalBool(m_bVCREnable[0], bFlag)) {
+ m_bVCREnable[0] = bFlag;
}
}
@@ -146,8 +207,44 @@
return CToolUnits::getBit(pszData[byteIndex], bitIndex);
}
+ BOOL CEquipment::equalBool(BOOL b1, BOOL b2)
+ {
+ return (b1 && b2) || (!b1 && !b2);
+ }
+
BOOL CEquipment::isAlive()
{
return m_alive.alive;
}
+
+ BOOL CEquipment::isCimOn()
+ {
+ return m_bCimState;
+ }
+
+ BOOL CEquipment::isUpstreamInline()
+ {
+ return m_bUpstreamInline;
+ }
+
+ BOOL CEquipment::isDownstreamInline()
+ {
+ return m_bDownstreamInline;
+ }
+
+ BOOL CEquipment::isLocalAlarm()
+ {
+ return m_bLocalAlarm;
+ }
+
+ BOOL CEquipment::isAutoRecipeChange()
+ {
+ return m_bAutoRecipeChange;
+ }
+
+ BOOL CEquipment::isVCREnable(unsigned int index)
+ {
+ if (index >= VCR_MAX) return FALSE;
+ return m_bVCREnable[index];
+ }
}
--
Gitblit v1.9.3