From 4d9ee1abb3290f468fe30e048be211bb7fa8cf84 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 09:22:34 +0800
Subject: [PATCH] CJobDataS增加rawData

---
 SourceCode/Bond/Servo/CMaster.cpp |  771 +++++++++++++++-------------------------------------------
 1 files changed, 203 insertions(+), 568 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 6e00a3a..6394380 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -3,18 +3,18 @@
 #include "CMaster.h"
 
 
-#define ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(name,ws,index,psd) {				\
-	CEqCassetteTransferStateStep* pStep = new CEqCassetteTransferStateStep();	\
-	pStep->setName(name);														\
-	pStep->setWriteSignalDev(ws);												\
-	pStep->setPortStatusDev(psd);												\
-	if (pEquipment->addStep(index, pStep) != 0) {								\
-		delete pStep;															\
-	}																			\
-}
-
 namespace SERVO {
 	CMaster* g_pMaster = NULL;
+
+	unsigned __stdcall ReadBitsThreadFunction(LPVOID lpParam)
+	{
+		if (g_pMaster != NULL) {
+			return g_pMaster->ReadBitsProc();
+		}
+
+		return 0;
+	}
+
 	void CALLBACK MasterTimerProc(HWND hWnd, UINT nMsg, UINT nTimerid, DWORD dwTime)
 	{
 		if (g_pMaster != NULL) {
@@ -24,8 +24,12 @@
 
 	CMaster::CMaster()
 	{
-		m_listener = {nullptr, nullptr, nullptr};
+		m_listener = {nullptr, nullptr, nullptr, nullptr, nullptr};
 		m_bDataModify = FALSE;
+		m_hEventReadBitsThreadExit[0] = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+		m_hEventReadBitsThreadExit[1] = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+		m_hReadBitsThreadHandle = nullptr;
+		m_nReadBitsThreadAddr = 0;
 	}
 
 	CMaster::~CMaster()
@@ -34,6 +38,16 @@
 			delete item;
 		}
 		m_listEquipment.clear();
+
+		if (m_hEventReadBitsThreadExit[0] != nullptr) {
+			::CloseHandle(m_hEventReadBitsThreadExit[0]);
+			m_hEventReadBitsThreadExit[0] = nullptr;
+		}
+
+		if (m_hEventReadBitsThreadExit[1] != nullptr) {
+			::CloseHandle(m_hEventReadBitsThreadExit[1]);
+			m_hEventReadBitsThreadExit[1] = nullptr;
+		}
 	}
 
 	void CMaster::setListener(MasterListener listener)
@@ -41,6 +55,8 @@
 		m_listener.onEqAlive = listener.onEqAlive;
 		m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
 		m_listener.onEqAlarm = listener.onEqAlarm;
+		m_listener.onEqVcrEventReport = listener.onEqVcrEventReport;
+		m_listener.onEqDataChanged = listener.onEqDataChanged;
 	}
 
 	int CMaster::init()
@@ -75,18 +91,64 @@
 
 
 		// 初始化添加各子设备
