From 697fa6b857fe202fe2e5f50d4ecf2c7268e527cc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 15 八月 2025 15:22:19 +0800
Subject: [PATCH] 1.变量(代EAP查询的数据)增加列表类型； 2.实现ProcessJob Queued上报功能；
---
SourceCode/Bond/Servo/CLoadPort.cpp | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 5de17db..28ce403 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -9,8 +9,8 @@
CLoadPort::CLoadPort() : CEquipment()
{
m_nIndex = 0;
- m_portType = PortType::Loading;
- m_portMode = PortMode::ReadyToLoad;
+ m_portType = PortType::Both;
+ m_portMode = PortMode::OutOfService;
m_cassetteType = CassetteType::G1;
m_transferMode = TransferMode::AGVMode;
m_bEnable = FALSE;
@@ -115,6 +115,7 @@
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
m_portMode = (PortMode)CToolUnits::toInt16(pszData);
+ LOGI("<LoadPort-%d>m_portMode:%d", m_nIndex, m_portMode);
}
return 0;
});
@@ -349,16 +350,43 @@
{
CEquipment::onTimer(nTimerid);
+
+ // 从配置读出的enable，初始化时写给efem
+ static int i_enable[4] = { 0 };
+ if ((++i_enable[m_nIndex]) == 10 + m_nIndex) {
+ eablePort(m_bEnable, [&](int code) -> int {
+ LOGI("<LoadPort-%d>eablePort:code=%d", m_nIndex, code);
+ return 0;
+ });
+ }
+
+
+
// 模拟测试
if (m_nIndex == 0) {
static int ii = 0;
ii++;
if (ii == 50) {
- char szBuffer[64];
+ char szBuffer[64] = {0};
CStep* pStep = getStepWithName(STEP_EQ_PORT1_INUSE);
CPortStatusReport portStatusReport;
portStatusReport.setPortStatus(PORT_INUSE);
portStatusReport.setJobExistenceSlot(0xf);
+ portStatusReport.setCassetteId("CID1001");
+ int nRet = portStatusReport.serialize(szBuffer, 64);
+ decodePortStatusReport(pStep, szBuffer, 64);
+ }
+ }
+ if (m_nIndex == 1) {
+ static int ii = 0;
+ ii++;
+ if (ii == 55) {
+ char szBuffer[64] = { 0 };
+ CStep* pStep = getStepWithName(STEP_EQ_PORT2_INUSE);
+ CPortStatusReport portStatusReport;
+ portStatusReport.setPortStatus(PORT_INUSE);
+ portStatusReport.setJobExistenceSlot(0xf);
+ portStatusReport.setCassetteId("CID1004");
int nRet = portStatusReport.serialize(szBuffer, 64);
decodePortStatusReport(pStep, szBuffer, 64);
}
@@ -371,23 +399,11 @@
if (ar.IsStoring()) {
ar << m_nIndex;
- //ar << (int)m_portType;
- //ar << (int)m_portMode;
- //ar << (int)m_cassetteType;
- //ar << (int)m_transferMode;
- //ar << m_bEnable;
- //ar << m_bAutoChangeEnable;
m_portStatusReport.serialize(ar);
}
else {
int temp;
ar >> m_nIndex;
- //ar >> temp; m_portType = (PortType)temp;
- //ar >> temp; m_portMode = (PortMode)temp;
- //ar >> temp; m_cassetteType = (CassetteType)temp;
- //ar >> temp; m_transferMode = (TransferMode)temp;
- //ar >> m_bEnable;
- //ar >> m_bAutoChangeEnable;
m_portStatusReport.serialize(ar);
}
}
@@ -922,12 +938,12 @@
else {
// 抛出到应用层做选择要加工的片子
generateGlassList(getScanCassetteMap());
- if (m_listener.onPortInUse != nullptr) {
- m_listener.onPortInUse(this, getScanCassetteMap());
- }
}
}
-
+ if (m_listener.onPortStatusChanged != nullptr) {
+ m_listener.onPortStatusChanged(this, portStatusReport.getPortStatus(),
+ getScanCassetteMap());
+ }
// 缓存Attribute，用于调试时显示信息
--
Gitblit v1.9.3