From 5fe38f3aa84459690a59667bff205f3f350c086c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 28 四月 2025 18:03:39 +0800
Subject: [PATCH] 1.把LoadPort相关的step移到CLoadPort下，交它们当前efem的子设备来处理，逻辑上比较顺。
---
SourceCode/Bond/Servo/CMaster.cpp | 321 ++++++++++++++++++-----------------------------------
1 files changed, 111 insertions(+), 210 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index c05e973..e38b2b2 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -100,14 +100,21 @@
// 初始化添加各子设备
- addLoadPort(0);
- addLoadPort(1);
- addLoadPort(2);
- addLoadPort(3);
+ CLoadPort* pPort1, * pPort2, * pPort3, * pPort4;
+ CEFEM* pEfem;
+ pPort1 = addLoadPort(0);
+ pPort2 = addLoadPort(1);
+ pPort3 = addLoadPort(2);
+ pPort4 = addLoadPort(3);
+ pEfem = addEFEM();
+ pEfem->setPort(0, pPort1);
+ pEfem->setPort(1, pPort1);
+ pEfem->setPort(2, pPort1);
+ pEfem->setPort(3, pPort1);
+
addFliper();
addVacuumBake();
addAligner();
- addEFEM();
addBonder(0);
addBonder(1);
addBakeCooling();
@@ -232,10 +239,11 @@
return nullptr;
}
- /* 添加LoadPort1
+ /*
+ * 添加LoadPort1
* index -- 0~3
*/
- int CMaster::addLoadPort(int index)
+ CLoadPort* CMaster::addLoadPort(int index)
{
ASSERT(index == 0 || index == 1 || index == 2 || index == 3);
static char* pszCassetteCtrlCmd[] = {
@@ -252,6 +260,7 @@
char szName[64];
sprintf_s(szName, 64, "LoadPort %d", index + 1);
CLoadPort* pEquipment = new CLoadPort();
+ pEquipment->setIndex(index);
pEquipment->setID(EQ_ID_LOADPORT1 + index);
pEquipment->setName(szName);
pEquipment->setDescription(szName);
@@ -270,11 +279,102 @@
}
+ {
+ // Type
+ char* pszName[] = { STEP_EQ_PORT1_TYPE, STEP_EQ_PORT2_TYPE, STEP_EQ_PORT3_TYPE, STEP_EQ_PORT4_TYPE };
+ int dev[] = { 0x6010 , 0x6020, 0x6030, 0x6040 };
+ int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
+ int addr[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE, STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
+
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+ pStep->setName(pszName[index]);
+ pStep->setWriteSignalDev(writeSignalDev[index]);
+ if (pEquipment->addStep(addr[index], pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // Mode
+ char* pszName[] = { STEP_EQ_PORT1_MODE, STEP_EQ_PORT2_MODE, STEP_EQ_PORT3_MODE, STEP_EQ_PORT4_MODE };
+ int dev[] = { 0x6011, 0x6021, 0x6031, 0x6041};
+ int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
+ int addr[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE, STEP_ID_PORT3_MODE_CHANGE, STEP_ID_PORT4_MODE_CHANGE };
+
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+ pStep->setName(pszName[index]);
+ pStep->setWriteSignalDev(writeSignalDev[index]);
+ if (pEquipment->addStep(addr[index], pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // Cassette type
+ char* pszName[] = { STEP_EQ_PORT1_CASSETTE_TYPE, STEP_EQ_PORT2_CASSETTE_TYPE, STEP_EQ_PORT3_CASSETTE_TYPE, STEP_EQ_PORT4_CASSETTE_TYPE };
+ int dev[] = { 0x6012, 0x6022, 0x6032, 0x6042 };
+ int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
+ 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 };
+
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+ pStep->setName(pszName[index]);
+ pStep->setWriteSignalDev(writeSignalDev[index]);
+ if (pEquipment->addStep(addr[index], pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // Transfer type
+ char* pszName[] = { STEP_EQ_PORT1_TRANSFER_MODE, STEP_EQ_PORT2_TRANSFER_MODE, STEP_EQ_PORT3_TRANSFER_MODE, STEP_EQ_PORT4_TRANSFER_MODE };
+ int dev[] = { 0x6014, 0x6024, 0x6034, 0x6044 };
+ int writeSignalDev[] = { 0xb8, 0xb9, 0xba, 0xbb };
+ 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 };
+
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+ pStep->setName(pszName[index]);
+ pStep->setWriteSignalDev(writeSignalDev[index]);
+ if (pEquipment->addStep(addr[index], pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // Port enable
+ char* pszName[] = { STEP_EQ_PORT1_ENABLE, STEP_EQ_PORT2_ENABLE, STEP_EQ_PORT3_ENABLE, STEP_EQ_PORT4_ENABLE };
+ int dev[] = { 0x6015, 0x6025, 0x6035, 0x6045 };
+ int writeSignalDev[] = { 0xc0, 0xc1, 0xc2, 0xc3 };
+ 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 };
+
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+ pStep->setName(pszName[index]);
+ pStep->setWriteSignalDev(writeSignalDev[index]);
+ if (pEquipment->addStep(addr[index], pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // Type auto change
+ char* pszName[] = { STEP_EQ_PORT1_TYPE_ATUO, STEP_EQ_PORT2_TYPE_ATUO, STEP_EQ_PORT3_TYPE_ATUO, STEP_EQ_PORT4_TYPE_ATUO };
+ int dev[] = { 0x6016, 0x6026, 0x6036, 0x6046 };
+ int writeSignalDev[] = { 0xc8, 0xc9, 0xca, 0xcb };
+ int addr[] = { STEP_ID_PORT1_TYPE_AUTO_CHANGE, STEP_ID_PORT2_TYPE_AUTO_CHANGE, STEP_ID_PORT3_TYPE_AUTO_CHANGE, STEP_ID_PORT4_TYPE_AUTO_CHANGE };
+
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, dev[index]);
+ pStep->setName(pszName[index]);
+ pStep->setWriteSignalDev(writeSignalDev[index]);
+ if (pEquipment->addStep(addr[index], pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+
pEquipment->init();
LOGE("已添加“%s”.", pEquipment->getName().c_str());
- return 0;
+ return pEquipment;
}
int CMaster::addFliper()
@@ -328,7 +428,7 @@
return 0;
}
- int CMaster::addEFEM()
+ CEFEM* CMaster::addEFEM()
{
CEFEM* pEquipment = new CEFEM();
pEquipment->setID(EQ_ID_EFEM);
@@ -488,206 +588,6 @@
}
}
- // Port1
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6010);
- pStep->setName(STEP_EQ_PORT1_TYPE);
- pStep->setWriteSignalDev(0xa0);
- if (pEquipment->addStep(STEP_ID_PORT1_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6011);
- pStep->setName(STEP_EQ_PORT1_MODE);
- pStep->setWriteSignalDev(0xa8);
- if (pEquipment->addStep(STEP_ID_PORT1_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6012);
- pStep->setName(STEP_EQ_PORT1_CASSETTE_TYPE);
- pStep->setWriteSignalDev(0xb0);
- if (pEquipment->addStep(STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6014);
- pStep->setName(STEP_EQ_PORT1_TRANSFER_MODE);
- pStep->setWriteSignalDev(0xb8);
- if (pEquipment->addStep(STEP_ID_PORT1_TRANSFER_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6015);
- pStep->setName(STEP_EQ_PORT1_ENABLE);
- pStep->setWriteSignalDev(0xc0);
- if (pEquipment->addStep(STEP_ID_PORT1_ENABLE_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6016);
- pStep->setName(STEP_EQ_PORT1_TYPE_ATUO);
- pStep->setWriteSignalDev(0xc8);
- if (pEquipment->addStep(STEP_ID_PORT1_TYPE_AUTO_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
-
- // Port2
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6020);
- pStep->setName(STEP_EQ_PORT2_TYPE);
- pStep->setWriteSignalDev(0xa1);
- if (pEquipment->addStep(STEP_ID_PORT2_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6021);
- pStep->setName(STEP_EQ_PORT2_MODE);
- pStep->setWriteSignalDev(0xa9);
- if (pEquipment->addStep(STEP_ID_PORT2_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6022);
- pStep->setName(STEP_EQ_PORT2_CASSETTE_TYPE);
- pStep->setWriteSignalDev(0xb1);
- if (pEquipment->addStep(STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6024);
- pStep->setName(STEP_EQ_PORT2_TRANSFER_MODE);
- pStep->setWriteSignalDev(0xb9);
- if (pEquipment->addStep(STEP_ID_PORT2_TRANSFER_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6025);
- pStep->setName(STEP_EQ_PORT2_ENABLE);
- pStep->setWriteSignalDev(0xc1);
- if (pEquipment->addStep(STEP_ID_PORT2_ENABLE_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6026);
- pStep->setName(STEP_EQ_PORT2_TYPE_ATUO);
- pStep->setWriteSignalDev(0xc9);
- if (pEquipment->addStep(STEP_ID_PORT2_TYPE_AUTO_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
-
- // Port3
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6030);
- pStep->setName(STEP_EQ_PORT3_TYPE);
- pStep->setWriteSignalDev(0xa2);
- if (pEquipment->addStep(STEP_ID_PORT3_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6031);
- pStep->setName(STEP_EQ_PORT3_MODE);
- pStep->setWriteSignalDev(0xaa);
- if (pEquipment->addStep(STEP_ID_PORT3_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6032);
- pStep->setName(STEP_EQ_PORT3_CASSETTE_TYPE);
- pStep->setWriteSignalDev(0xb2);
- if (pEquipment->addStep(STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6034);
- pStep->setName(STEP_EQ_PORT3_TRANSFER_MODE);
- pStep->setWriteSignalDev(0xba);
- if (pEquipment->addStep(STEP_ID_PORT3_TRANSFER_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6035);
- pStep->setName(STEP_EQ_PORT3_ENABLE);
- pStep->setWriteSignalDev(0xc2);
- if (pEquipment->addStep(STEP_ID_PORT3_ENABLE_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6036);
- pStep->setName(STEP_EQ_PORT3_TYPE_ATUO);
- pStep->setWriteSignalDev(0xca);
- if (pEquipment->addStep(STEP_ID_PORT3_TYPE_AUTO_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
-
- // Port4
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6040);
- pStep->setName(STEP_EQ_PORT4_TYPE);
- pStep->setWriteSignalDev(0xa3);
- if (pEquipment->addStep(STEP_ID_PORT4_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6041);
- pStep->setName(STEP_EQ_PORT4_MODE);
- pStep->setWriteSignalDev(0xab);
- if (pEquipment->addStep(STEP_ID_PORT4_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6042);
- pStep->setName(STEP_EQ_PORT4_CASSETTE_TYPE);
- pStep->setWriteSignalDev(0xb3);
- if (pEquipment->addStep(STEP_ID_PORT4_CASSETTE_TYPE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6044);
- pStep->setName(STEP_EQ_PORT4_TRANSFER_MODE);
- pStep->setWriteSignalDev(0xbb);
- if (pEquipment->addStep(STEP_ID_PORT4_TRANSFER_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6045);
- pStep->setName(STEP_EQ_PORT4_ENABLE);
- pStep->setWriteSignalDev(0xc3);
- if (pEquipment->addStep(STEP_ID_PORT4_ENABLE_MODE_CHANGE, pStep) != 0) {
- delete pStep;
- }
- }
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6046);
- pStep->setName(STEP_EQ_PORT4_TYPE_ATUO);
- pStep->setWriteSignalDev(STEP_ID_PORT4_TYPE_AUTO_CHANGE);
- if (pEquipment->addStep(0xcb, pStep) != 0) {
- delete pStep;
- }
- }
-
// CEqCassetteTranserStateStep
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_EMPTY, 0xd8,
@@ -741,7 +641,8 @@
pEquipment->init();
LOGE("已添加“EFEM(ROBOT)”.");
- return 0;
+
+ return pEquipment;
}
/* 添加bonder1 或 bonder2
--
Gitblit v1.9.3