From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CAligner.cpp | 39 +++++++++------------------------------
1 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAligner.cpp b/SourceCode/Bond/Servo/CAligner.cpp
index e07f04e..c15885e 100644
--- a/SourceCode/Bond/Servo/CAligner.cpp
+++ b/SourceCode/Bond/Servo/CAligner.cpp
@@ -39,6 +39,15 @@
addPin(SERVO::PinType::OUTPUT, _T("Out2"));
}
+ // 必须要实现的虚函数，在此初始化Slot信息
+ void CAligner::initSlots()
+ {
+ m_slot[0].enable();
+ m_slot[0].setPosition(m_nID);
+ m_slot[0].setNo(1);
+ m_slot[0].setName("Slot 1");
+ }
+
void CAligner::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
@@ -57,35 +66,5 @@
int CAligner::recvIntent(CPin* pPin, CIntent* pIntent)
{
return __super::recvIntent(pPin, pIntent);
- }
-
- BOOL CAligner::glassWillArrive(CGlass* pGlass)
- {
- BOOL bRet = __super::glassWillArrive(pGlass);
- if (!bRet) {
- return FALSE;
- }
-
- return m_glassList.empty();
- }
-
- BOOL CAligner::onPreStoredJob(int port, CJobDataB* pJobDataB)
- {
- CJobDataS* pJobDataS = getJobDataS(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
- if (pJobDataS == nullptr) {
- LOGE("<CAligner-%s>onPreFetchedOutJob,找不到对应的JobDataS(CassetteSequenceNo:%d, JobSequenceNo:%d), 注意排查风险!", m_strName.c_str(),
- pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
- return FALSE;
- }
-
- // 只能一片一片的对位
- Lock();
- if (!m_glassList.empty()) {
- Unlock();
- LOGE("<CEquipment-%s>onPreFetchedOutJob,当前机器或单元存在玻璃片，不能进料，请注意风险！", m_strName.c_str());
- return FALSE;
- }
-
- return TRUE;
}
}
--
Gitblit v1.9.3