From 8322172ad4e6d5636b8c32b94d95f8abbce1ed54 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 28 三月 2025 17:40:59 +0800
Subject: [PATCH] 1.修改CReadStep::onReadSignal信号为多类型，以便适应其它场景（如 Port type,mode）等使用。
---
SourceCode/Bond/Servo/CEquipment.cpp | 90 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index a52da00..d7fd776 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -358,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);
- }
+ checkReadStepSignalStepSignal(0x360 + i, pszData, size);
}
- index = 0x350;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- ((CWriteStep*)pStep)->onRecvSignal(bFlag);
- }
+
+ // CIM Mode
+ checkWriteStepSignalStepSignal(0x350, pszData, size);
+
+
+ // Port1 ~ Port4
+ checkReadStepSignalStepSignal(0x3e0, pszData, size);
+ checkReadStepSignalStepSignal(0x3e1, pszData, size);
+ checkReadStepSignalStepSignal(0x3e2, pszData, size);
+ checkReadStepSignalStepSignal(0x3e3, pszData, size);
+ checkReadStepSignalStepSignal(0x3e8, pszData, size);
+ checkReadStepSignalStepSignal(0x3e9, pszData, size);
+ checkReadStepSignalStepSignal(0x3ea, pszData, size);
+ checkReadStepSignalStepSignal(0x3eb, pszData, size);
+ checkReadStepSignalStepSignal(0x3f0, pszData, size);
+ checkReadStepSignalStepSignal(0x3f1, pszData, size);
+ checkReadStepSignalStepSignal(0x3f2, pszData, size);
+ checkReadStepSignalStepSignal(0x3f3, pszData, size);
+ checkReadStepSignalStepSignal(0x3f8, pszData, size);
+ checkReadStepSignalStepSignal(0x3f9, pszData, size);
+ checkReadStepSignalStepSignal(0x3fa, pszData, size);
+ checkReadStepSignalStepSignal(0x3fb, pszData, size);
+ checkReadStepSignalStepSignal(0x400, pszData, size);
+ checkReadStepSignalStepSignal(0x401, pszData, size);
+ checkReadStepSignalStepSignal(0x402, pszData, size);
+ checkReadStepSignalStepSignal(0x403, pszData, size);
+ checkReadStepSignalStepSignal(0x408, pszData, size);
+ checkReadStepSignalStepSignal(0x409, pszData, size);
+ checkReadStepSignalStepSignal(0x40a, pszData, size);
+ checkReadStepSignalStepSignal(0x40b, pszData, size);
+
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -614,6 +634,34 @@
}
}
+ 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;
@@ -626,4 +674,22 @@
return pGlass;
}
+
+ void CEquipment::checkReadStepSignalStepSignal(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::checkWriteStepSignalStepSignal(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