From fc881732b096f1c5a6dfcb9751c89f0ffca90768 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 28 四月 2025 14:49:20 +0800
Subject: [PATCH] 1.LoadPort增加 mode, type, cassette type, transfer mode等属性值，并增加对应属性页；
---
SourceCode/Bond/Servo/CEquipment.cpp | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 86a2bf2..28b9a38 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -23,7 +23,7 @@
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
- m_listener = { nullptr, nullptr, nullptr, nullptr };
+ m_listener = { nullptr, nullptr, nullptr, nullptr, nullptr };
m_alive = { FALSE, 0, FALSE };
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
@@ -67,6 +67,7 @@
m_listener.onCimStateChanged = listener.onCimStateChanged;
m_listener.onAlarm = listener.onAlarm;
m_listener.onDataChanged = listener.onDataChanged;
+ m_listener.onVcrEventReport = listener.onVcrEventReport;
}
void CEquipment::setCcLink(CCCLinkIEControl* pCcLink)
@@ -396,6 +397,9 @@
// CIM Message Confirm
CHECK_READ_STEP_SIGNAL(STEP_ID_CIM_MSG_CONFIRM_REPORT, pszData, size);
+ // VCR1 Event report
+ CHECK_READ_STEP_SIGNAL(STEP_ID_VCR1_EVENT_REPORT, pszData, size);
+
// EQ Job Event
CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS1, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS2, pszData, size);
@@ -530,6 +534,18 @@
msgId = (value & 0xffff0000 >> 16);
panelNo = (value & 0xffff);
LOGI("Cim Message Confirm(msgID = %d, panel no.=%d).", msgId, panelNo);
+ }
+ else if (isVcrEventStep(pStep)) {
+ SERVO::CEqVcrEventStep* pEqVcrEventStep = (SERVO::CEqVcrEventStep*)pStep;
+ CVcrEventReport* pVcrEventReport = pEqVcrEventStep->getVcrEventReport();
+ ASSERT(pVcrEventReport);
+ if (m_listener.onVcrEventReport != nullptr) {
+ m_listener.onVcrEventReport(this, pVcrEventReport);
+ }
+
+ // 0426, 先固定返回1(OK)
+ pEqVcrEventStep->setReturnCode(1);
+ return 1;
}
}
@@ -784,6 +800,11 @@
return pStep->getName().compare(STEP_EQ_CIM_MESSAGE_CONFIRM) == 0;
}
+ bool CEquipment::isVcrEventStep(SERVO::CStep* pStep)
+ {
+ return pStep->getName().compare(STEP_EQ_VCR1_EVENT_REPORT) == 0;
+ }
+
int CEquipment::setEqMode(short mode)
{
SERVO::CEqModeChangeStep* pStep = (SERVO::CEqModeChangeStep*)getStepWithName(STEP_EQ_MODE_CHANGE);
--
Gitblit v1.9.3