From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CLoadPort.cpp | 157 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 136 insertions(+), 21 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index f6afed4..9fe24b5 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -9,13 +9,14 @@
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()
@@ -114,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;
});
@@ -134,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;
});
@@ -347,6 +349,50 @@
void CLoadPort::onTimer(UINT nTimerid)
{
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] = {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)
@@ -355,23 +401,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);
}
}
@@ -884,10 +918,34 @@
if (nRet < 0) return nRet;
m_portStatusReport.copyEx(portStatusReport);
- if (m_portStatusReport.getPortStatus() == PORT_INUSE) {
- this->sendCassetteCtrlCmd(5, nullptr, 0, 0, 0, nullptr, nullptr);
- }
+ // 当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，用于调试时显示信息
@@ -997,6 +1055,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) {
@@ -1009,7 +1068,6 @@
// test
code = WOK;
if (code == WOK) {
- m_cassetteType = type;
LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
}
else {
@@ -1112,6 +1170,18 @@
m_bAutoChangeEnable = bEnable;
}
+ short CLoadPort::getScanCassetteMap()
+ {
+ return m_portStatusReport.getJobExistenceSlot();
+ }
+
+ short CLoadPort::getDownloadCassetteMap()
+ {
+ // 暂时未实现此功能
+ short map = 0;
+ return map;
+ }
+
/*
* 生成测试用的玻璃列表
*/
@@ -1127,14 +1197,13 @@
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);
@@ -1150,6 +1219,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);
+ 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)
{
@@ -1190,4 +1300,9 @@
return 0;
}
+
+ void CLoadPort::setCompareMapsBeforeProceeding(BOOL bCompare)
+ {
+ m_isCompareMapsBeforeProceeding = bCompare;
+ }
}
--
Gitblit v1.9.3