-		addLoadPort(0);
-		addLoadPort(1);
-		addLoadPort(2);
-		addLoadPort(3);
-		addFliper();
-		addVacuumBake();
-		addAligner();
-		addEFEM();
-		addBonder(0);
-		addBonder(1);
-		addBakeCooling();
+		CLoadPort* pPort1, * pPort2, * pPort3, * pPort4;
+		CBonder* pBonder1, * pBonder2;
+		CEFEM* pEfem;
+		CArm* pArm;
+		CArmTray* pArmTray1, * pArmTray2;
+		CFliper* pFliper;
+		CVacuumBake* pVacuumBake;
+		CAligner* pAligner;
+		CBakeCooling* pBakeCooling;
+
+		pPort1 = addLoadPort(0);
+		pPort2 = addLoadPort(1);
+		pPort3 = addLoadPort(2);
+		pPort4 = addLoadPort(3);
+		pEfem = addEFEM();
+		pArm = addArm();
+		pArmTray1 = addArmTray(0);
+		pArmTray2 = addArmTray(1);
+		pFliper = addFliper();
+		pVacuumBake = addVacuumBake();
+		pAligner = addAligner();
+		pBonder1 = addBonder(0);
+		pBonder2 = addBonder(1);
+		pBakeCooling = addBakeCooling();
+
+		ASSERT(pEfem);
+		ASSERT(pFliper);
+		ASSERT(pVacuumBake);
+		ASSERT(pAligner);
+		ASSERT(pBonder1);
+		ASSERT(pBonder2);
+		ASSERT(pBakeCooling);
+
+		pEfem->setPort(0, pPort1);
+		pEfem->setPort(1, pPort1);
+		pEfem->setPort(2, pPort1);
+		pEfem->setPort(3, pPort1);
+		pEfem->setFliper(pFliper);
+		pEfem->setAligner(pAligner);
+		pEfem->setArmTray(0, pArmTray1);
+		pEfem->setArmTray(1, pArmTray2);
+		pPort1->setArm(pArm);
+		pPort2->setArm(pArm);
+		pPort3->setArm(pArm);
+		pPort4->setArm(pArm);
+		pArmTray1->setArm(pArm);
+		pArmTray2->setArm(pArm);
+		pFliper->setArm(pArm);
+		pVacuumBake->setArm(pArm);
+		pAligner->setArm(pArm);
+		pBonder1->setArm(pArm);
+		pBonder2->setArm(pArm);
+		pBakeCooling->setArm(pArm);
+
 		connectEquipments();
+
+
+
 
 		
 		// 读缓存数据
@@ -98,12 +160,19 @@
 		SetTimer(NULL, 1, 250, (TIMERPROC)MasterTimerProc);
 
 
+		m_hReadBitsThreadHandle = (HANDLE)_beginthreadex(NULL, 0, SERVO::ReadBitsThreadFunction, this,
+			0, &m_nReadBitsThreadAddr);
+
+
 		LOGI("<Master>初始化完成.");
 		return 0;
 	}
 
 	int CMaster::term()
 	{
+		SetEvent(m_hEventReadBitsThreadExit[0]);
+		::WaitForSingleObject(m_hEventReadBitsThreadExit[1], INFINITE);
+
 		LOGI("<Master>正在结束程序.");
 		for (auto item : m_listEquipment) {
 			item->term();
@@ -111,6 +180,39 @@
 		saveCache();
 
 
+
+		return 0;
+	}
+
+	unsigned CMaster::ReadBitsProc()
+	{
+		while (1) {
+			// 待退出信号或时间到
+			int nRet = ::WaitForSingleObject(m_hEventReadBitsThreadExit[0], 1000);
+			if (nRet == WAIT_OBJECT_0) {
+				break;
+			}
+
+			for (auto item : m_listEquipment) {
+				if (item->getID() == EQ_ID_Bonder1 ||
+					item->getID() == EQ_ID_Bonder2) {
+					const StationIdentifier& station = item->getStation();
+					MemoryBlock& block = item->getReadBitBlock();
+
+					int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
+						block.start, block.size, block.buffer);
+					if (0 == nRet) {
+						item->onReceiveLBData(block.buffer, block.size);
+					}
+				}
+			}
+		}
+
+		SetEvent(m_hEventReadBitsThreadExit[1]);
+
+
+		// _endthreadex(0);
+		TRACE("CMaster::ReadBitsProc 线程退出\n");
 		return 0;
 	}
 
@@ -135,8 +237,19 @@
 				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;
+			CEquipment* p = (CEquipment*)pEquipment;
+			if (m_listener.onEqDataChanged != nullptr) {
+				m_listener.onEqDataChanged(this, p, 0);
+			}
 		};
 
 		pEquipment->setListener(listener);
@@ -160,52 +273,33 @@
 		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[] = { 
-			STEP_EQ_P1_CASSETTE_CTRL_CMD,
-			STEP_EQ_P2_CASSETTE_CTRL_CMD,
-			STEP_EQ_P3_CASSETTE_CTRL_CMD,
-			STEP_EQ_P4_CASSETTE_CTRL_CMD
-		};
-		int nWriteSignalDev[] = {0x120, 0x121, 0x122, 0x123};
-		int nCtrlCmdDev[] = {0x45, 0x1a5, 0x305, 0x465};
-		int nStepDev[] = { 0x480, 0x481, 0x482, 0x483 };
 
 
 		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);
 		addToEquipmentList(pEquipment);
 
 
