From d14420e7f85b5fe7289aafe6bef0c053dede3657 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 16 一月 2026 11:20:39 +0800
Subject: [PATCH] 1.修复以下问题： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 CEID，将被接受但运行时无法触发暂停，风险难以察觉。 建议的上线前防护 / 改进（无需真机也可先改） 2.软件侧警告id上抛；
---
SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
index 16f72f7..e39bd05 100644
--- a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
+++ b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
@@ -90,7 +90,9 @@
{
ASSERT(m_pEquipment != nullptr);
ASSERT(m_pEquipment->getID() == EQ_ID_LOADPORT1
- || m_pEquipment->getID() == EQ_ID_LOADPORT2);
+ || m_pEquipment->getID() == EQ_ID_LOADPORT2
+ || m_pEquipment->getID() == EQ_ID_LOADPORT3
+ || m_pEquipment->getID() == EQ_ID_LOADPORT4);
SERVO::CLoadPort* pLoadPort = (SERVO::CLoadPort*)m_pEquipment;
short cmd = 0;
@@ -98,7 +100,7 @@
int jobExistenceSize = 12;
short slotProcess = 0;
short jobCount = 0;
- SERVO::CJobDataB* pJobDataB = new SERVO::CJobDataB();
+ SERVO::CJobDataA* pJobDataA = new SERVO::CJobDataA();
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_CASSETTE_CTRL_CMD);
@@ -112,5 +114,14 @@
pLoadPort->sendCassetteCtrlCmd(cmd, &jobExistence[0], jobExistenceSize, slotProcess,
- jobCount, pJobDataB);
+ jobCount, pJobDataA, [&](int code) -> int {
+ if (code == WOK) {
+ LOGI("sendCassetteCtrlCmd 鎴愬姛.");
+ }
+ else {
+ LOGE("sendCassetteCtrlCmd 澶辫触.");
+ }
+
+ return 0;
+ });
}
--
Gitblit v1.9.3