From 3426d4e0ee09c61ce379cfd1fe9a6e82de346d90 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 29 四月 2025 10:58:51 +0800
Subject: [PATCH] 1.增加CEqCurrentRecipeChangeStep
---
SourceCode/Bond/Servo/CEquipment.cpp | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index f710669..d18f1d8 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include "CEquipment.h"
#include "ToolUnits.h"
+#include <regex>
#define CHECK_READ_STEP_SIGNAL(addr, data, size) { \
@@ -406,31 +407,6 @@
CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS1, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size);
- // Port1 ~ Port4
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTE_TYPE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TRANSFER_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TRANSFER_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TRANSFER_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TRANSFER_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_ENABLE_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_ENABLE_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_ENABLE_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_ENABLE_MODE_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TYPE_AUTO_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TYPE_AUTO_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TYPE_AUTO_CHANGE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TYPE_AUTO_CHANGE, pszData, size);
// CEqCassetteTranserStateStep
CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
@@ -543,6 +519,8 @@
m_listener.onVcrEventReport(this, pVcrEventReport);
}
+ // 0426, 先固定返回1(OK)
+ pEqVcrEventStep->setReturnCode(1);
return 1;
}
}
@@ -787,10 +765,46 @@
return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
}
+ bool CEquipment::isPortTypeStep(SERVO::CStep* pStep)
+ {
+ std::regex pattern("^EQPort\\d+Type$");
+ return std::regex_match(pStep->getName(), pattern);
+ }
+
+ bool CEquipment::isPortModeStep(SERVO::CStep* pStep)
+ {
+ std::regex pattern("^EQPort\\d+Mode$");
+ return std::regex_match(pStep->getName(), pattern);
+ }
+
+ bool CEquipment::isPortCassetteTypeStep(SERVO::CStep* pStep)
+ {
+ std::regex pattern("^EQPort\\d+CassetteType$");
+ return std::regex_match(pStep->getName(), pattern);
+ }
+
+ bool CEquipment::isPortTransferModeStep(SERVO::CStep* pStep)
+ {
+ std::regex pattern("^EQPort\\d+TransferMode$");
+ return std::regex_match(pStep->getName(), pattern);
+ }
+
+ bool CEquipment::isPortEnableStep(SERVO::CStep* pStep)
+ {
+ std::regex pattern("^EQPort\\d+Enable$");
+ return std::regex_match(pStep->getName(), pattern);
+ }
+
+ bool CEquipment::isPortTypeAutoChangeEnableStep(SERVO::CStep* pStep)
+ {
+ std::regex pattern("^EQPort\\d+CassetteType$");
+ return std::regex_match(pStep->getName(), pattern);
+ }
+
bool CEquipment::isCassetteTransferStateStep(SERVO::CStep* pStep)
{
- return CToolUnits::startsWith(pStep->getName(), "EQPort")
- && pStep->getName().find("Cassette") != std::string::npos;
+ std::regex pattern("^EQPort\\d+Cassette.*");
+ return std::regex_match(pStep->getName(), pattern);
}
bool CEquipment::isCimMessageConfirmStep(SERVO::CStep* pStep)
--
Gitblit v1.9.3