From bd30f028a163c7293620064fc98744dacd41ceae Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 09 四月 2025 11:58:38 +0800
Subject: [PATCH] 1.CassetteControlCommand（cassette控制指令下发，测试页面）
---
SourceCode/Bond/Servo/CEquipment.cpp | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 4a771d2..e61b4b3 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 };
+ m_listener = { nullptr, nullptr, nullptr, nullptr };
m_alive = {FALSE, 0, FALSE};
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
@@ -65,6 +65,7 @@
{
m_listener.onAlive = listener.onAlive;
m_listener.onCimStateChanged = listener.onCimStateChanged;
+ m_listener.onAlarm = listener.onAlarm;
m_listener.onDataChanged = listener.onDataChanged;
}
@@ -120,6 +121,7 @@
auto iter = m_mapStep.find(addr);
if (iter != m_mapStep.end()) return -1;
pStep->setEquipment(this);
+ pStep->setID(addr);
pStep->setCcLink(m_pCclink);
m_mapStep[addr] = pStep;
return 0;
@@ -485,6 +487,26 @@
return m_bVCREnable[index];
}
+ int CEquipment::onStepEvent(CStep* pStep, int code)
+ {
+ if (code == STEP_EVENT_READDATA) {
+ if (isAlarmStep(pStep)) {
+ SERVO::CEqAlarmStep* pEqAlarmStep = (SERVO::CEqAlarmStep*)pStep;
+ int state = pEqAlarmStep->getAlarmState();
+ ASSERT(state == 0 || state == 1);
+ if (m_listener.onAlarm != nullptr) {
+ m_listener.onAlarm(this, state,
+ pEqAlarmStep->getAlarmId(),
+ pEqAlarmStep->getUnitId(),
+ pEqAlarmStep->getAlarmLevel());
+ }
+ }
+ }
+
+
+ return 0;
+ }
+
CPin* CEquipment::addPin(PinType type, char* pszName)
{
// 不允许名字添加重复的pin
@@ -715,4 +737,15 @@
return pGlass;
}
+
+ bool CEquipment::isAlarmStep(SERVO::CStep* pStep)
+ {
+ return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
+ }
+
+ bool CEquipment::isCassetteTransferStateStep(SERVO::CStep* pStep)
+ {
+ return CToolUnits::startsWith(pStep->getName(), "EQPort")
+ && pStep->getName().find("Cassette") != std::string::npos;
+ }
}
--
Gitblit v1.9.3