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 | 438 ++++++++++++++++++++++--------------------------------
1 files changed, 179 insertions(+), 259 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index ac55915..e38b2b2 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -34,7 +34,7 @@
CMaster::CMaster()
{
- m_listener = {nullptr, nullptr, nullptr};
+ m_listener = {nullptr, nullptr, nullptr, nullptr};
m_bDataModify = FALSE;
m_hEventReadBitsThreadExit[0] = ::CreateEvent(NULL, TRUE, FALSE, NULL);
m_hEventReadBitsThreadExit[1] = ::CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -65,6 +65,7 @@
m_listener.onEqAlive = listener.onEqAlive;
m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
m_listener.onEqAlarm = listener.onEqAlarm;
+ m_listener.onEqVcrEventReport = listener.onEqVcrEventReport;
}
int CMaster::init()
@@ -99,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();
@@ -199,6 +207,13 @@
m_listener.onEqAlarm(this, p, state, alarmId, unitId, level);
}
};
+ listener.onVcrEventReport = [&](void* pEquipment, void* pReport) -> void {
+ CEquipment* p = (CEquipment*)pEquipment;
+ CVcrEventReport* p2 = (CVcrEventReport*)pReport;
+ if (m_listener.onEqVcrEventReport != nullptr) {
+ m_listener.onEqVcrEventReport(this, p, p2);
+ }
+ };
listener.onDataChanged = [&](void* pEquipment, int code) -> void {
m_bDataModify = TRUE;
};
@@ -224,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[] = {
@@ -244,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);
@@ -262,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()
@@ -320,14 +428,14 @@
return 0;
}
- int CMaster::addEFEM()
+ CEFEM* CMaster::addEFEM()
{
CEFEM* pEquipment = new CEFEM();
pEquipment->setID(EQ_ID_EFEM);
pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
- pEquipment->setReadBitBlock(0x4000, 0x4aff);
+ pEquipment->setReadBitBlock(0x3000, 0x3aff);
pEquipment->setStation(0, 255);
addToEquipmentList(pEquipment);
@@ -337,7 +445,7 @@
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
pStep->setWriteSignalDev(0x50);
- pStep->setModeDev(0x6c7d);
+ pStep->setModeDev(0x5d7d);
if (pEquipment->addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -346,7 +454,7 @@
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
pStep->setWriteSignalDev(0x51);
- pStep->setStatusDev(0x6c59);
+ pStep->setStatusDev(0x5d59);
if (pEquipment->addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -355,7 +463,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK1);
pStep->setWriteSignalDev(0x52);
- pStep->setAlarmDev(0x6e0e);
+ pStep->setAlarmDev(0x5f0e);
if (pEquipment->addStep(STEP_ID_EQALARM1, pStep) != 0) {
delete pStep;
}
@@ -364,7 +472,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK2);
pStep->setWriteSignalDev(0x53);
- pStep->setAlarmDev(0x6e3b);
+ pStep->setAlarmDev(0x5f3b);
if (pEquipment->addStep(STEP_ID_EQALARM2, pStep) != 0) {
delete pStep;
}
@@ -373,7 +481,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK3);
pStep->setWriteSignalDev(0x54);
- pStep->setAlarmDev(0x6e68);
+ pStep->setAlarmDev(0x5f68);
if (pEquipment->addStep(STEP_ID_EQALARM3, pStep) != 0) {
delete pStep;
}
@@ -382,7 +490,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK4);
pStep->setWriteSignalDev(0x55);
- pStep->setAlarmDev(0x6e95);
+ pStep->setAlarmDev(0x5f95);
if (pEquipment->addStep(STEP_ID_EQALARM4, pStep) != 0) {
delete pStep;
}
@@ -391,7 +499,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK5);
pStep->setWriteSignalDev(0x56);
- pStep->setAlarmDev(0x6ec2);
+ pStep->setAlarmDev(0x5fc2);
if (pEquipment->addStep(STEP_ID_EQALARM5, pStep) != 0) {
delete pStep;
}
@@ -400,7 +508,7 @@
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
pStep->setWriteSignalDev(0x57);
- pStep->setProcessDev(0x7a55);
+ pStep->setProcessDev(0x6b55);
if (pEquipment->addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
}
@@ -425,10 +533,21 @@
}
{
// CIM Message Confirm
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6c80);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x5f80);
pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
pStep->setWriteSignalDev(0x59);
if (pEquipment->addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ // VCR1 Event Report
+ CEqVcrEventStep* pStep = new CEqVcrEventStep();
+ pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
+ pStep->setWriteSignalDev(0x4a);
+ pStep->setReturnDev(0x91e);
+ pStep->setVcrEventReportDev(0x5fef);
+ if (pEquipment->addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
delete pStep;
}
}
@@ -469,260 +588,61 @@
}
}
- // Port1
- {
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f10);
- 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, 0x6f11);
- 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, 0x6f12);
- 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, 0x6f14);
- 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, 0x6f15);
- 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, 0x6f16);
- 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, 0x6f20);
- 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, 0x6f21);
- 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, 0x6f22);
- 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, 0x6f24);
- 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, 0x6f25);
- 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, 0x6f26);
- 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, 0x6f30);
- 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, 0x6f31);
- 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, 0x6f32);
- 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, 0x6f34);
- 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, 0x6f35);
- 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, 0x6f36);
- 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, 0x6f40);
- 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, 0x6f41);
- 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, 0x6f42);
- 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, 0x6f44);
- 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, 0x6f45);
- 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, 0x6f46);
- 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,
- STEP_ID_PORT1_CASSETTIE_EMPTY, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_EMPTY, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOAD_EADY, 0xe0,
- STEP_ID_PORT1_CASSETTIE_LOAD_READY, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_LOAD_READY, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOADED, 0xe8,
- STEP_ID_PORT1_CASSETTIE_LOADED, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_LOADED, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_INUSE, 0xf0,
- STEP_ID_PORT1_CASSETTIE_INUSE, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_INUSE, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_UNLOAD_EADY, 0xf8,
- STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, 0x60f50);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_BLOCKED, 0x100,
- STEP_ID_PORT1_CASSETTIE_BLOCKED, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_BLOCKED, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_EMPTY, 0xd9,
- STEP_ID_PORT2_CASSETTIE_EMPTY, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_EMPTY, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOAD_EADY, 0xe1,
- STEP_ID_PORT2_CASSETTIE_LOAD_READY, 0x6f70, 0x4d7f);
+ STEP_ID_PORT2_CASSETTIE_LOAD_READY, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOADED, 0xe9,
- STEP_ID_PORT2_CASSETTIE_LOADED, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_LOADED, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_INUSE, 0xf1,
- STEP_ID_PORT2_CASSETTIE_INUSE, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_INUSE, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_UNLOAD_EADY, 0xf9,
- STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_BLOCKED, 0x101,
- STEP_ID_PORT2_CASSETTIE_BLOCKED, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_BLOCKED, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_EMPTY, 0xda,
- STEP_ID_PORT3_CASSETTIE_EMPTY, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_EMPTY, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOAD_EADY, 0xe2,
- STEP_ID_PORT3_CASSETTIE_LOAD_READY, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_LOAD_READY, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOADED, 0xea,
- STEP_ID_PORT3_CASSETTIE_INUSE, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_INUSE, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_INUSE, 0xf2,
- STEP_ID_PORT3_CASSETTIE_INUSE, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_INUSE, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_UNLOAD_EADY, 0xfa,
- STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_BLOCKED, 0x102,
- STEP_ID_PORT3_CASSETTIE_BLOCKED, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_BLOCKED, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_EMPTY, 0xdb,
- STEP_ID_PORT4_CASSETTIE_EMPTY, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_EMPTY, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOAD_EADY, 0xe3,
- STEP_ID_PORT4_CASSETTIE_LOAD_READY, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_LOAD_READY, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOADED, 0xeb,
- STEP_ID_PORT4_CASSETTIE_LOADED, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_LOADED, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_INUSE, 0xf3,
- STEP_ID_PORT4_CASSETTIE_INUSE, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_INUSE, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_UNLOAD_EADY, 0xfb,
- STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_BLOCKED, 0x103,
- STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x60b0);
pEquipment->init();
LOGE("已添加“EFEM(ROBOT)”.");
- return 0;
+
+ return pEquipment;
}
/* 添加bonder1 或 bonder2
@@ -737,7 +657,7 @@
pEquipment->setName(index == 0 ? "Bonder 1" : "Bonder 2");
pEquipment->setDescription(index == 0 ? "Bonder 1." : "Bonder 2.");
pEquipment->setStation(0, 255);
- pEquipment->setReadBitBlock(index == 0 ? 0x4b00 : 0x5600,
+ pEquipment->setReadBitBlock(index == 0 ? 0x3b00 : 0x4600,
index == 0 ? 0x5600 : 0x6100);
addToEquipmentList(pEquipment);
@@ -747,7 +667,7 @@
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
pStep->setWriteSignalDev(index == 0 ? 0x350 : 0x650);
- pStep->setModeDev(index == 0 ? 0xad7d : 0xee7d);
+ pStep->setModeDev(index == 0 ? 0x9d7d : 0xdd7d);
if (pEquipment->addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -756,7 +676,7 @@
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
pStep->setWriteSignalDev(index == 0 ? 0x351 : 0x651);
- pStep->setStatusDev(index == 0 ? 0xad59 : 0xee59);
+ pStep->setStatusDev(index == 0 ? 0x9d59 : 0xdd59);
if (pEquipment->addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -765,7 +685,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK1);
pStep->setWriteSignalDev(index == 0 ? 0x352 : 0x652);
- pStep->setAlarmDev(index == 0 ? 0xaf0e : 0xf00e);
+ pStep->setAlarmDev(index == 0 ? 0x9f0e : 0xdf0e);
if (pEquipment->addStep(STEP_ID_EQALARM1, pStep) != 0) {
delete pStep;
}
@@ -774,7 +694,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK2);
pStep->setWriteSignalDev(index == 0 ? 0x353 : 0x653);
- pStep->setAlarmDev(index == 0 ? 0xaf3b : 0xf03b);
+ pStep->setAlarmDev(index == 0 ? 0x9f3b : 0xdf3b);
if (pEquipment->addStep(STEP_ID_EQALARM2, pStep) != 0) {
delete pStep;
}
@@ -783,7 +703,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK3);
pStep->setWriteSignalDev(index == 0 ? 0x354 : 0x654);
- pStep->setAlarmDev(index == 0 ? 0xaf8e : 0xf068);
+ pStep->setAlarmDev(index == 0 ? 0x9f68 : 0xdf68);
if (pEquipment->addStep(STEP_ID_EQALARM3, pStep) != 0) {
delete pStep;
}
@@ -792,7 +712,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK4);
pStep->setWriteSignalDev(index == 0 ? 0x355 : 0x655);
- pStep->setAlarmDev(index == 0 ? 0xaf95 : 0xf095);
+ pStep->setAlarmDev(index == 0 ? 0x9f95 : 0xdf95);
if (pEquipment->addStep(STEP_ID_EQALARM4, pStep) != 0) {
delete pStep;
}
@@ -801,7 +721,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK5);
pStep->setWriteSignalDev(index == 0 ? 0x356 : 0x656);
- pStep->setAlarmDev(index == 0 ? 0xafc2 : 0xf0c2);
+ pStep->setAlarmDev(index == 0 ? 0x9fc2 : 0xdfc2);
if (pEquipment->addStep(STEP_ID_EQALARM5, pStep) != 0) {
delete pStep;
}
@@ -810,7 +730,7 @@
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
pStep->setWriteSignalDev(index == 0 ? 0x357 : 0x657);
- pStep->setProcessDev(index == 0 ? 0xbb55 : 0xfc55);
+ pStep->setProcessDev(index == 0 ? 0xab55 : 0xeb55);
if (pEquipment->addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
}
@@ -835,7 +755,7 @@
}
{
// CIM Message Confirm
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, index == 0 ? 0xad80 : 0xee80);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, index == 0 ? 0x9d80 : 0xdd80);
pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
pStep->setWriteSignalDev(index == 0 ? 0x359 : 0x659);
if (pEquipment->addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
@@ -873,7 +793,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_RECEIVED_JOB_UPS1);
pStep->setWriteSignalDev(index == 0 ? 0x300 : 0x600);
- pStep->setJobDataDev(index == 0 ? 0x9510 : 0xd610);
+ pStep->setJobDataDev(index == 0 ? 0x8c90 : 0xcc90);
if (pEquipment->addStep(STEP_ID_RECIVE_JOB_UPS1, pStep) != 0) {
delete pStep;
}
@@ -882,7 +802,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_RECEIVED_JOB_UPS2);
pStep->setWriteSignalDev(index == 0 ? 0x301 : 0x601);
- pStep->setJobDataDev(index == 0 ? 0x9650 : 0xd750);
+ pStep->setJobDataDev(index == 0 ? 0x8dd0 : 0xcdd0);
if (pEquipment->addStep(STEP_ID_RECIVE_JOB_UPS2, pStep) != 0) {
delete pStep;
}
@@ -891,7 +811,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS1);
pStep->setWriteSignalDev(index == 0 ? 0x310 : 0x610);
- pStep->setJobDataDev(index == 0 ? 0x8100 : 0xc200);
+ pStep->setJobDataDev(index == 0 ? 0x8000 : 0xc000);
if (pEquipment->addStep(STEP_ID_SENT_OUT_JOB_DOWNS1, pStep) != 0) {
delete pStep;
}
@@ -900,7 +820,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS2);
pStep->setWriteSignalDev(index == 0 ? 0x311 : 0x611);
- pStep->setJobDataDev(index == 0 ? 0x8240 : 0xc340);
+ pStep->setJobDataDev(index == 0 ? 0x8140 : 0xc140);
if (pEquipment->addStep(STEP_ID_SENT_OUT_JOB_DOWNS2, pStep) != 0) {
delete pStep;
}
--
Gitblit v1.9.3