From bfe14e41fa5b07771d78af4511ba18d706bc23cc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 28 七月 2025 17:07:52 +0800
Subject: [PATCH] 1.Spooling Config功能EAP模拟测试;

---
 SourceCode/Bond/Servo/CFliper.cpp |   51 +++++++++++++--------------------------------------
 1 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/SourceCode/Bond/Servo/CFliper.cpp b/SourceCode/Bond/Servo/CFliper.cpp
index 891aac4..aed1fc6 100644
--- a/SourceCode/Bond/Servo/CFliper.cpp
+++ b/SourceCode/Bond/Servo/CFliper.cpp
@@ -33,9 +33,19 @@
 	{
 		// 加入Pin初始化代码
 		LOGI("<CFliper>initPins");
-		addPin(SERVO::PinType::INPUT, _T("In1"));
-		addPin(SERVO::PinType::INPUT, _T("In2"));
-		addPin(SERVO::PinType::OUTPUT, _T("Out"));
+		addPin(SERVO::PinType::INPUT, _T("In"));
+		addPin(SERVO::PinType::OUTPUT, _T("Out1"));
+		addPin(SERVO::PinType::OUTPUT, _T("Out2"));
+	}
+
+	// 必须要实现的虚函数,在此初始化Slot信息
+	void CFliper::initSlots()
+	{
+		m_slot[0].enable();
+		m_slot[0].setPosition(m_nID);
+		m_slot[0].setNo(1);
+		m_slot[0].setName("Slot 1(G2)");
+		m_slot[0].setType(MaterialsType::G2);
 	}
 
 	void CFliper::onTimer(UINT nTimerid)
@@ -56,40 +66,5 @@
 	int CFliper::recvIntent(CPin* pPin, CIntent* pIntent)
 	{
 		return __super::recvIntent(pPin, pIntent);
-	}
-
-	BOOL CFliper::glassWillArrive(CGlass* pGlass)
-	{
-		BOOL bRet = __super::glassWillArrive(pGlass);
-		if (!bRet) {
-			return FALSE;
-		}
-
-		return m_glassList.empty();
-	}
-
-	BOOL CFliper::onPreStoredJob(int port, CJobDataB* pJobDataB)
-	{
-		CJobDataS* pJobDataS = getJobDataS(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
-		if (pJobDataS == nullptr) {
-			LOGE("<CFliper-%s>onPreFetchedOutJob,找不到对应的JobDataS(CassetteSequenceNo:%d, JobSequenceNo:%d), 注意排查风险!", m_strName.c_str(), 
-				pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
-			return FALSE;
-		}
-
-		// 当前不能有任何玻璃,且当前准备进的片是G2
-		Lock();
-		if (!m_glassList.empty()) {
-			Unlock();
-			LOGE("<CFliper-%s>onPreFetchedOutJob,当前机器或单元存在玻璃片,不能进料,请注意风险!", m_strName.c_str());
-			return FALSE;
-		}
-
-		if (pJobDataS->getMaterialsType() != (int)MaterialsType::G2) {
-			LOGE("<CFliper-%s>onPreFetchedOutJob,当前机器或单元只能进G2玻璃片,请注意风险!", m_strName.c_str());
-			return FALSE;
-		}
-
-		return TRUE;
 	}
 }

--
Gitblit v1.9.3