-		// step
-		{
-			CEqCassetteCtrlCmdStep* pStep = new CEqCassetteCtrlCmdStep();
-			pStep->setName(pszCassetteCtrlCmd[index]);
-			pStep->setWriteSignalDev(nWriteSignalDev[index]);
-			pStep->setCtrlCmdDev(nCtrlCmdDev[index]);
-			if (pEquipment->addStep(nStepDev[index], pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-
 		pEquipment->init();
 		LOGE("已添加“%s”.", pEquipment->getName().c_str());
 
 
-		return 0;
+		return pEquipment;
 	}
 
-	int CMaster::addFliper()
+	CFliper* CMaster::addFliper()
 	{
 		CFliper* pEquipment = new CFliper();
 		pEquipment->setID(EQ_ID_FLIPER);
@@ -219,10 +313,10 @@
 
 		pEquipment->init();
 		LOGE("已添加“Fliper”.");
-		return 0;
+		return pEquipment;
 	}
 
-	int CMaster::addVacuumBake()
+	CVacuumBake* CMaster::addVacuumBake()
 	{
 		CVacuumBake* pEquipment = new CVacuumBake();
 		pEquipment->setID(EQ_ID_VACUUMBAKE);
@@ -236,10 +330,11 @@
 
 		pEquipment->init();
 		LOGE("已添加“VacuumBake”.");
-		return 0;
+
+		return pEquipment;
 	}
 
-	int CMaster::addAligner()
+	CAligner* CMaster::addAligner()
 	{
 		CAligner* pEquipment = new CAligner();
 		pEquipment->setID(EQ_ID_ALIGNER);
@@ -253,550 +348,86 @@
 
 		pEquipment->init();
 		LOGE("已添加“Aligner”.");
-		return 0;
+
+		return pEquipment;
 	}
 
-	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, 0x45ff);
+		pEquipment->setReadBitBlock(0x3000, 0x3aff);
 		pEquipment->setStation(0, 255);
 		addToEquipmentList(pEquipment);
 
 
-		// 添加 step
-		{
-			CEqModeStep* pStep = new CEqModeStep();
-			pStep->setName(STEP_MODE);
-			pStep->setWriteSignalDev(0x30);
-			pStep->setModeDev(0x4a8c);
-			if (pEquipment->addStep(0x360, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqStatusStep* pStep = new CEqStatusStep();
-			pStep->setName(STEP_STATUS);
-			pStep->setWriteSignalDev(0x31);
-			pStep->setStatusDev(0x4a68);
-			if (pEquipment->addStep(0x361, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK1);
-			pStep->setWriteSignalDev(0x32);
-			pStep->setAlarmDev(0x4c1d);
-			if (pEquipment->addStep(0x362, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK2);
-			pStep->setWriteSignalDev(0x33);
-			pStep->setAlarmDev(0x4c4a);
-			if (pEquipment->addStep(0x363, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK3);
-			pStep->setWriteSignalDev(0x34);
-			pStep->setAlarmDev(0x4c77);
-			if (pEquipment->addStep(0x364, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK4);
-			pStep->setWriteSignalDev(0x35);
-			pStep->setAlarmDev(0x4ca4);
-			if (pEquipment->addStep(0x365, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK5);
-			pStep->setWriteSignalDev(0x36);
-			pStep->setAlarmDev(0x4cd1);
-			if (pEquipment->addStep(0x366, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqProcessStep* pStep = new CEqProcessStep();
-			pStep->setName(STEP_PROCESS);
-			pStep->setWriteSignalDev(0x37);
-			pStep->setProcessDev(0x5864);
-			if (pEquipment->addStep(0x367, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
-			pStep->setName(STEP_CIM_MODE_CHANGE);
-			pStep->setWriteSignalDev(0x50);
-			pStep->setCimModeDev(0x15);
-			if (pEquipment->addStep(0x350, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
-			pStep->setName(STEP_CIM_MESSAGE_CMD);
-			pStep->setWriteSignalDev(0x51);
-			pStep->setCimMessageDev(0x0);
-			if (pEquipment->addStep(0x351, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
-			pStep->setName(STEP_CIM_MESSAGE_CLEAR);
-			pStep->setWriteSignalDev(0x52);
-			pStep->setClearCimMessageDev(0x13);
-			if (pEquipment->addStep(0x352, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
-			pStep->setName(STEP_DATETIME_SET_CMD);
-			pStep->setWriteSignalDev(0x53);
-			pStep->setDateTimeDev(0x16);
-			if (pEquipment->addStep(0x353, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqVCREnableStep* pStep = new CEqVCREnableStep();
-			pStep->setName(STEP_EQ_VCR_ENABLE);
-			pStep->setWriteSignalDev(0x54);
-			pStep->setEqVCRModeDev(0x1F);
-			if (pEquipment->addStep(0x354, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqModeChangeStep* pStep = new CEqModeChangeStep();
-			pStep->setName(STEP_EQ_MODE_CHANGE);
-			pStep->setWriteSignalDev(0x55);
-			pStep->setEqModeDev(0x1E);
-			if (pEquipment->addStep(0x355, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		// Port1
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d1f);
-			pStep->setName(STEP_EQ_PORT1_TYPE);
-			pStep->setWriteSignalDev(0x80);
-			if (pEquipment->addStep(0x3e0, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d20);
-			pStep->setName(STEP_EQ_PORT1_MODE);
-			pStep->setWriteSignalDev(0x88);
-			if (pEquipment->addStep(0x3e8, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d21);
-			pStep->setName(STEP_EQ_PORT1_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0x90);
-			if (pEquipment->addStep(0x3f0, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d23);
-			pStep->setName(STEP_EQ_PORT1_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0x98);
-			if (pEquipment->addStep(0x3f8, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d24);
-			pStep->setName(STEP_EQ_PORT1_ENABLE);
-			pStep->setWriteSignalDev(0xa0);
-			if (pEquipment->addStep(0x400, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d25);
-			pStep->setName(STEP_EQ_PORT1_TYPE_ATUO);
-			pStep->setWriteSignalDev(0xa8);
-			if (pEquipment->addStep(0x408, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		// Port2
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d2f);
-			pStep->setName(STEP_EQ_PORT2_TYPE);
-			pStep->setWriteSignalDev(0x81);
-			if (pEquipment->addStep(0x3e1, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d30);
-			pStep->setName(STEP_EQ_PORT2_MODE);
-			pStep->setWriteSignalDev(0x89);
-			if (pEquipment->addStep(0x3e9, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d31);
-			pStep->setName(STEP_EQ_PORT2_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0x91);
-			if (pEquipment->addStep(0x3f1, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d33);
-			pStep->setName(STEP_EQ_PORT2_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0x99);
-			if (pEquipment->addStep(0x3f9, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d34);
-			pStep->setName(STEP_EQ_PORT2_ENABLE);
-			pStep->setWriteSignalDev(0xa1);
-			if (pEquipment->addStep(0x401, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d35);
-			pStep->setName(STEP_EQ_PORT2_TYPE_ATUO);
-			pStep->setWriteSignalDev(0xa9);
-			if (pEquipment->addStep(0x409, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		// Port3
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d3f);
-			pStep->setName(STEP_EQ_PORT3_TYPE);
-			pStep->setWriteSignalDev(0x82);
-			if (pEquipment->addStep(0x3e2, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d40);
-			pStep->setName(STEP_EQ_PORT3_MODE);
-			pStep->setWriteSignalDev(0x8a);
-			if (pEquipment->addStep(0x3ea, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d41);
-			pStep->setName(STEP_EQ_PORT3_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0x92);
-			if (pEquipment->addStep(0x3f2, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d43);
-			pStep->setName(STEP_EQ_PORT3_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0x9a);
-			if (pEquipment->addStep(0x3fa, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d44);
-			pStep->setName(STEP_EQ_PORT3_ENABLE);
-			pStep->setWriteSignalDev(0xa2);
-			if (pEquipment->addStep(0x402, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d45);
-			pStep->setName(STEP_EQ_PORT3_TYPE_ATUO);
-			pStep->setWriteSignalDev(0xaa);
-			if (pEquipment->addStep(0x40a, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-		// Port4
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d4f);
-			pStep->setName(STEP_EQ_PORT4_TYPE);
-			pStep->setWriteSignalDev(0x83);
-			if (pEquipment->addStep(0x3e3, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d50);
-			pStep->setName(STEP_EQ_PORT4_MODE);
-			pStep->setWriteSignalDev(0x8b);
-			if (pEquipment->addStep(0x3eb, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d51);
-			pStep->setName(STEP_EQ_PORT4_CASSETTE_TYPE);
-			pStep->setWriteSignalDev(0x93);
-			if (pEquipment->addStep(0x3f3, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d53);
-			pStep->setName(STEP_EQ_PORT4_TRANSFER_MODE);
-			pStep->setWriteSignalDev(0x9b);
-			if (pEquipment->addStep(0x3fb, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d54);
-			pStep->setName(STEP_EQ_PORT4_ENABLE);
-			pStep->setWriteSignalDev(0xa3);
-			if (pEquipment->addStep(0x403, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d55);
-			pStep->setName(STEP_EQ_PORT4_TYPE_ATUO);
-			pStep->setWriteSignalDev(0xab);
-			if (pEquipment->addStep(0x40b, pStep) != 0) {
-				delete pStep;
-			}
-		}
-
-
-		// CEqCassetteTranserStateStep
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_EMPTY, 0xb8, 
-			STEP_ID_PORT1_CASSETTIE_EMPTY, 0x4d5f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOAD_EADY, 0xc0,
-			STEP_ID_PORT1_CASSETTIE_LOAD_READY, 0x4d5f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOADED, 0xc8, 
-			STEP_ID_PORT1_CASSETTIE_LOADED, 0x4d5f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_INUSE, 0xd0,
-			STEP_ID_PORT1_CASSETTIE_INUSE, 0x4d5f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_UNLOAD_EADY, 0xd8,
-			STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, 0x4d5f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_BLOCKED, 0xe0,
-			STEP_ID_PORT1_CASSETTIE_BLOCKED, 0x4d5f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_EMPTY, 
-			STEP_ID_PORT2_CASSETTIE_EMPTY, 0x418, 0x4d7f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOAD_EADY,
-			STEP_ID_PORT2_CASSETTIE_LOAD_READY, 0x420, 0x4d7f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOADED,
-			STEP_ID_PORT2_CASSETTIE_LOADED, 0x428, 0x4d7f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_INUSE, 
-			STEP_ID_PORT2_CASSETTIE_INUSE, 0x430, 0x4d7f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_UNLOAD_EADY,
-			STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, 0x438, 0x4d7f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_BLOCKED, 
-			STEP_ID_PORT2_CASSETTIE_BLOCKED, 0x440, 0x4d7f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_EMPTY,
-			STEP_ID_PORT3_CASSETTIE_EMPTY, 0x418, 0x4d9f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOAD_EADY,
-			STEP_ID_PORT3_CASSETTIE_LOAD_READY, 0x420, 0x4d9f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOADED, 
-			STEP_ID_PORT3_CASSETTIE_INUSE, 0x428, 0x4d9f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_INUSE, 
-			STEP_ID_PORT3_CASSETTIE_INUSE, 0x430, 0x4d9f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_UNLOAD_EADY, 
-			STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, 0x438, 0x4d9f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_BLOCKED,
-			STEP_ID_PORT3_CASSETTIE_BLOCKED, 0x440, 0x4d9f);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_EMPTY, 
-			STEP_ID_PORT4_CASSETTIE_EMPTY, 0x418, 0x4dbf);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOAD_EADY, 
-			STEP_ID_PORT4_CASSETTIE_LOAD_READY, 0x420, 0x4dbf);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOADED, 
-			STEP_ID_PORT4_CASSETTIE_LOADED, 0x428, 0x4dbf);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_INUSE,
-			STEP_ID_PORT4_CASSETTIE_INUSE, 0x430, 0x4dbf);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_UNLOAD_EADY, 
-			STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, 0x438, 0x4dbf);
-		ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_BLOCKED, 
-			STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x440, 0x4dbf);
-
 		pEquipment->init();
 		LOGE("已添加“EFEM(ROBOT)”.");
-		return 0;
+
+		return pEquipment;
+	}
+
+	CArm* CMaster::addArm()
+	{
+		CArm* pEquipment = new CArm();
+		pEquipment->setID(EQ_ID_ARM);
+		pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
+		pEquipment->setName("ARM");
+		pEquipment->setDescription("ARM.");
+		addToEquipmentList(pEquipment);
+
+
+		pEquipment->init();
+		LOGE("已添加“ARM”.");
+
+		return pEquipment;
+	}
+
+	CArmTray* CMaster::addArmTray(int index)
+	{
+		CArmTray* pEquipment = new CArmTray();
+		pEquipment->setID(index == 0 ? EQ_ID_ARM_TRAY1 : EQ_ID_ARM_TRAY2);
+		pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
+		pEquipment->setName(index == 0 ? "Arm Tray1" : "Arm Tray2");
+		pEquipment->setDescription(index == 0 ? "Arm Tray1." : "Arm Tray2.");
+		addToEquipmentList(pEquipment);
+
+
+		pEquipment->init();
+		LOGE("已添加“%s”.", pEquipment->getName().c_str());
+
+		return pEquipment;
 	}
 
 	/* 添加bonder1 或 bonder2 
 	 * index -- 0, bonder1
 	 * index -- 1, bonder2
 	 */
-	int CMaster::addBonder(int index)
+	CBonder* CMaster::addBonder(int index)
 	{
 		ASSERT(index == 0 || index == 1);
 		CBonder* pEquipment = new CBonder();
 		pEquipment->setID(EQ_ID_Bonder1 + index);
 		pEquipment->setName(index == 0 ? "Bonder 1" : "Bonder 2");
 		pEquipment->setDescription(index == 0 ? "Bonder 1." : "Bonder 2.");
-		pEquipment->setStation(1, index == 0 ? 3 : 4);
-		pEquipment->setReadBitBlock(index == 0 ? 0x4600 : 0x4c00,
-			index == 0 ? 0x4c00 : 0x5200);
+		pEquipment->setStation(0, 255);
+		pEquipment->setReadBitBlock(index == 0 ? 0x3b00 : 0x4600,
+			index == 0 ? 0x5600 : 0x6100);
+		pEquipment->setIndex(index);
 		addToEquipmentList(pEquipment);
-
-
-		// 添加 step
-		{
-			CEqModeStep* pStep = new CEqModeStep();
-			pStep->setName(STEP_MODE);
-			pStep->setWriteSignalDev(index == 0 ? 0x330 : 0x630);
-			pStep->setModeDev(index == 0 ? 0x6a8c : 0x848c);
-			if (pEquipment->addStep(0x360, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqStatusStep* pStep = new CEqStatusStep();
-			pStep->setName(STEP_STATUS);
-			pStep->setWriteSignalDev(index == 0 ? 0x331 : 0x631);
-			pStep->setStatusDev(index == 0 ? 0x6a68 : 0x8a68);
-			if (pEquipment->addStep(0x361, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK1);
-			pStep->setWriteSignalDev(index == 0 ? 0x332 : 0x632);
-			pStep->setAlarmDev(index == 0 ? 0x6c1d : 0x8c1d);
-			if (pEquipment->addStep(0x362, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK2);
-			pStep->setWriteSignalDev(index == 0 ? 0x333 : 0x633);
-			pStep->setAlarmDev(index == 0 ? 0x6c4a : 0x8c4a);
-			if (pEquipment->addStep(0x363, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK3);
-			pStep->setWriteSignalDev(index == 0 ? 0x334 : 0x634);
-			pStep->setAlarmDev(index == 0 ? 0x6c77 : 0x8c77);
-			if (pEquipment->addStep(0x364, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK4);
-			pStep->setWriteSignalDev(index == 0 ? 0x335 : 0x635);
-			pStep->setAlarmDev(index == 0 ? 0x6ca4 : 0x8ca4);
-			if (pEquipment->addStep(0x365, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqAlarmStep* pStep = new CEqAlarmStep();
-			pStep->setName(STEP_ALARM_BLOCK5);
-			pStep->setWriteSignalDev(index == 0 ? 0x336 : 0x636);
-			pStep->setAlarmDev(index == 0 ? 0x6cd1 : 0x8cd1);
-			if (pEquipment->addStep(0x366, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqProcessStep* pStep = new CEqProcessStep();
-			pStep->setName(STEP_PROCESS);
-			pStep->setWriteSignalDev(index == 0 ? 0x337 : 0x637);
-			pStep->setProcessDev(index == 0 ? 0x7864 : 0x9864);
-			if (pEquipment->addStep(0x367, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
-			pStep->setName(STEP_CIM_MODE_CHANGE);
-			pStep->setWriteSignalDev(index == 0 ? 0x350 : 0x650);
-			pStep->setCimModeDev(index == 0 ? 0x965 : 0x12b5);
-			if (pEquipment->addStep(0x350, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
-			pStep->setName(STEP_CIM_MESSAGE_CMD);
-			pStep->setWriteSignalDev(index == 0 ? 0x351 : 0x651);
-			pStep->setCimMessageDev(index == 0 ? 0x950 : 0x12a0);
-			if (pEquipment->addStep(0x351, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
-			pStep->setName(STEP_CIM_MESSAGE_CLEAR);
-			pStep->setWriteSignalDev(index == 0 ? 0x352 : 0x652);
-			pStep->setClearCimMessageDev(index == 0 ? 0x963 : 0x12b3);
-			if (pEquipment->addStep(0x352, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
-			pStep->setName(STEP_DATETIME_SET_CMD);
-			pStep->setWriteSignalDev(index == 0 ? 0x353 : 0x653);
-			pStep->setDateTimeDev(index == 0 ? 0x966 : 0x12b6);
-			if (pEquipment->addStep(0x353, pStep) != 0) {
-				delete pStep;
-			}
-		}
-		{
-			CEqModeChangeStep* pStep = new CEqModeChangeStep();
-			pStep->setName(STEP_EQ_MODE_CHANGE);
-			pStep->setWriteSignalDev(index == 0 ? 0x355 : 0x655);
-			pStep->setEqModeDev(index == 0 ? 0x96E : 0x12be);
-			if (pEquipment->addStep(0x355, pStep) != 0) {
-				delete pStep;
-			}
-		}
 
 
 		pEquipment->init();
 		LOGE("已添加“%s”.", pEquipment->getName().c_str());
 
 
-		return 0;
+		return pEquipment;
 	}
 
-	int CMaster::addBakeCooling()
+	CBakeCooling* CMaster::addBakeCooling()
 	{
 		CBakeCooling* pEquipment = new CBakeCooling();
 		pEquipment->setID(EQ_ID_BAKE_COOLING);
@@ -807,10 +438,10 @@
 		pEquipment->setStation(0, 255);
 		addToEquipmentList(pEquipment);
 
-
 		pEquipment->init();
 		LOGE("已添加“Aligner”.");
-		return 0;
+
+		return pEquipment;
 	}
 
 	void CMaster::onTimer(UINT nTimerid)
@@ -823,19 +454,23 @@
 		// 按一定频率扫描LB数据
 		static int i = 0;
 		i++;
+		/*
 		if (i % (4 * 1) == 0) {
 
 			for (auto item : m_listEquipment) {
-				const StationIdentifier& station = item->getStation();
-				MemoryBlock& block = item->getReadBitBlock();
+				if (item->getID() == EQ_ID_Bonder1) {
+					const StationIdentifier& station = item->getStation();
+					MemoryBlock& block = item->getReadBitBlock();
 
-				int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
-					block.start, block.size, block.buffer);
-				if (0 == nRet) {
-					item->onReceiveLBData(block.buffer, block.size);
+					int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
+						block.start, block.size, block.buffer);
+					if (0 == nRet) {
+						item->onReceiveLBData(block.buffer, block.size);
+					}
 				}
 			}
 		}
+		*/
 
 
 		// 自动保存缓存

--
Gitblit v1.9.3