From cacea2da59a3acd73f3161d819a10e0060762616 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 06 五月 2025 14:54:13 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.cpp | 244 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 205 insertions(+), 39 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 85f5a0b..096870f 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) { \
@@ -23,8 +24,8 @@
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
- m_listener = { nullptr, nullptr, nullptr, nullptr };
- m_alive = {FALSE, 0, FALSE};
+ m_listener = { nullptr, nullptr, nullptr, nullptr, nullptr };
+ m_alive = { FALSE, 0, FALSE };
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
m_bDownstreamInline = FALSE;
@@ -67,6 +68,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)
@@ -121,6 +123,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;
@@ -129,6 +132,7 @@
void CEquipment::init()
{
initPins();
+ initSteps();
for (auto item : m_mapStep) {
item.second->init();
}
@@ -139,6 +143,11 @@
for (auto item : m_mapStep) {
item.second->term();
}
+ }
+
+ void CEquipment::initSteps()
+ {
+
}
void CEquipment::setID(int nID)
@@ -310,7 +319,7 @@
// 以下解释和处理数据
BOOL bFlag;
- int index = 0x340;
+ int index = 0x840;
// alive
@@ -327,7 +336,7 @@
}
}
}
-
+
// CIM State
bFlag = isBitOn(pszData, size, ++index);
if (!equalBool(m_bCimState, bFlag)) {
@@ -361,7 +370,7 @@
m_bAutoRecipeChange = bFlag;
}
- // AutoRecipeChange
+ // VCR Enable
bFlag = isBitOn(pszData, size, ++index);
if (!equalBool(m_bVCREnable[0], bFlag)) {
m_bVCREnable[0] = bFlag;
@@ -369,45 +378,44 @@
// 以下根据信号做流程处理
- CStep* pStep;
-
- // Equipment Mode Change Report(0x360)
- // Equipment Status Change Report(0x361)
- // Equipment Alarm Change Report(0x362 ~ 0x366)
for (int i = 0; i < 7; i++) {
- CHECK_READ_STEP_SIGNAL(0x360 + i, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_EQMODE_CHANGED + i, pszData, size);
}
// CIM Mode
- CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pszData, size);
+ // CIM Message Set cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_SET_CMD_REPLY, pszData, size);
- // Port1 ~ Port4
- CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e1, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e2, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e3, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e8, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e9, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3ea, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3eb, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f0, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f1, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f2, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f3, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f8, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f9, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3fa, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3fb, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x400, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x401, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x402, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x403, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x408, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x409, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x40a, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x40b, pszData, size);
+ // CIM Message Clear cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pszData, size);
+
+ // Datetime set cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_DATETIME_SET_CMD_REPLY, pszData, size);
+
+ // vcr enable cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_VCR_ENABLE_CMD_REPLY, pszData, size);
+
+ // EQ mode change cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pszData, size);
+
+ // EQ Master recipe request cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_MASTER_RECIPE_LIST_CMD_REPLY, pszData, size);
+
+ // 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);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS1, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size);
+
// CEqCassetteTranserStateStep
CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
@@ -494,11 +502,35 @@
int state = pEqAlarmStep->getAlarmState();
ASSERT(state == 0 || state == 1);
if (m_listener.onAlarm != nullptr) {
- m_listener.onAlarm(this, state,
+ m_listener.onAlarm(this, state,
pEqAlarmStep->getAlarmId(),
pEqAlarmStep->getUnitId(),
pEqAlarmStep->getAlarmLevel());
}
+
+ return 1;
+ }
+ else if (isCimMessageConfirmStep(pStep)) {
+ SERVO::CEqReadIntStep* pEqReadIntStep = (SERVO::CEqReadIntStep*)pStep;
+ int value = pEqReadIntStep->getValue();
+ // 此处将value按高低位拆分为message id和panel no.
+ // 可能还需要上报到cim
+ short msgId, panelNo;
+ 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;
}
}
@@ -742,4 +774,138 @@
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)
+ {
+ std::regex pattern("^EQPort\\d+Cassette.*");
+ return std::regex_match(pStep->getName(), pattern);
+ }
+
+ bool CEquipment::isCimMessageConfirmStep(SERVO::CStep* pStep)
+ {
+ 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);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->setEqMode(mode);
+ }
+
+ int CEquipment::setCimMode(BOOL bOn)
+ {
+ SERVO::CEqCimModeChangeStep* pStep = (SERVO::CEqCimModeChangeStep*)getStepWithName(STEP_CIM_MODE_CHANGE);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ if (bOn)
+ return pStep->cimOn();
+ else
+ return pStep->cimOff();
+ }
+
+ int CEquipment::setCimMessage(const char* pszMessage, short id, short nTouchPanelNo)
+ {
+ SERVO::CEqCimMessageCmdStep* pStep = (SERVO::CEqCimMessageCmdStep*)getStepWithName(STEP_CIM_MESSAGE_CMD);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->setCimMessage(pszMessage, id, nTouchPanelNo);
+ }
+
+ int CEquipment::clearCimMessage(short id, short nTouchPanelNo)
+ {
+ SERVO::CEqCimMessageClearStep* pStep = (SERVO::CEqCimMessageClearStep*)getStepWithName(STEP_CIM_MESSAGE_CLEAR);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->clearCimMessage(id, nTouchPanelNo);
+ }
+
+ int CEquipment::setDateTime(short year, short month, short day, short hour, short minute, short second)
+ {
+ SERVO::CEqDateTimeSetCmdStep* pStep = (SERVO::CEqDateTimeSetCmdStep*)getStepWithName(STEP_DATETIME_SET_CMD);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ return pStep->setDateTime(year, month, day, hour, minute, second);
+ }
+
+ int CEquipment::masterRecipeListRequest(short unitNo)
+ {
+ SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
+ if (pStep == nullptr) {
+ return -1;
+ }
+
+ LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
+ if (m_recipesManager.syncing() != 0) {
+ return -2;
+ }
+ pStep->writeShort(unitNo, [&, unitNo](int code) -> int {
+ if (code == WOK) {
+ LOGI("<CEquipment-%s>请求单元<%d>主配方列表成功，正在等待数据.", m_strName.c_str(), unitNo);
+ }
+ else {
+ m_recipesManager.syncFailed();
+ LOGI("<CEquipment-%s>请求单元<%d>主配方列表失败，code:%d", m_strName.c_str(), unitNo, code);
+ }
+
+ return 0;
+ });
+ return 0;
+ }
+
+ short CEquipment::decodeRecipeListReport(const char* pszData, size_t size)
+ {
+ return m_recipesManager.decodeRecipeListReport(pszData, size);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3