From 0d41f9169a84eb0082585d55af5785d020628bca Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 27 三月 2025 18:04:24 +0800
Subject: [PATCH] 1.增加人工处理(移除、抱走)物料功能，以便和机器中的实物丰符合。 2.Port1 ~ Port4，type, mode, cassette type, transfer mode, enable mode, type auto change mode数据获取。 3.增加通用的读取cc-link int数据的CEqReadIntStep
---
SourceCode/Bond/Servo/CEquipment.cpp | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index a52da00..fa4bb1a 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -366,12 +366,35 @@
}
}
- index = 0x350;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- ((CWriteStep*)pStep)->onRecvSignal(bFlag);
- }
+ // CIM Mode
+ checkStepSignalStepSignal(0x350, pszData, size);
+
+ // Port1 ~ Port4
+ checkStepSignalStepSignal(0x3e0, pszData, size);
+ checkStepSignalStepSignal(0x3e1, pszData, size);
+ checkStepSignalStepSignal(0x3e2, pszData, size);
+ checkStepSignalStepSignal(0x3e3, pszData, size);
+ checkStepSignalStepSignal(0x3e8, pszData, size);
+ checkStepSignalStepSignal(0x3e9, pszData, size);
+ checkStepSignalStepSignal(0x3ea, pszData, size);
+ checkStepSignalStepSignal(0x3eb, pszData, size);
+ checkStepSignalStepSignal(0x3f0, pszData, size);
+ checkStepSignalStepSignal(0x3f1, pszData, size);
+ checkStepSignalStepSignal(0x3f2, pszData, size);
+ checkStepSignalStepSignal(0x3f3, pszData, size);
+ checkStepSignalStepSignal(0x3f8, pszData, size);
+ checkStepSignalStepSignal(0x3f9, pszData, size);
+ checkStepSignalStepSignal(0x3fa, pszData, size);
+ checkStepSignalStepSignal(0x3fb, pszData, size);
+ checkStepSignalStepSignal(0x400, pszData, size);
+ checkStepSignalStepSignal(0x401, pszData, size);
+ checkStepSignalStepSignal(0x402, pszData, size);
+ checkStepSignalStepSignal(0x403, pszData, size);
+ checkStepSignalStepSignal(0x408, pszData, size);
+ checkStepSignalStepSignal(0x409, pszData, size);
+ checkStepSignalStepSignal(0x40a, pszData, size);
+ checkStepSignalStepSignal(0x40b, pszData, size);
+
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -614,6 +637,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 +677,13 @@
return pGlass;
}
+
+ void CEquipment::checkStepSignalStepSignal(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