From 3896bd8be7e7db15e5e1b9f3c07469ad614c8a74 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 19 九月 2025 17:01:33 +0800
Subject: [PATCH] 1.结批处理； 2.Process Job修复未绑定context的问题；
---
SourceCode/Bond/Servo/CLoadPort.cpp | 249 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 188 insertions(+), 61 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index aa096e3..ebd1690 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -2,35 +2,21 @@
#include "CLoadPort.h"
#include "CGlassPool.h"
#include "Servo.h"
+#include "ServoCommo.h"
-
-#define CHECK_READ_STEP_SIGNAL2(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_SIGNAL2(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 {
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;
m_bAutoChangeEnable = FALSE;
m_nNextCassetteSequenceNo = 0;
+ m_isCompareMapsBeforeProceeding = FALSE;
}
CLoadPort::~CLoadPort()
@@ -58,7 +44,7 @@
void CLoadPort::initPins()
{
// 加入Pin初始化代码
- LOGI("<CLoadPort>initPins");
+ LOGD("<CLoadPort>initPins");
addPin(SERVO::PinType::INPUT, _T("In"));
addPin(SERVO::PinType::OUTPUT, _T("Out"));
}
@@ -129,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;
});
@@ -149,7 +136,7 @@
CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
- m_cassetteType = (CassetteType)CToolUnits::toInt16(pszData);
+ //m_cassetteType = (CassetteType)CToolUnits::toInt16(pszData);
}
return 0;
});
@@ -362,6 +349,50 @@
void CLoadPort::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
+
+
+ // 从配置读出的enable，初始化时写给efem
+ static int i_enable[4] = { 0 };
+ if ((++i_enable[m_nIndex]) == 20 + 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] = {0};
+ CStep* pStep = getStepWithName(STEP_EQ_PORT1_BLOCKED);
+ CPortStatusReport portStatusReport;
+ portStatusReport.setPortStatus(PORT_BLOCKED);
+ 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_BLOCKED);
+ CPortStatusReport portStatusReport;
+ portStatusReport.setPortStatus(PORT_BLOCKED);
+ portStatusReport.setJobExistenceSlot(0xff );
+ portStatusReport.setCassetteId("CID1004");
+ int nRet = portStatusReport.serialize(szBuffer, 64);
+ decodePortStatusReport(pStep, szBuffer, 64);
+ }
+ }
+ */
}
void CLoadPort::serialize(CArchive& ar)
@@ -370,23 +401,10 @@
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);
}
}
@@ -429,15 +447,18 @@
SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getCassetteCtrlCmdStep();
ASSERT(pStep);
- ASSERT(jobExistenceSize == 12);
- ASSERT(pJobDataA);
-
char szBuffer[1024] = { 0 };
memcpy(&szBuffer[0], &cmd, sizeof(short));
- memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
+ if (jobExistence != nullptr && jobExistenceSize == 12) {
+ memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
+ }
+
memcpy(&szBuffer[26], &slotProcess, sizeof(short));
memcpy(&szBuffer[36], &jopCount, sizeof(short));
- int nLen = pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+ if (pJobDataA != nullptr) {
+ pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+ }
+
return pStep->writeDataEx(szBuffer, 352 * 2, onWritedBlock);
}
@@ -468,9 +489,25 @@
return (m_nIndex + 1) * 1000 + m_nNextCassetteSequenceNo;
}
+ int CLoadPort::getPortCassetteSnSeed()
+ {
+ return m_nNextCassetteSequenceNo;
+ }
+
+ void CLoadPort::setPortCassetteSnSeed(int seed)
+ {
+ m_nNextCassetteSequenceNo = seed;
+ if (m_nNextCassetteSequenceNo >= 1000) {
+ m_nNextCassetteSequenceNo = 0;
+ }
+ }
+
void CLoadPort::setIndex(unsigned int index)
{
m_nIndex = index;
+
+ std::string id = "Port" + std::to_string(index + 1);
+ m_portStatusReport.setCassetteId(id.c_str());
}
unsigned int CLoadPort::getIndex()
@@ -860,12 +897,12 @@
static int autoType[] = { STEP_ID_PORT1_TYPE_AUTO_CHANGE, STEP_ID_PORT2_TYPE_AUTO_CHANGE,
STEP_ID_PORT3_TYPE_AUTO_CHANGE, STEP_ID_PORT4_TYPE_AUTO_CHANGE };
- CHECK_READ_STEP_SIGNAL2(type[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(mode[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(cassetteType[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(transferMode[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(enable[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(autoType[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(type[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(mode[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(cassetteType[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(transferMode[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(enable[m_nIndex], pszData, size);
+ CHECK_READ_STEP_SIGNAL(autoType[m_nIndex], pszData, size);
static int typeReply[] = { STEP_ID_PROT1_TYPE_CHANGE_REPLY, STEP_ID_PROT2_TYPE_CHANGE_REPLY,
@@ -881,12 +918,12 @@
static int cassetteTypeReply[] = { STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY,
STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY };
- CHECK_WRITE_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
- CHECK_WRITE_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(typeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(modeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(transferModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(enableModeReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(typeAutoReply[m_nIndex], pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(cassetteTypeReply[m_nIndex], pszData, size);
}
int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -895,6 +932,35 @@
int nRet = portStatusReport.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
m_portStatusReport.copyEx(portStatusReport);
+
+
+ // 当port状态为InUse, 比较map
+ if (m_portStatusReport.getPortStatus() == PORT_INUSE) {
+ if (m_isCompareMapsBeforeProceeding) {
+ short scanMap = getScanCassetteMap();
+ short downloadMap = getDownloadCassetteMap();
+ if (scanMap == downloadMap) {
+ generateGlassList(scanMap);
+ this->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+ }
+ else {
+ this->sendCassetteCtrlCmd(CCC_PROCESS_CANCEL, nullptr, 0, 0, 0, nullptr, nullptr);
+
+ // 抛出到应用层做提示
+ if (m_listener.onMapMismatch != nullptr) {
+ m_listener.onMapMismatch(this, scanMap, downloadMap);
+ }
+ }
+ }
+ else {
+ // 抛出到应用层做选择要加工的片子
+ generateGlassList(getScanCassetteMap());
+ }
+ }
+ if (m_listener.onPortStatusChanged != nullptr) {
+ m_listener.onPortStatusChanged(this, portStatusReport.getPortStatus(),
+ getScanCassetteMap());
+ }
// 缓存Attribute，用于调试时显示信息
@@ -909,6 +975,8 @@
LOGI("<CCassetteTranserStateStep>InUse<JobExistenceSlot:%d>",
m_portStatusReport.getJobExistenceSlot());
}
+
+
return nRet;
}
@@ -930,7 +998,7 @@
LOGI("<CLoadPort-%d>设置Port type成功.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Port type失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>设置Port type失败，code:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -960,7 +1028,7 @@
LOGI("<CLoadPort-%d>%s Port成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
}
else {
- LOGI("<CLoadPort-%d>%s Port失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+ LOGE("<CLoadPort-%d>%s Port失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -989,7 +1057,7 @@
LOGI("<CLoadPort-%d>设置Port mode成功.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Port mode失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>设置Port mode失败，code:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1002,6 +1070,7 @@
int CLoadPort::setCassetteType(CassetteType type, ONWRITED onWritedBlock/* = nullptr*/)
{
+ m_cassetteType = type;
static char* pszName[] = { STEP_PORT1_CASSETTE_TYPE_CHANGE, STEP_PORT2_CASSETTE_TYPE_CHANGE, STEP_PORT3_CASSETTE_TYPE_CHANGE, STEP_PORT4_CASSETTE_TYPE_CHANGE };
SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(pszName[m_nIndex]);
if (pStep == nullptr) {
@@ -1014,11 +1083,10 @@
// test
code = WOK;
if (code == WOK) {
- m_cassetteType = type;
LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Cassette Type失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>设置Cassette Type失败，code:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1047,7 +1115,7 @@
LOGI("<CLoadPort-%d>设置Transfer mode成功.", m_nIndex + 1);
}
else {
- LOGI("<CLoadPort-%d>设置Transfer mode失败，code:%d", m_nIndex + 1, code);
+ LOGE("<CLoadPort-%d>设置Transfer mode失败，code:%d", m_nIndex + 1, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1076,7 +1144,7 @@
LOGI("<CLoadPort-%d>%s Auto Change成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
}
else {
- LOGI("<CLoadPort-%d>%s Auto Change失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+ LOGE("<CLoadPort-%d>%s Auto Change失败，code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1117,6 +1185,18 @@
m_bAutoChangeEnable = bEnable;
}
+ short CLoadPort::getScanCassetteMap()
+ {
+ return m_portStatusReport.getJobExistenceSlot();
+ }
+
+ short CLoadPort::getDownloadCassetteMap()
+ {
+ // 暂时未实现此功能
+ short map = 0;
+ return map;
+ }
+
/*
* 生成测试用的玻璃列表
*/
@@ -1132,19 +1212,19 @@
char szBuffer[64];
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < SLOT_MAX; i++) {
if (!m_slot[i].isEnable()) continue;
CJobDataS js;
js.setCassetteSequenceNo(getNextCassetteSequenceNo());
js.setJobSequenceNo(m_slot[i].getNo());
sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
- //js.setGlass1Id(szBuffer);
js.setJobType(1);
js.setMaterialsType((int)type);
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
- pGlass->addPath(m_nID, 0);
+ pGlass->setOriginPort(m_nIndex, i);
+ pGlass->addPath(m_nID, 0, i + 1);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
pGlass->setType(type);
@@ -1154,6 +1234,47 @@
return 0;
}
+
+ /*
+ * 根据efem扫描到的map，生成玻璃列表
+ */
+ int CLoadPort::generateGlassList(short map)
+ {
+ // 先释放较早前的数据
+ Lock();
+ for (int i = 0; i < SLOT_MAX; i++) {
+ m_slot[i].setContext(nullptr);
+ }
+ Unlock();
+
+
+ // 根据map生成新的
+ char szBuffer[64];
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (((map >> i) & 1) == 0) continue;
+
+ CJobDataS js;
+ js.setCassetteSequenceNo(getNextCassetteSequenceNo());
+ js.setJobSequenceNo(m_slot[i].getNo());
+ sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
+ js.setJobType(1);
+ js.setMaterialsType((int)m_cassetteType);
+
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->setOriginPort(m_nIndex, i);
+ pGlass->setScheduledForProcessing(i % 2 == 1);
+ pGlass->addPath(m_nID, 0, i + 1);
+ pGlass->processEnd(m_nID, 0);
+ pGlass->setID(szBuffer);
+ pGlass->setType(m_cassetteType);
+ pGlass->setJobDataS(&js);
+ m_slot[i].setContext(pGlass);
+ }
+
+ return 0;
+ }
+
int CLoadPort::testGenerateGlassListFromConfig(const SERVO::PortConfig& config)
{
@@ -1182,7 +1303,8 @@
js.setGlass1Id(szBuffer);
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
- pGlass->addPath(m_nID, 0);
+ pGlass->setOriginPort(m_nIndex, nSlotIndex);
+ pGlass->addPath(m_nID, 0, slot.nSlotID);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));
@@ -1193,4 +1315,9 @@
return 0;
}
+
+ void CLoadPort::setCompareMapsBeforeProceeding(BOOL bCompare)
+ {
+ m_isCompareMapsBeforeProceeding = bCompare;
+ }
}
--
Gitblit v1.9.3