From a79fcf6a937e1bfe57014d2c99f1bb9f98bfa892 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 10 二月 2026 10:20:17 +0800
Subject: [PATCH] 1.完善日志； 2.背景图表配置 3.更改EAP通讯端口和设备名；
---
SourceCode/Bond/Servo/CLoadPort.cpp | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 73549bf..5f232b4 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -377,6 +377,7 @@
portStatusReport.setCassetteId("CID1001");
int nRet = portStatusReport.serialize(szBuffer, 64);
decodePortStatusReport(pStep, szBuffer, 64);
+ LOGI("<CLoadPort>Port1杞藉叆妯℃嫙鏁版嵁锛� id:CID1001 map: 0xf");
}
}
if (m_nIndex == 1) {
@@ -391,6 +392,7 @@
portStatusReport.setCassetteId("CID1004");
int nRet = portStatusReport.serialize(szBuffer, 64);
decodePortStatusReport(pStep, szBuffer, 64);
+ LOGI("<CLoadPort>Port2杞藉叆妯℃嫙鏁版嵁锛� id:CID1004 map: 0xff");
}
}
*/
@@ -456,6 +458,11 @@
memcpy(&szBuffer[26], &slotProcess, sizeof(short));
memcpy(&szBuffer[36], &jopCount, sizeof(short));
+ LOGI("<CLoadPort-%d>sendCassetteCtrlCmd cmd=%d, jobExistence0=%d, jobExistence1=%d, slotProcess=%d, jobCount=%d",
+ m_nIndex, (int)cmd,
+ (jobExistence != nullptr && jobExistenceSize >= 1) ? (int)jobExistence[0] : -1,
+ (jobExistence != nullptr && jobExistenceSize >= 2) ? (int)jobExistence[1] : -1,
+ (int)slotProcess, (int)jopCount);
if (pJobDataA != nullptr) {
pJobDataA->serialize(&szBuffer[38], 1024 - 38);
}
@@ -559,6 +566,11 @@
std::string& CLoadPort::getCassetteId()
{
return m_portStatusReport.getCassetteId();
+ }
+
+ void CLoadPort::simulateSetCassetteId(const char* pszCarrierId)
+ {
+ m_portStatusReport.setCassetteId(pszCarrierId);
}
int CLoadPort::getLoadingCassetteType()
@@ -937,25 +949,13 @@
// 褰損ort鐘舵�佷负InUse, 姣旇緝map
if (m_portStatusReport.getPortStatus() == PORT_INUSE) {
- if (m_isCompareMapsBeforeProceeding) {
- short scanMap = getScanCassetteMap();
- short downloadMap = getDownloadCassetteMap();
- if (scanMap == downloadMap) {
- generateGlassList(scanMap);
- this->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
- }
- else {
- this->sendCassetteCtrlCmd(CCC_PROCESS_CANCEL, nullptr, 0, 0, 0, nullptr, nullptr);
+ // 鐢熸垚鐜荤拑鍒楄〃锛氭潵鑷� EFEM 鎵弿鍒扮殑 map
+ generateGlassList(getScanCassetteMap());
- // 鎶涘嚭鍒板簲鐢ㄥ眰鍋氭彁绀�
- if (m_listener.onMapMismatch != nullptr) {
- m_listener.onMapMismatch(this, scanMap, downloadMap);
- }
- }
- }
- else {
- // 鎶涘嚭鍒板簲鐢ㄥ眰鍋氶�夋嫨瑕佸姞宸ョ殑鐗囧瓙
- generateGlassList(getScanCassetteMap());
+ // CompareMapsBeforeProceeding锛氫笉鍦ㄦ澶勮嚜鍔� Start/Cancel锛屾敼涓虹瓑寰� Host 鍐崇瓥锛圥roceedWithCarrier/ProceedWithSlotMap/CarrierRelease锛�
+ // Host 鍐崇瓥鍏ュ彛锛歋3F17 CarrierAction -> listener.onCarrierAction -> CMaster::proceedWithCarrier()/carrierRelease()
+ if (m_isCompareMapsBeforeProceeding) {
+ // 杩欓噷浠呯瓑寰咃紝鍏蜂綋涓婃姤鐢变笂灞傚湪 PORT_INUSE 浜嬩欢涓Е鍙戯紙S6F11 CheckSlotMap锛�
}
}
if (m_listener.onPortStatusChanged != nullptr) {
@@ -973,8 +973,9 @@
m_portStatusReport.getPortStatus(), m_portStatusReport.getCassetteSequenceNo(),
m_portStatusReport.getCassetteId().c_str());
if (m_portStatusReport.getPortStatus() == 3) {
- LOGI("<CCassetteTranserStateStep>InUse<JobExistenceSlot:%d>",
- m_portStatusReport.getJobExistenceSlot());
+ LOGI("<CCassetteTranserStateStep>InUse<JobExistenceSlot:%d, mapW1:%d>",
+ m_portStatusReport.getJobExistenceSlot(),
+ (int)portStatusReport.getJobExistenceSlot());
}
@@ -1324,4 +1325,9 @@
{
m_isCompareMapsBeforeProceeding = bCompare;
}
+
+ BOOL CLoadPort::isCompareMapsBeforeProceeding() const
+ {
+ return m_isCompareMapsBeforeProceeding;
+ }
}
--
Gitblit v1.9.3