From d06ab39efafbcb2a7b1ec4cb83e18fa3485789a9 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 29 三月 2025 08:55:56 +0800
Subject: [PATCH] 1.修改两个函数名称；
---
SourceCode/Bond/Servo/CEquipment.cpp | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 393191b..ffc0c87 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -7,7 +7,7 @@
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
- m_listener = { nullptr, nullptr };
+ m_listener = { nullptr, nullptr, nullptr };
m_alive = {FALSE, 0, FALSE};
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
@@ -49,6 +49,7 @@
{
m_listener.onAlive = listener.onAlive;
m_listener.onCimStateChanged = listener.onCimStateChanged;
+ m_listener.onDataChanged = listener.onDataChanged;
}
void CEquipment::setCcLink(CCCLinkIEControl* pCcLink)
@@ -357,20 +358,40 @@
// Equipment Status Change Report(0x361)
// Equipment Alarm Change Report(0x362 ~ 0x366)
for (int i = 0; i < 7; i++) {
- index = 0x360 + i;;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- ((CReadStep*)pStep)->onReadSignal(bFlag);
- }
+ checkReadStepSignal(0x360 + i, pszData, size);
}
- index = 0x350;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- ((CWriteStep*)pStep)->onRecvSignal(bFlag);
- }
+
+ // CIM Mode
+ checkWriteStepSignal(0x350, pszData, size);
+
+
+ // Port1 ~ Port4
+ checkReadStepSignal(0x3e0, pszData, size);
+ checkReadStepSignal(0x3e1, pszData, size);
+ checkReadStepSignal(0x3e2, pszData, size);
+ checkReadStepSignal(0x3e3, pszData, size);
+ checkReadStepSignal(0x3e8, pszData, size);
+ checkReadStepSignal(0x3e9, pszData, size);
+ checkReadStepSignal(0x3ea, pszData, size);
+ checkReadStepSignal(0x3eb, pszData, size);
+ checkReadStepSignal(0x3f0, pszData, size);
+ checkReadStepSignal(0x3f1, pszData, size);
+ checkReadStepSignal(0x3f2, pszData, size);
+ checkReadStepSignal(0x3f3, pszData, size);
+ checkReadStepSignal(0x3f8, pszData, size);
+ checkReadStepSignal(0x3f9, pszData, size);
+ checkReadStepSignal(0x3fa, pszData, size);
+ checkReadStepSignal(0x3fb, pszData, size);
+ checkReadStepSignal(0x400, pszData, size);
+ checkReadStepSignal(0x401, pszData, size);
+ checkReadStepSignal(0x402, pszData, size);
+ checkReadStepSignal(0x403, pszData, size);
+ checkReadStepSignal(0x408, pszData, size);
+ checkReadStepSignal(0x409, pszData, size);
+ checkReadStepSignal(0x40a, pszData, size);
+ checkReadStepSignal(0x40b, pszData, size);
+
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -547,6 +568,7 @@
// 模拟取出第一张Panel,传送到下一环节
+ ULONGLONG time = CToolUnits::getTimestamp();
Lock();
if (m_glassList.empty()) {
Unlock();
@@ -561,8 +583,15 @@
LOGE("<CEquipment>对方拒绝接收Intent.");
}
else if (nRet == FLOW_ACCEPT) {
+ CPath* pPath = pContext->getPathWithSiteID(m_nID);
+ if (pPath != nullptr) {
+ pPath->setOutTime(time);
+ }
m_glassList.pop_front();
pContext->release(); // 添加到列队时addRef, 取出时release
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
}
pContext->release();
@@ -579,9 +608,15 @@
int CEquipment::glassArrived(CGlass* pGlass)
{
Lock();
+ pGlass->addPath(m_nID);
pGlass->addRef();
m_glassList.push_back(pGlass);
Unlock();
+
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
+
return FLOW_ACCEPT;
}
@@ -593,5 +628,68 @@
pGlass->addRef();
m_glassList.push_back(pGlass);
Unlock();
+
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
+ }
+
+ BOOL CEquipment::removeClass(CGlass* pGlass)
+ {
+ Lock();
+ bool bExist = std::find(m_glassList.begin(), m_glassList.end(), pGlass) != m_glassList.end();
+ if (bExist) {
+ pGlass->addPath(EQ_ID_OPERATOR_REMOVE);
+ pGlass->release();
+ m_glassList.remove(pGlass);
+ }
+ Unlock();
+
+ if (bExist && m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
+
+ return bExist;
+ }
+
+ void CEquipment::getGlassList(std::list<CGlass*>& list)
+ {
+ Lock();
+ for (auto item : m_glassList) {
+ item->addRef();
+ list.push_back(item);
+ }
+ Unlock();
+ }
+
+ CGlass* CEquipment::getFrontGlass()
+ {
+ CGlass* pGlass = nullptr;
+
+ Lock();
+ if (!m_glassList.empty()) {
+ pGlass = m_glassList.front();
+ }
+ Unlock();
+
+ return pGlass;
+ }
+
+ void CEquipment::checkReadStepSignal(unsigned int addr, const char* pszData, size_t size)
+ {
+ BOOL bFlag = isBitOn(pszData, size, addr);
+ SERVO::CStep* pStep = getStep(addr);
+ if (pStep != nullptr) {
+ ((CReadStep*)pStep)->onReadSignal(bFlag ? 1 : 0);
+ }
+ }
+
+ void CEquipment::checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size)
+ {
+ BOOL bFlag = isBitOn(pszData, size, addr);
+ SERVO::CStep* pStep = getStep(addr);
+ if (pStep != nullptr) {
+ ((CWriteStep*)pStep)->onRecvSignal(bFlag);
+ }
}
}
--
Gitblit v1.9.3