From 92dee0d8070594c351008d02fd9645c9e5de80a7 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 四月 2025 09:01:04 +0800
Subject: [PATCH] 1.车间测试部分功能； 2.警告测试，修复未能显示警告到报表中的问题。
---
SourceCode/Bond/Servo/CEquipment.cpp | 213 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 197 insertions(+), 16 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 393191b..93d8455 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -3,12 +3,28 @@
#include "ToolUnits.h"
+#define CHECK_READ_STEP_SIGNAL(addr, data, size) { \
+ BOOL bFlag = isBitOn(data, size, addr); \
+ SERVO::CStep* pStep = getStep(addr); \
+ if (pStep != nullptr) { \
+ ((CReadStep*)pStep)->onReadSignal(bFlag ? addr : 0); \
+ } \
+}
+
+#define CHECK_WRITE_STEP_SIGNAL(addr, data, size) { \
+ BOOL bFlag = isBitOn(data, size, addr); \
+ SERVO::CStep* pStep = getStep(addr); \
+ if (pStep != nullptr) { \
+ ((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0); \
+ } \
+}
+
namespace SERVO {
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
- m_listener = { nullptr, nullptr };
- m_alive = {FALSE, 0, FALSE};
+ m_listener = { nullptr, nullptr, nullptr, nullptr };
+ m_alive = { FALSE, 0, FALSE };
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
m_bDownstreamInline = FALSE;
@@ -49,6 +65,8 @@
{
m_listener.onAlive = listener.onAlive;
m_listener.onCimStateChanged = listener.onCimStateChanged;
+ m_listener.onAlarm = listener.onAlarm;
+ m_listener.onDataChanged = listener.onDataChanged;
}
void CEquipment::setCcLink(CCCLinkIEControl* pCcLink)
@@ -103,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;
@@ -309,7 +328,7 @@
}
}
}
-
+
// CIM State
bFlag = isBitOn(pszData, size, ++index);
if (!equalBool(m_bCimState, bFlag)) {
@@ -357,20 +376,67 @@
// Equipment Status Change Report(0x361)
// Equipment Alarm Change Report(0x362 ~ 0x366)
for (int i = 0; i < 7; i++) {
- index = 0x360 + i;;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- ((CReadStep*)pStep)->onReadSignal(bFlag);
- }
+ CHECK_READ_STEP_SIGNAL(0x360 + i, pszData, size);
}
- index = 0x350;
- bFlag = isBitOn(pszData, size, index);
- pStep = getStep(index);
- if (pStep != nullptr) {
- ((CWriteStep*)pStep)->onRecvSignal(bFlag);
- }
+
+ // CIM Mode
+ CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
+
+ // EQ Mode
+ CHECK_WRITE_STEP_SIGNAL(0x355, 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);
+
+ // CEqCassetteTranserStateStep
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_BLOCKED, pszData, size);
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -421,6 +487,28 @@
{
if (index >= VCR_MAX) return FALSE;
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 1;
+ }
+ }
+
+
+ return 0;
}
CPin* CEquipment::addPin(PinType type, char* pszName)
@@ -547,6 +635,7 @@
// 模拟取出第一张Panel,传送到下一环节
+ ULONGLONG time = CToolUnits::getTimestamp();
Lock();
if (m_glassList.empty()) {
Unlock();
@@ -561,8 +650,15 @@
LOGE("<CEquipment>对方拒绝接收Intent.");
}
else if (nRet == FLOW_ACCEPT) {
+ CPath* pPath = pContext->getPathWithSiteID(m_nID);
+ if (pPath != nullptr) {
+ pPath->setOutTime(time);
+ }
m_glassList.pop_front();
pContext->release(); // 添加到列队时addRef, 取出时release
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
}
pContext->release();
@@ -579,9 +675,15 @@
int CEquipment::glassArrived(CGlass* pGlass)
{
Lock();
+ pGlass->addPath(m_nID);
pGlass->addRef();
m_glassList.push_back(pGlass);
Unlock();
+
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
+
return FLOW_ACCEPT;
}
@@ -593,5 +695,84 @@
pGlass->addRef();
m_glassList.push_back(pGlass);
Unlock();
+
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
}
-}
+
+ BOOL CEquipment::removeClass(CGlass* pGlass)
+ {
+ Lock();
+ bool bExist = std::find(m_glassList.begin(), m_glassList.end(), pGlass) != m_glassList.end();
+ if (bExist) {
+ pGlass->addPath(EQ_ID_OPERATOR_REMOVE);
+ pGlass->release();
+ m_glassList.remove(pGlass);
+ }
+ Unlock();
+
+ if (bExist && m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, 0);
+ }
+
+ return bExist;
+ }
+
+ void CEquipment::getGlassList(std::list<CGlass*>& list)
+ {
+ Lock();
+ for (auto item : m_glassList) {
+ item->addRef();
+ list.push_back(item);
+ }
+ Unlock();
+ }
+
+ CGlass* CEquipment::getFrontGlass()
+ {
+ CGlass* pGlass = nullptr;
+
+ Lock();
+ if (!m_glassList.empty()) {
+ pGlass = m_glassList.front();
+ }
+ Unlock();
+
+ 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;
+ }
+
+ 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();
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3