From 10f48622c553729352dce9a4484def4bfeaa1083 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 02 七月 2025 14:51:33 +0800
Subject: [PATCH] 1.将OnPanelDataReport相关功能由EFEM移到Aligner; 2.Glass增加最初来源Port和Slot，以便在Aligner检测NG时加退； 3.物流调度增加一个参数，是否检测OK作为调度依据。 4.Alginer检测NG,送回原处；
---
SourceCode/Bond/Servo/CLoadPort.cpp | 63 +++++++++++++++----------------
1 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index aa096e3..f6afed4 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -2,23 +2,8 @@
#include "CLoadPort.h"
#include "CGlassPool.h"
#include "Servo.h"
+#include "ServoCommo.h"
-
-#define CHECK_READ_STEP_SIGNAL2(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_SIGNAL2(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 {
CLoadPort::CLoadPort() : CEquipment()
@@ -429,15 +414,18 @@
SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getCassetteCtrlCmdStep();
ASSERT(pStep);
- ASSERT(jobExistenceSize == 12);
- ASSERT(pJobDataA);
-
char szBuffer[1024] = { 0 };
memcpy(&szBuffer[0], &cmd, sizeof(short));
- memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
+ if (jobExistence != nullptr && jobExistenceSize == 12) {
+ memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
+ }
+
memcpy(&szBuffer[26], &slotProcess, sizeof(short));
memcpy(&szBuffer[36], &jopCount, sizeof(short));
- int nLen = pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+ if (pJobDataA != nullptr) {
+ pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+ }
+
return pStep->writeDataEx(szBuffer, 352 * 2, onWritedBlock);
}
@@ -860,12 +848,12 @@
static int autoType[] = { STEP_ID_PORT1_TYPE_AUTO_CHANGE, STEP_ID_PORT2_TYPE_AUTO_CHANGE,
STEP_ID_PORT3_TYPE_AUTO_CHANGE, STEP_ID_PORT4_TYPE_AUTO_CHANGE };
- CHECK_READ_STEP_SIGNAL2(type[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(mode[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(cassetteType[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(transferMode[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(enable[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(autoType[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(type[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(mode[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(cassetteType[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(transferMode[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(enable[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(autoType[m_nIndex], pszData, size);
static int typeReply[] = { STEP_ID_PROT1_TYPE_CHANGE_REPLY, STEP_ID_PROT2_TYPE_CHANGE_REPLY,
@@ -881,12 +869,12 @@
static int cassetteTypeReply[] = { STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY,
STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY };
- CHECK_WRITE_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(typeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(modeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(transferModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(enableModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(typeAutoReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(cassetteTypeReply[m_nIndex], pszData, size);
}
int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -895,6 +883,11 @@
int nRet = portStatusReport.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
m_portStatusReport.copyEx(portStatusReport);
+
+ if (m_portStatusReport.getPortStatus() == PORT_INUSE) {
+ this->sendCassetteCtrlCmd(5, nullptr, 0, 0, 0, nullptr, nullptr);
+ }
+
// 缓存Attribute，用于调试时显示信息
@@ -909,6 +902,8 @@
LOGI("<CCassetteTranserStateStep>InUse<JobExistenceSlot:%d>",
m_portStatusReport.getJobExistenceSlot());
}
+
+
return nRet;
}
@@ -1144,6 +1139,7 @@
js.setMaterialsType((int)type);
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->setOriginPort(m_nIndex, i);
pGlass->addPath(m_nID, 0);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
@@ -1182,6 +1178,7 @@
js.setGlass1Id(szBuffer);
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->setOriginPort(m_nIndex, nSlotIndex);
pGlass->addPath(m_nID, 0);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
--
Gitblit v1.9.3