From 7667ca13252c267bc87d56ec1277badaefb90e55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 16 十二月 2025 10:38:54 +0800
Subject: [PATCH] 1.Check SlotMap，ProceedWithSlotMap，SlotMap Verify OK上报实现，但某些数据需要和客户协商。已写入注释
---
SourceCode/Bond/Servo/CLoadPort.cpp | 316 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 224 insertions(+), 92 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index f23f005..c50245b 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -1,36 +1,23 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
#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;
+ m_downloadCassetteMap = 0;
}
CLoadPort::~CLoadPort()
@@ -54,16 +41,16 @@
CEquipment::term();
}
- // 必须要实现的虚函数，在此初始化Pin列表
+ // 蹇呴』瑕佸疄鐜扮殑铏氬嚱鏁帮紝鍦ㄦ鍒濆鍖朠in鍒楄〃
void CLoadPort::initPins()
{
- // 加入Pin初始化代码
- LOGI("<CLoadPort>initPins");
+ // 鍔犲叆Pin鍒濆鍖栦唬鐮�
+ LOGD("<CLoadPort>initPins");
addPin(SERVO::PinType::INPUT, _T("In"));
addPin(SERVO::PinType::OUTPUT, _T("Out"));
}
- // 必须要实现的虚函数，在此初始化Slot信息
+ // 蹇呴』瑕佸疄鐜扮殑铏氬嚱鏁帮紝鍦ㄦ鍒濆鍖朣lot淇℃伅
void CLoadPort::initSlots()
{
for (int i = 0; i < SLOT_MAX; i++) {
@@ -83,15 +70,15 @@
{
// Cassette Ctrl Cmd
- static char* pszName[] = { STEP_EQ_P1_CASSETTE_CTRL_CMD, STEP_EQ_P2_CASSETTE_CTRL_CMD, STEP_EQ_P3_CASSETTE_CTRL_CMD, STEP_EQ_P4_CASSETTE_CTRL_CMD };
- static int writeSignalDev[] = { 0x120, 0x121, 0x122, 0x123 };
+ static char* pszName[] = { STEP_EQ_P1_CASSETTE_CTRL_CMD, STEP_EQ_P2_CASSETTE_CTRL_CMD, STEP_EQ_P3_CASSETTE_CTRL_CMD, STEP_EQ_P4_CASSETTE_CTRL_CMD };
+ static int writeSignalDev[] = { 0x130, 0x131, 0x132, 0x133 };
static int dev[] = { 0x45, 0x1a5, 0x305, 0x465 };
- static int addr[] = { 0x480, 0x481, 0x482, 0x483 };
+ static int addr[] = { STEP_ID_PROT1_CASSETTE_CTR_CMD_REPLY, STEP_ID_PROT2_CASSETTE_CTR_CMD_REPLY, STEP_ID_PROT3_CASSETTE_CTR_CMD_REPLY, STEP_ID_PROT4_CASSETTE_CTR_CMD_REPLY };
- CEqCassetteCtrlCmdStep* pStep = new CEqCassetteCtrlCmdStep();
+ CEqWriteStep* pStep = new CEqWriteStep();
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(writeSignalDev[m_nIndex]);
- pStep->setCtrlCmdDev(dev[m_nIndex]);
+ pStep->setDataDev(dev[m_nIndex]);
if (addStep(addr[m_nIndex], pStep) != 0) {
delete pStep;
}
@@ -129,6 +116,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 +137,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;
});
@@ -324,12 +312,12 @@
};
static int dev[] = { 0x6050, 0x6070, 0x6090, 0x60b0 };
static int writeSignalDev[6][4] = {
+ {0xc8, 0xc9, 0xca, 0xcb},
+ {0xd0, 0xd1, 0xd2, 0xd3},
{0xd8, 0xd9, 0xda, 0xdb},
{0xe0, 0xe1, 0xe2, 0xe3},
{0xe8, 0xe9, 0xea, 0xeb},
- {0xf0, 0xf1, 0xf2, 0xf3},
- {0xf8, 0xf9, 0xfa, 0xfb},
- {0x100, 0x101, 0x102, 0x103}
+ {0xf0, 0xf1, 0xf2, 0xf3}
};
static int addr[6][4] = {
{ STEP_ID_PORT1_EMPTY, STEP_ID_PORT2_EMPTY, STEP_ID_PORT3_EMPTY, STEP_ID_PORT4_EMPTY },
@@ -362,6 +350,50 @@
void CLoadPort::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
+
+
+ // 浠庨厤缃鍑虹殑enable锛屽垵濮嬪寲鏃跺啓缁檈fem
+ 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 +402,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);
}
}
@@ -423,17 +442,25 @@
int jobExistenceSize,
short slotProcess,
short jopCount,
- CJobDataA* pJobDataA)
+ CJobDataA* pJobDataA,
+ ONWRITED onWritedBlock)
{
- int id = getID();
- if ( !(id == EQ_ID_LOADPORT1 || id == EQ_ID_LOADPORT2) ) {
- return -1;
+ SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getCassetteCtrlCmdStep();
+ ASSERT(pStep);
+
+ char szBuffer[1024] = { 0 };
+ memcpy(&szBuffer[0], &cmd, sizeof(short));
+ if (jobExistence != nullptr && jobExistenceSize == 12) {
+ memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
}
+ memcpy(&szBuffer[26], &slotProcess, sizeof(short));
+ memcpy(&szBuffer[36], &jopCount, sizeof(short));
+ if (pJobDataA != nullptr) {
+ pJobDataA->serialize(&szBuffer[38], 1024 - 38);
+ }
- SERVO::CEqCassetteCtrlCmdStep* pStep = (SERVO::CEqCassetteCtrlCmdStep*)getCassetteCtrlCmdStep();
- ASSERT(pStep);
- return pStep->sendCtrlCmd(cmd, jobExistence, jobExistenceSize, slotProcess, jopCount, pJobDataA);
+ return pStep->writeDataEx(szBuffer, 352 * 2, onWritedBlock);
}
CStep* CLoadPort::getCassetteCtrlCmdStep()
@@ -463,9 +490,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()
@@ -855,12 +898,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,
@@ -876,12 +919,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)
@@ -892,13 +935,35 @@
m_portStatusReport.copyEx(portStatusReport);
- // 缓存Attribute，用于调试时显示信息
+ // 褰損ort鐘舵�佷负InUse, 姣旇緝map
+ if (m_portStatusReport.getPortStatus() == PORT_INUSE) {
+ // 鐢熸垚鐜荤拑鍒楄〃锛氭潵鑷� EFEM 鎵弿鍒扮殑 map
+ generateGlassList(getScanCassetteMap());
+
+ // CompareMapsBeforeProceeding锛氫笉鍦ㄦ澶勮嚜鍔� Start/Cancel锛屾敼涓虹瓑寰� Host 鍐崇瓥锛圥roceedWithCarrier/ProceedWithSlotMap/CarrierRelease锛�
+ // Host 鍐崇瓥鍏ュ彛锛歋3F17 CarrierAction -> listener.onCarrierAction -> CMaster::proceedWithCarrier()/carrierRelease()
+ if (m_isCompareMapsBeforeProceeding) {
+ // 杩欓噷浠呯瓑寰咃紝鍏蜂綋涓婃姤鐢变笂灞傚湪 PORT_INUSE 浜嬩欢涓Е鍙戯紙S6F11 CheckSlotMap锛�
+ }
+ }
+ if (m_listener.onPortStatusChanged != nullptr) {
+ m_listener.onPortStatusChanged(this, portStatusReport.getPortStatus(),
+ getScanCassetteMap());
+ }
+
+
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
CAttributeVector& attrubutes = pStep->attributeVector();
m_portStatusReport.getAttributeVector(attrubutes, weight);
- LOGI("<CCassetteTranserStateStep>decodePortStatusReport<Status:%d, CassetteSequenceNo:%d>",
- m_portStatusReport.getPortStatus(), m_portStatusReport.getCassetteSequenceNo());
+ LOGI("<CCassetteTranserStateStep>decodePortStatusReport<Status:%d, CassetteSequenceNo:%d, CassetteId:%s>",
+ m_portStatusReport.getPortStatus(), m_portStatusReport.getCassetteSequenceNo(),
+ m_portStatusReport.getCassetteId().c_str());
+ if (m_portStatusReport.getPortStatus() == 3) {
+ LOGI("<CCassetteTranserStateStep>InUse<JobExistenceSlot:%d>",
+ m_portStatusReport.getJobExistenceSlot());
+ }
return nRet;
@@ -912,17 +977,17 @@
return -1;
}
- LOGI("<CLoadPort-%d>准备设置Port type<%d>", m_nIndex, (int)type);
+ LOGI("<CLoadPort-%d>鍑嗗璁剧疆Port type<%d>", m_nIndex, (int)type);
short value = (short)type;
pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
// test
code = WOK;
if (code == WOK) {
m_portType = type;
- LOGI("<CLoadPort-%d>设置Port type成功.", m_nIndex);
+ LOGI("<CLoadPort-%d>璁剧疆Port type鎴愬姛.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Port type失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>璁剧疆Port type澶辫触锛宑ode:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -942,17 +1007,17 @@
return -1;
}
- LOGI("<CLoadPort-%d>准备%s Port", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+ LOGI("<CLoadPort-%d>鍑嗗%s Port", m_nIndex, bEnable ? _T("鍚敤") : _T("绂佺敤"));
short value = bEnable ? 1 : 2;
pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
// test
code = WOK;
if (code == WOK) {
m_bEnable = bEnable;
- LOGI("<CLoadPort-%d>%s Port成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+ 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澶辫触锛宑ode:%d", m_nIndex, bEnable ? _T("鍚敤") : _T("绂佺敤"), code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -971,17 +1036,17 @@
return -1;
}
- LOGI("<CLoadPort-%d>准备设置Port mode<%d>", m_nIndex, (int)mode);
+ LOGI("<CLoadPort-%d>鍑嗗璁剧疆Port mode<%d>", m_nIndex, (int)mode);
short value = (short)mode;
pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
// test
code = WOK;
if (code == WOK) {
m_portMode = mode;
- LOGI("<CLoadPort-%d>设置Port mode成功.", m_nIndex);
+ LOGI("<CLoadPort-%d>璁剧疆Port mode鎴愬姛.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Port mode失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>璁剧疆Port mode澶辫触锛宑ode:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -994,23 +1059,23 @@
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) {
return -1;
}
- LOGI("<CLoadPort-%d>准备设置Cassette Type<%d>", m_nIndex, (int)type);
+ LOGI("<CLoadPort-%d>鍑嗗璁剧疆Cassette Type<%d>", m_nIndex, (int)type);
short value = (short)type;
pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
// test
code = WOK;
if (code == WOK) {
- m_cassetteType = type;
- LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
+ LOGI("<CLoadPort-%d>璁剧疆Cassette Type鎴愬姛.", m_nIndex);
}
else {
- LOGI("<CLoadPort-%d>设置Cassette Type失败，code:%d", m_nIndex, code);
+ LOGE("<CLoadPort-%d>璁剧疆Cassette Type澶辫触锛宑ode:%d", m_nIndex, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1029,17 +1094,17 @@
return -1;
}
- LOGI("<CLoadPort-%d>准备设置Transfer mode<%d>", m_nIndex, (int)mode);
+ LOGI("<CLoadPort-%d>鍑嗗璁剧疆Transfer mode<%d>", m_nIndex, (int)mode);
short value = (short)mode;
pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
// test
code = WOK;
if (code == WOK) {
m_transferMode = mode;
- LOGI("<CLoadPort-%d>设置Transfer mode成功.", m_nIndex + 1);
+ 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澶辫触锛宑ode:%d", m_nIndex + 1, code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1058,17 +1123,17 @@
return -1;
}
- LOGI("<CLoadPort-%d>准备%s Auto Change", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+ LOGI("<CLoadPort-%d>鍑嗗%s Auto Change", m_nIndex, bEnable ? _T("鍚敤") : _T("绂佺敤"));
short value = bEnable ? 1 : 2;
pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
// test
code = WOK;
if (code == WOK) {
m_bAutoChangeEnable = bEnable;
- LOGI("<CLoadPort-%d>%s Auto Change成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+ 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澶辫触锛宑ode:%d", m_nIndex, bEnable ? _T("鍚敤") : _T("绂佺敤"), code);
}
if (onWritedBlock != nullptr) {
return onWritedBlock(code);
@@ -1109,12 +1174,27 @@
m_bAutoChangeEnable = bEnable;
}
+ short CLoadPort::getScanCassetteMap()
+ {
+ return m_portStatusReport.getJobExistenceSlot();
+ }
+
+ short CLoadPort::getDownloadCassetteMap()
+ {
+ return m_downloadCassetteMap;
+ }
+
+ void CLoadPort::setDownloadCassetteMap(short map)
+ {
+ m_downloadCassetteMap = map;
+ }
+
/*
- * 生成测试用的玻璃列表
+ * 鐢熸垚娴嬭瘯鐢ㄧ殑鐜荤拑鍒楄〃
*/
int CLoadPort::testGenerateGlassList(MaterialsType type)
{
- // 如果非空就不生成了
+ // 濡傛灉闈炵┖灏变笉鐢熸垚浜�
Lock();
if (hasGlass()) {
Unlock();
@@ -1124,19 +1204,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);
@@ -1146,6 +1226,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)
{
@@ -1174,7 +1295,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));
@@ -1185,4 +1307,14 @@
return 0;
}
+
+ void CLoadPort::setCompareMapsBeforeProceeding(BOOL bCompare)
+ {
+ m_isCompareMapsBeforeProceeding = bCompare;
+ }
+
+ BOOL CLoadPort::isCompareMapsBeforeProceeding() const
+ {
+ return m_isCompareMapsBeforeProceeding;
+ }
}
--
Gitblit v1.9.3