From 57056db746cec1ad5c0cc5dad93b8f3474d2562d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 29 三月 2025 15:18:13 +0800
Subject: [PATCH] 1.添加载具搬送状态类(CEqCassetteTransferStateStep)

---
 SourceCode/Bond/Servo/CEquipment.cpp |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 101 insertions(+), 12 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index a52da00..4a771d2 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -3,6 +3,22 @@
 #include "ToolUnits.h"
 
 
+#define CHECK_READ_STEP_SIGNAL(addr, data, size) {							\
+	BOOL bFlag = isBitOn(data, size, addr);									\
+	SERVO::CStep* pStep = getStep(addr);									\
+	if (pStep != nullptr) {													\
+		((CReadStep*)pStep)->onReadSignal(bFlag ? addr : 0);				\
+	}																		\
+}
+
+#define CHECK_WRITE_STEP_SIGNAL(addr, data, size) {							\
+	BOOL bFlag = isBitOn(data, size, addr);									\
+	SERVO::CStep* pStep = getStep(addr);									\
+	if (pStep != nullptr) {													\
+		((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0);				\
+	}																		\
+}
+
 namespace SERVO {
 
 	CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
@@ -358,20 +374,65 @@
 		// 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);
-			}
+			CHECK_READ_STEP_SIGNAL(0x360 + i, pszData, size);
 		}
 
-		index = 0x350;
-		bFlag = isBitOn(pszData, size, index);
-		pStep = getStep(index);
-		if (pStep != nullptr) {
-			((CWriteStep*)pStep)->onRecvSignal(bFlag);
-		}
+
+		// CIM Mode
+		CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
+
+
+		// Port1 ~ Port4
+		CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3e1, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3e2, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3e3, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3e8, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3e9, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3ea, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3eb, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3f0, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3f1, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3f2, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3f3, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3f8, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3f9, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3fa, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x3fb, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x400, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x401, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x402, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x403, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x408, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x409, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x40a, pszData, size);
+		CHECK_READ_STEP_SIGNAL(0x40b, pszData, size);
+
+		// CEqCassetteTranserStateStep
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOADED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_INUSE, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_BLOCKED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOADED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_INUSE, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_BLOCKED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOADED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_INUSE, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_BLOCKED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOADED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_INUSE, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_BLOCKED, pszData, size);
 	}
 
 	BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -614,6 +675,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;

--
Gitblit v1.9.3