From eb929a42138e7fb38b21aa7659f2aa2718917fab Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 19 二月 2025 15:55:36 +0800
Subject: [PATCH] 1.在测试机器上界面显示不完成，调整界面；
---
SourceCode/Bond/Servo/CEquipment.cpp | 142 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 132 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index b18b34b..2a592fa 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -10,11 +10,21 @@
m_listener = { nullptr, nullptr };
m_alive = {FALSE, 0, FALSE};
m_bCimState = FALSE;
+ m_bUpstreamInline = FALSE;
+ m_bDownstreamInline = FALSE;
+ m_bLocalAlarm = FALSE;
+ m_bAutoRecipeChange = FALSE;
+ m_bVCREnable[0] = FALSE;
InitializeCriticalSection(&m_criticalSection);
}
CEquipment::~CEquipment()
{
+ for (auto item : m_mapStep) {
+ delete item.second;
+ }
+ m_mapStep.clear();
+
DeleteCriticalSection(&m_criticalSection);
}
@@ -33,14 +43,37 @@
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;
+ m_mapStep[addr] = pStep;
+ return 0;
+ }
+
void CEquipment::init()
{
-
+ CStep* pStep = new CStep();
+ if (addStep(0x360, pStep) == 0) {
+ pStep->init();
+ }
+ else {
+ delete pStep;
+ }
}
void CEquipment::term()
{
-
+ for (auto item : m_mapStep) {
+ item.second->term();
+ }
}
void CEquipment::setID(int nID)
@@ -143,12 +176,14 @@
// 以下解释和处理数据
+ BOOL bFlag;
+ int index = 0x340;
+
// alive
- /*
- BOOL bAliveFlag = isBitOn(pszData, size, 0x340);
- if (m_alive.flag != bAliveFlag) {
- m_alive.flag = bAliveFlag;
+ bFlag = isBitOn(pszData, size, index);
+ if (!equalBool(m_alive.flag, bFlag)) {
+ m_alive.flag = bFlag;
m_alive.count = 0;
// 状态
@@ -159,15 +194,66 @@
}
}
}
- */
+
// CIM State
- BOOL bCimState = isBitOn(pszData, size, 0x341);
- if ((bCimState && !m_bCimState) || (!bCimState && m_bCimState)) {
- m_bCimState = bCimState;
+ 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;
+ }
+
+
+ // 以下根据信号做流程处理
+
+ // 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;
+ CStep* pStep = getStep(0x360);
+ if (pStep != nullptr) {
+ pStep->onSignal(bFlag);
+ }
+
+
+
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -179,8 +265,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