From 6747bc043d0af20d6fa02a6cf385d81eb44643d0 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 28 六月 2025 11:29:42 +0800
Subject: [PATCH] 1.自绘按钮，修改为支持文字在按钮下，或在按钮右。 2.日志页，修改为“包含”和“排除”关键字，以及正则表达式的支持，便于在调试过程中快速观察日志
---
SourceCode/Bond/Servo/CLoadPort.cpp | 201 +++++++++++++++++++++++++++++++------------------
1 files changed, 127 insertions(+), 74 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 75353d3..25d2306 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -12,6 +12,14 @@
} \
}
+#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()
{
@@ -22,6 +30,7 @@
m_transferMode = TransferMode::AGVMode;
m_bEnable = FALSE;
m_bAutoChangeEnable = FALSE;
+ m_nNextCassetteSequenceNo = 0;
}
CLoadPort::~CLoadPort()
@@ -57,30 +66,12 @@
// 必须要实现的虚函数，在此初始化Slot信息
void CLoadPort::initSlots()
{
- m_slot[0].enable();
- m_slot[0].setPosition(m_nID);
- m_slot[0].setNo(1);
- m_slot[0].setName("Slot 1");
- m_slot[1].enable();
- m_slot[1].setPosition(m_nID);
- m_slot[1].setNo(2);
- m_slot[1].setName("Slot 2");
- m_slot[2].setPosition(m_nID);
- m_slot[2].enable();
- m_slot[2].setNo(3);
- m_slot[2].setName("Slot 3");
- m_slot[3].setPosition(m_nID);
- m_slot[3].enable();
- m_slot[3].setNo(4);
- m_slot[3].setName("Slot 4");
- m_slot[4].setPosition(m_nID);
- m_slot[4].enable();
- m_slot[4].setNo(5);
- m_slot[4].setName("Slot 5");
- m_slot[5].setPosition(m_nID);
- m_slot[5].enable();
- m_slot[5].setNo(6);
- m_slot[5].setName("Slot 6");
+ for (int i = 0; i < SLOT_MAX; i++) {
+ m_slot[i].enable();
+ m_slot[i].setPosition(m_nID);
+ m_slot[i].setNo(i + 1);
+ m_slot[i].setName((std::string("Slot") + std::to_string(i+1)).c_str());
+ }
}
void CLoadPort::initSteps()
@@ -110,7 +101,7 @@
// Type
static char* pszName[] = { STEP_EQ_PORT1_TYPE, STEP_EQ_PORT2_TYPE, STEP_EQ_PORT3_TYPE, STEP_EQ_PORT4_TYPE };
static int dev[] = { 0x6010 , 0x6020, 0x6030, 0x6040 };
- static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
+ static int writeSignalDev[] = { 0x90, 0x91, 0x92, 0x93 };
static int addr[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE, STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -131,7 +122,7 @@
// Mode
static char* pszName[] = { STEP_EQ_PORT1_MODE, STEP_EQ_PORT2_MODE, STEP_EQ_PORT3_MODE, STEP_EQ_PORT4_MODE };
static int dev[] = { 0x6011, 0x6021, 0x6031, 0x6041 };
- static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
+ static int writeSignalDev[] = { 0x98, 0x99, 0x9a, 0x9b };
static int addr[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE, STEP_ID_PORT3_MODE_CHANGE, STEP_ID_PORT4_MODE_CHANGE };
CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -152,7 +143,7 @@
// Cassette type
static char* pszName[] = { STEP_EQ_PORT1_CASSETTE_TYPE, STEP_EQ_PORT2_CASSETTE_TYPE, STEP_EQ_PORT3_CASSETTE_TYPE, STEP_EQ_PORT4_CASSETTE_TYPE };
static int dev[] = { 0x6012, 0x6022, 0x6032, 0x6042 };
- static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
+ static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
static int addr[] = { STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, STEP_ID_PORT4_CASSETTE_TYPE_CHANGE };
CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -173,7 +164,7 @@
// Transfer type
static char* pszName[] = { STEP_EQ_PORT1_TRANSFER_MODE, STEP_EQ_PORT2_TRANSFER_MODE, STEP_EQ_PORT3_TRANSFER_MODE, STEP_EQ_PORT4_TRANSFER_MODE };
static int dev[] = { 0x6014, 0x6024, 0x6034, 0x6044 };
- static int writeSignalDev[] = { 0xb8, 0xb9, 0xba, 0xbb };
+ static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
static int addr[] = { STEP_ID_PORT1_TRANSFER_MODE_CHANGE, STEP_ID_PORT2_TRANSFER_MODE_CHANGE, STEP_ID_PORT3_TRANSFER_MODE_CHANGE, STEP_ID_PORT4_TRANSFER_MODE_CHANGE };
CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -194,7 +185,7 @@
// Port enable
static char* pszName[] = { STEP_EQ_PORT1_ENABLE, STEP_EQ_PORT2_ENABLE, STEP_EQ_PORT3_ENABLE, STEP_EQ_PORT4_ENABLE };
static int dev[] = { 0x6015, 0x6025, 0x6035, 0x6045 };
- static int writeSignalDev[] = { 0xc0, 0xc1, 0xc2, 0xc3 };
+ static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
static int addr[] = { STEP_ID_PORT1_ENABLE_MODE_CHANGE, STEP_ID_PORT2_ENABLE_MODE_CHANGE, STEP_ID_PORT3_ENABLE_MODE_CHANGE, STEP_ID_PORT4_ENABLE_MODE_CHANGE };
CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -317,7 +308,7 @@
pStep->setName(pszName[m_nIndex]);
pStep->setWriteSignalDev(0x128 + m_nIndex);
pStep->setDataDev(dev[m_nIndex]);
- if (addStep(STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+ if (addStep(STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
delete pStep;
}
}
@@ -378,23 +369,23 @@
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;
+ //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;
+ //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);
}
}
@@ -459,6 +450,16 @@
Unlock();
return pStep;
+ }
+
+ short CLoadPort::getNextCassetteSequenceNo()
+ {
+ m_nNextCassetteSequenceNo++;
+ if (m_nNextCassetteSequenceNo >= 1000) {
+ m_nNextCassetteSequenceNo = 0;
+ }
+
+ return (m_nIndex + 1) * 1000 + m_nNextCassetteSequenceNo;
}
void CLoadPort::setIndex(unsigned int index)
@@ -838,6 +839,8 @@
void CLoadPort::onReceiveLBData(const char* pszData, size_t size)
{
+ __super::onReceiveLBData(pszData, size);
+
static int type[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE,
STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
static int mode[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE,
@@ -872,12 +875,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_READ_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
- CHECK_READ_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
+ 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);
}
int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -890,10 +893,8 @@
// 缓存Attribute，用于调试时显示信息
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
m_portStatusReport.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
-
LOGI("<CCassetteTranserStateStep>decodePortStatusReport<Status:%d, CassetteSequenceNo:%d>",
m_portStatusReport.getPortStatus(), m_portStatusReport.getCassetteSequenceNo());
@@ -1077,16 +1078,41 @@
return 0;
}
+ void CLoadPort::localEanblePort(BOOL bEnable)
+ {
+ m_bEnable = bEnable;
+ }
+
+ void CLoadPort::localSetPortType(PortType type)
+ {
+ m_portType = type;
+ }
+
+ void CLoadPort::localSetPortMode(PortMode mode)
+ {
+ m_portMode = mode;
+ }
+
+ void CLoadPort::localSetCessetteType(CassetteType type)
+ {
+ m_cassetteType = type;
+ }
+
+ void CLoadPort::localSetTransferMode(TransferMode mode)
+ {
+ m_transferMode = mode;
+ }
+
+ void CLoadPort::localAutoChangeEnable(BOOL bEnable)
+ {
+ m_bAutoChangeEnable = bEnable;
+ }
+
/*
* 生成测试用的玻璃列表
*/
- int CLoadPort::testGenerateGlassList(MaterialsType type, const char* pszPrefix, int startSuffix)
+ int CLoadPort::testGenerateGlassList(MaterialsType type)
{
- static unsigned short nJobSequenceNo = 0;
- static unsigned short nCassetteSequenceNo = 0;
- nCassetteSequenceNo++;
-
-
// 如果非空就不生成了
Lock();
if (hasGlass()) {
@@ -1097,32 +1123,21 @@
char szBuffer[64];
- int suffix = startSuffix;
- for (int i = 0; i < SLOT_MAX; i++) {
+ for (int i = 0; i < 1; i++) {
if (!m_slot[i].isEnable()) continue;
- CJobDataB jb;
CJobDataS js;
-
- sprintf_s(szBuffer, "%s%d", pszPrefix, suffix++);
- jb.setGlassId(szBuffer);
- jb.setCassetteSequenceNo(nCassetteSequenceNo);
- jb.setJobSequenceNo(++nJobSequenceNo);
+ 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);
- js.setCassetteSequenceNo(nCassetteSequenceNo);
- js.setJobSequenceNo(nJobSequenceNo);
- if (type == MaterialsType::G1) {
- js.setGlass1Id(szBuffer);
- }
- else if (type == MaterialsType::G2) {
- js.setGlass2Id(szBuffer);
- }
CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
pGlass->addPath(m_nID, 0);
pGlass->processEnd(m_nID, 0);
pGlass->setID(szBuffer);
- pGlass->setJobDataB(&jb);
pGlass->setType(type);
pGlass->setJobDataS(&js);
m_slot[i].setContext(pGlass);
@@ -1131,4 +1146,42 @@
return 0;
}
+ int CLoadPort::testGenerateGlassListFromConfig(const SERVO::PortConfig& config)
+ {
+ char szBuffer[64];
+ for (const auto& slot : config.vecSlot) {
+ int nSlotIndex = slot.nSlotID - 1;
+ if (nSlotIndex < 0 || nSlotIndex >= SLOT_MAX) {
+ continue;
+ }
+ if (!slot.isEnabled) {
+ m_slot[nSlotIndex].setContext(nullptr);
+ continue;
+ }
+
+ CJobDataS js;
+ js.setCassetteSequenceNo(getNextCassetteSequenceNo());
+ js.setJobSequenceNo(m_slot[nSlotIndex].getNo());
+
+ sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
+ js.setJobType(1);
+ js.setMaterialsType(config.nMaterialType);
+
+ js.setLotId(config.strLotID.c_str());
+ js.setProductId(config.strProductID.c_str());
+ js.setOperationId(config.strOperationID.c_str());
+ js.setGlass1Id(szBuffer);
+
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->addPath(m_nID, 0);
+ pGlass->processEnd(m_nID, 0);
+ pGlass->setID(szBuffer);
+ pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));
+ pGlass->setJobDataS(&js);
+
+ m_slot[nSlotIndex].setContext(pGlass);
+ }
+
+ return 0;
+ }
}
--
Gitblit v1.9.3