From 276074e350f64ec8b71d0573a9936c075a345270 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 15:42:50 +0800
Subject: [PATCH] 1.VCR结果上报，测试OK; 2.Aligner和Measurement的Panel data上报。
---
SourceCode/Bond/Servo/CEquipment.cpp | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index c7cc0db..bef7c8d 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -601,7 +601,7 @@
CHECK_WRITE_STEP_SIGNAL(STEP_ID_IN_OP_CMD_REPLY, pszData, size);
// Panel Data Report
- CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REPORT, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PANEL_DATA_REPORT, pszData, size);
// Panel Data Request
CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REQUEST, pszData, size);
@@ -612,6 +612,11 @@
// job process start/end report
CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_START_REPORT, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_END_REPORT, pszData, size);
+
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT1_CASSETTE_CTR_CMD_REPLY, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT2_CASSETTE_CTR_CMD_REPLY, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT3_CASSETTE_CTR_CMD_REPLY, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT4_CASSETTE_CTR_CMD_REPLY, pszData, size);
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -1439,17 +1444,15 @@
{
LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
- // 可以在此更新JobDataS数据了
- CGlass* pGlass = getGlassFromSlot(port);
- if (pGlass == nullptr) {
- LOGE("<CEquipment-%s>onSentOutJob,没有找到对应的Glass(CassetteSequenceNo:%d, JobSequenceNo:%d, ID=%s)，请检查数据，注意风险。",
- m_strName.c_str(), pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo(),
- pJobDataS->getGlass1Id().c_str());
- return -1;
- }
- pGlass->updateJobDataS(pJobDataS);
- return 0;
+ // 可以在此更新JobDataS数据了
+ int nRet = ((CArm*)m_pArm)->glassUpdateJobDataS(pJobDataS);
+ if (nRet < 0) {
+ LOGE("<CEquipment-%s>onReceivedJob,更新JobDataS失败，glassUpdateJobDataS返回%d",
+ m_strName.c_str(), nRet);
+ }
+
+ return nRet;
}
int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
@@ -1616,7 +1619,7 @@
index += sizeof(short);
CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
index += 128 * 2;
- CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+ CToolUnits::convertString(&pszData[index], 256 * 2, strPanelGradeData);
index += 256 * 2;
--
Gitblit v1.9.3