Merge branch 'master' into liuyang

mrDarker

2025-06-03 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516

 SourceCode/Bond/Servo/CEFEM.cpp

@@ -409,7 +409,7 @@
         // eq cim mode change
         CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
         pStep->setName(STEP_CIM_MODE_CHANGE);
         pStep->setWriteSignalDev(0x70);
         pStep->setWriteSignalDev(0x60);
         pStep->setCimModeDev(0x15);
         if (addStep(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pStep) != 0) {
            delete pStep;
@@ -420,7 +420,7 @@
         // eq cim message
         CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
         pStep->setName(STEP_CIM_MESSAGE_CMD);
         pStep->setWriteSignalDev(0x71);
         pStep->setWriteSignalDev(0x61);
         pStep->setCimMessageDev(0x0);
         if (addStep(STEP_ID_CIM_MSG_SET_CMD_REPLY, pStep) != 0) {
            delete pStep;
@@ -432,7 +432,7 @@
         // CIM Message Confirm
         CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x5f80);
         pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
         pStep->setWriteSignalDev(0x59);
         pStep->setWriteSignalDev(0x49);
         if (addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
            delete pStep;
         }
@@ -460,7 +460,7 @@
         // eq cim message clear
         CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
         pStep->setName(STEP_CIM_MESSAGE_CLEAR);
         pStep->setWriteSignalDev(0x72);
         pStep->setWriteSignalDev(0x62);
         pStep->setClearCimMessageDev(0x13);
         if (addStep(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pStep) != 0) {
            delete pStep;
@@ -471,7 +471,7 @@
         // datetime set cmd
         CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
         pStep->setName(STEP_DATETIME_SET_CMD);
         pStep->setWriteSignalDev(0x73);
         pStep->setWriteSignalDev(0x63);
         pStep->setDateTimeDev(0x16);
         if (addStep(STEP_ID_DATETIME_SET_CMD_REPLY, pStep) != 0) {
            delete pStep;
@@ -482,7 +482,7 @@
         // vcr enable
         CEqVCREnableStep* pStep = new CEqVCREnableStep();
         pStep->setName(STEP_EQ_VCR_ENABLE);
         pStep->setWriteSignalDev(0x74);
         pStep->setWriteSignalDev(0x64);
         pStep->setEqVCRModeDev(0x1F);
         if (addStep(STEP_ID_VCR_ENABLE_CMD_REPLY, pStep) != 0) {
            delete pStep;
@@ -493,7 +493,7 @@
         // eq mode change
         CEqModeChangeStep* pStep = new CEqModeChangeStep();
         pStep->setName(STEP_EQ_MODE_CHANGE);
         pStep->setWriteSignalDev(0x75);
         pStep->setWriteSignalDev(0x65);
         pStep->setEqModeDev(0x1E);
         if (addStep(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pStep) != 0) {
            delete pStep;
@@ -628,6 +628,12 @@
      }
   }

   // 必须要实现的虚函数，在此初始化Slot信息
   void CEFEM::initSlots()
   {

   }

   void CEFEM::onTimer(UINT nTimerid)
   {
      CEquipment::onTimer(nTimerid);
@@ -646,16 +652,6 @@
   int CEFEM::recvIntent(CPin* pPin, CIntent* pIntent)
   {
      return __super::recvIntent(pPin, pIntent);
   }

   BOOL CEFEM::glassWillArrive(CGlass* pGlass)
   {
      BOOL bRet = __super::glassWillArrive(pGlass);
      if (!bRet) {
         return FALSE;
      }

      return m_glassList.empty();
   }

   void CEFEM::onReceiveLBData(const char* pszData, size_t size)