From 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 09:34:04 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CEFEM.cpp | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 32e9233..6b28e45 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -426,37 +426,37 @@
}
}
- int CEFEM::onFetchedOut(int port, const char* pszGlassId)
+ int CEFEM::onFetchedOutJob(int port, const char* pszGlassId)
{
if (port == 1) {
- return m_pPort[0]->fetchedOut(pszGlassId);
+ return m_pPort[0]->fetchedOutJob(pszGlassId);
}
if (port == 2) {
- return m_pPort[1]->fetchedOut(pszGlassId);
+ return m_pPort[1]->fetchedOutJob(pszGlassId);
}
if (port == 3) {
- return m_pPort[2]->fetchedOut(pszGlassId);
+ return m_pPort[2]->fetchedOutJob(pszGlassId);
}
if (port == 4) {
- return m_pPort[3]->fetchedOut(pszGlassId);
+ return m_pPort[3]->fetchedOutJob(pszGlassId);
}
if (port == 5) {
- return m_pArmTray[0]->fetchedOut(pszGlassId);
+ return m_pArmTray[0]->fetchedOutJob(pszGlassId);
}
if (port == 6) {
- return m_pArmTray[1]->fetchedOut(pszGlassId);
+ return m_pArmTray[1]->fetchedOutJob(pszGlassId);
}
if (port == 7) {
- return m_pAligner->fetchedOut(pszGlassId);
+ return m_pAligner->fetchedOutJob(pszGlassId);
}
if (port == 8) {
- return m_pFliper->fetchedOut(pszGlassId);
+ return m_pFliper->fetchedOutJob(pszGlassId);
}
return -1;
}
- int CEFEM::onStore(int port, const char* pszGlassId)
+ int CEFEM::onStoreJob(int port, const char* pszGlassId)
{
if (port == 1) {
return m_pPort[0]->storedJob(pszGlassId);
--
Gitblit v1.9.3