1. 添加搬运记录对话框 2. 修复搬运记录的数据库管理类的中文问题

mrDarker

2025-05-30 d119dcff794370b1852c0e9a3cda28d8d2bc6ae8

 SourceCode/Bond/Servo/CMaster.cpp

@@ -2,8 +2,19 @@
#include "Common.h"
#include "CMaster.h"


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) {
@@ -13,37 +24,39 @@

   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()
   {
      for (auto item : m_listEquipment) {
         delete item;
      if (m_hEventReadBitsThreadExit[0] != nullptr) {
         ::CloseHandle(m_hEventReadBitsThreadExit[0]);
         m_hEventReadBitsThreadExit[0] = nullptr;
      }
      m_listEquipment.clear();

      if (m_hEventReadBitsThreadExit[1] != nullptr) {
         ::CloseHandle(m_hEventReadBitsThreadExit[1]);
         m_hEventReadBitsThreadExit[1] = nullptr;
      }
   }

   void CMaster::setListener(MasterListener listener)
   {
      m_listener.onEqAlive = listener.onEqAlive;
      m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
      m_listener.onEqStepEvent = listener.onEqStepEvent;
      m_listener.onEqAlarm = listener.onEqAlarm;
      m_listener.onEqVcrEventReport = listener.onEqVcrEventReport;
      m_listener.onEqDataChanged = listener.onEqDataChanged;
   }

   int CMaster::init()
   {
      LOGI("<Master>正在初始化...");


      StepListener listener;
      listener.onEvent = [&](void* pStep, int code, void* pData) -> void {
         TRACE("<CEquipment>onEvent<%d, 0x%x>.\n", code, pData);
         if (m_listener.onEqStepEvent != nullptr) {
            m_listener.onEqStepEvent((CStep*)pStep, code, pData);
         }
      };


      //    cclink
@@ -73,18 +86,68 @@


      // 初始化添加各子设备
      addLoadPort(0, listener);
      addLoadPort(1, listener);
      addLoadPort(2, listener);
      addLoadPort(3, listener);
      addFliper(listener);
      addVacuumBake(listener);
      addAligner(listener);
      addEFEM(listener);
      addBonder(0, listener);
      addBonder(1, listener);
      addBakeCooling(listener);
      CLoadPort* pPort1, * pPort2, * pPort3, * pPort4;
      CBonder* pBonder1, * pBonder2;
      CEFEM* pEfem;
      CArm* pArm;
      CArmTray* pArmTray1, * pArmTray2;
      CFliper* pFliper;
      CVacuumBake* pVacuumBake;
      CAligner* pAligner;
      CBakeCooling* pBakeCooling;
      CMeasurement* pMeasurement;

      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();
      pMeasurement = addMeasurement();

      ASSERT(pEfem);
      ASSERT(pFliper);
      ASSERT(pVacuumBake);
      ASSERT(pAligner);
      ASSERT(pBonder1);
      ASSERT(pBonder2);
      ASSERT(pBakeCooling);
      ASSERT(pMeasurement);

      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);
      pMeasurement->setArm(pArm);

      connectEquipments();




      
      // 读缓存数据
@@ -96,12 +159,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();
@@ -109,6 +179,44 @@
      saveCache();


      for (auto item : m_listEquipment) {
         delete item;
      }
      m_listEquipment.clear();


      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;
   }

@@ -127,8 +235,25 @@
            m_listener.onEqCimStateChanged(this, p, bOn);
         }
      };
      listener.onAlarm = [&](void* pEquipment, int state, int alarmId, int unitId, int level) -> void {
         CEquipment* p = (CEquipment*)pEquipment;
         if (m_listener.onEqAlarm != nullptr) {
            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);
@@ -152,34 +277,39 @@
      return nullptr;
   }

   /* 添加LoadPort1
   /*
    * 添加LoadPort1
    * index -- 0~3
    */
   int CMaster::addLoadPort(int index, StepListener& listener)
   CLoadPort* CMaster::addLoadPort(int index)
   {
      ASSERT(index == 0 || index == 1 || index == 2 || index == 3);


      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);


      pEquipment->init();
      LOGE("已添加“%s”.", pEquipment->getName().c_str());


      return 0;
      return pEquipment;
   }

   int CMaster::addFliper(StepListener& listener)
   CFliper* CMaster::addFliper()
   {
      CFliper* pEquipment = new CFliper();
      pEquipment->setID(EQ_ID_FLIPER);
      pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
      pEquipment->setName("Fliper");
      pEquipment->setDescription("Fliper.");
      pEquipment->setName("Fliper(G2)");
      pEquipment->setDescription("Fliper(G2).");
      pEquipment->setReadBitBlock(0x4000, 0x45ff);
      pEquipment->setStation(0, 255);
      addToEquipmentList(pEquipment);
@@ -187,16 +317,16 @@

      pEquipment->init();
      LOGE("已添加“Fliper”.");
      return 0;
      return pEquipment;
   }

   int CMaster::addVacuumBake(StepListener& listener)
   CVacuumBake* CMaster::addVacuumBake()
   {
      CVacuumBake* pEquipment = new CVacuumBake();
      pEquipment->setID(EQ_ID_VACUUMBAKE);
      pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
      pEquipment->setName("VacuumBake");
      pEquipment->setDescription("VacuumBake.");
      pEquipment->setName("VacuumBake(G1)");
      pEquipment->setDescription("VacuumBake(G1).");
      pEquipment->setReadBitBlock(0x4000, 0x45ff);
      pEquipment->setStation(0, 255);
      addToEquipmentList(pEquipment);
@@ -204,10 +334,11 @@

      pEquipment->init();
      LOGE("已添加“VacuumBake”.");
      return 0;

      return pEquipment;
   }

   int CMaster::addAligner(StepListener& listener)
   CAligner* CMaster::addAligner()
   {
      CAligner* pEquipment = new CAligner();
      pEquipment->setID(EQ_ID_ALIGNER);
@@ -221,326 +352,86 @@

      pEquipment->init();
      LOGE("已添加“Aligner”.");
      return 0;

      return pEquipment;
   }

   int CMaster::addEFEM(StepListener& listener)
   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->setListener(listener);
         pStep->setWriteSignalDev(0x30);
         pStep->setModeDev(0x4a8c);
         if (pEquipment->addStep(0x360, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqStatusStep* pStep = new CEqStatusStep();
         pStep->setName(STEP_STATUS);
         pStep->setListener(listener);
         pStep->setWriteSignalDev(0x31);
         pStep->setStatusDev(0x4a68);
         if (pEquipment->addStep(0x361, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqAlarmStep* pStep = new CEqAlarmStep();
         pStep->setName(STEP_ALARM_BLOCK1);
         pStep->setListener(listener);
         pStep->setWriteSignalDev(0x32);
         pStep->setAlarmDev(0x4c1d);
         if (pEquipment->addStep(0x362, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqAlarmStep* pStep = new CEqAlarmStep();
         pStep->setName(STEP_ALARM_BLOCK2);
         pStep->setListener(listener);
         pStep->setWriteSignalDev(0x33);
         pStep->setAlarmDev(0x4c4a);
         if (pEquipment->addStep(0x363, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqAlarmStep* pStep = new CEqAlarmStep();
         pStep->setName(STEP_ALARM_BLOCK3);
         pStep->setListener(listener);
         pStep->setWriteSignalDev(0x34);
         pStep->setAlarmDev(0x4c77);
         if (pEquipment->addStep(0x364, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqAlarmStep* pStep = new CEqAlarmStep();
         pStep->setName(STEP_ALARM_BLOCK4);
         pStep->setListener(listener);
         pStep->setWriteSignalDev(0x35);
         pStep->setAlarmDev(0x4ca4);
         if (pEquipment->addStep(0x365, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqAlarmStep* pStep = new CEqAlarmStep();
         pStep->setName(STEP_ALARM_BLOCK5);
         pStep->setListener(listener);
         pStep->setWriteSignalDev(0x36);
         pStep->setAlarmDev(0x4cd1);
         if (pEquipment->addStep(0x366, pStep) != 0) {
            delete pStep;
         }
      }
      {
         CEqProcessStep* pStep = new CEqProcessStep();
         pStep->setName(STEP_PROCESS);
         pStep->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         pStep->setWriteSignalDev(0x55);
         pStep->setEqModeDev(0x1E);
         if (pEquipment->addStep(0x355, pStep) != 0) {
            delete pStep;
         }
      }

      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, StepListener& listener)
   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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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->setListener(listener);
         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(StepListener& listener)
   CBakeCooling* CMaster::addBakeCooling()
   {
      CBakeCooling* pEquipment = new CBakeCooling();
      pEquipment->setID(EQ_ID_BAKE_COOLING);
@@ -551,10 +442,27 @@
      pEquipment->setStation(0, 255);
      addToEquipmentList(pEquipment);


      pEquipment->init();
      LOGE("已添加“Aligner”.");
      return 0;

      return pEquipment;
   }

   CMeasurement* CMaster::addMeasurement()
   {
      CMeasurement* pEquipment = new CMeasurement();
      pEquipment->setID(EQ_ID_MEASUREMENT);
      pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
      pEquipment->setName("Measurement");
      pEquipment->setDescription("Measurement.");
      pEquipment->setReadBitBlock(0x6700, 0x6e00);
      pEquipment->setStation(0, 255);
      addToEquipmentList(pEquipment);

      pEquipment->init();
      LOGE("已添加“Measurement”.");

      return pEquipment;
   }

   void CMaster::onTimer(UINT nTimerid)
@@ -567,19 +475,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);
               }
            }
         }
      }
      */


      // 自动保存缓存
@@ -605,6 +517,7 @@
      CBonder* pBonder1 = (CBonder*)getEquipment(EQ_ID_Bonder1);
      CBonder* pBonder2 = (CBonder*)getEquipment(EQ_ID_Bonder2);
      CBakeCooling* pBakeCooling = (CBakeCooling*)getEquipment(EQ_ID_BAKE_COOLING);
      CMeasurement* pMeasurement = (CMeasurement*)getEquipment(EQ_ID_MEASUREMENT);

      nRet = pLoadPort1->getPin("Out1")->connectPin(pFliper->getPin("In1"));
      if (nRet < 0) {
@@ -654,12 +567,17 @@
         LOGE("连接Bonder2-BakeCooling失败");
      }

      nRet = pBakeCooling->getPin("Out1")->connectPin(pLoadPort3->getPin("In"));
      nRet = pBakeCooling->getPin("Out")->connectPin(pMeasurement->getPin("In"));
      if (nRet < 0) {
         LOGE("连接BakeCooling-LoadPort3失败");
      }

      nRet = pBakeCooling->getPin("Out2")->connectPin(pLoadPort4->getPin("In"));
      nRet = pMeasurement->getPin("Out1")->connectPin(pLoadPort3->getPin("In"));
      if (nRet < 0) {
         LOGE("连接BakeCooling-LoadPort3失败");
      }

      nRet = pMeasurement->getPin("Out2")->connectPin(pLoadPort4->getPin("In"));
      if (nRet < 0) {
         LOGE("连接BakeCooling-LoadPort4失败");
      }
@@ -711,15 +629,23 @@

   int CMaster::readCache()
   {
      CFile file;
      if (!file.Open(m_strFilepath.c_str(), CFile::modeRead)) {
         return -1;
      }
      try {
         CFile file;
         if (!file.Open(m_strFilepath.c_str(), CFile::modeRead)) {
            return -1;
         }

      CArchive ar(&file, CArchive::load);
      serialize(ar);
      ar.Close();
      file.Close();
         CArchive ar(&file, CArchive::load);
         serialize(ar);
         ar.Close();
         file.Close();
      }
      catch (CFileException* e) {
         TCHAR szErr[512];
         e->GetErrorMessage(szErr, 512);
         AfxMessageBox(szErr);
         e->Delete();
      }

      return 0;
   }