Merge branch 'clh' into liuyang

mrDarker

2025-09-08 6dc80508b1c0f431007f8a8c947c152ec00c3d15

 SourceCode/Bond/Servo/CEFEM.cpp

@@ -137,7 +137,7 @@
            }

            return 0;
            });
         });
      }

      return 0;
@@ -473,6 +473,7 @@
         pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
         pStep->setProp("Port", (void*)1);
         pStep->setWriteSignalDev(0x4a);
         pStep->setReturnDev(0x91e);
         if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
            delete pStep;
         }
@@ -540,6 +541,27 @@
         pStep->setWriteSignalDev(0x66);
         pStep->setDataDev(0x90a);
         if (addStep(STEP_ID_MASTER_RECIPE_LIST_CMD_REPLY, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // master recipe list report
         CEqReadStep* pStep = new CEqReadStep(0x6955, 255 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
               CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
               short ret = MRLRC_OK;
               if (code == ROK && pszData != nullptr && size > 0) {
                  // 此处解释配方数据
                  ret = decodeRecipeListReport(pszData, size);
               }
               pTmpStep->setReturnCode(ret);
               return -1;
            });
         pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
         pStep->setWriteSignalDev(0x4b);
         pStep->setReturnDev(0x91d);
         if (addStep(STEP_ID_MASTER_RECIPE_LIST_REPORT, pStep) != 0) {
            delete pStep;
         }
      }
@@ -676,23 +698,6 @@
      }

      {
         // Panel Data Report
         CEqReadStep* pStep = new CEqReadStep(0x617f, 386 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
               if (code == ROK && pszData != nullptr && size > 0) {
                  decodePanelDataReport((CStep*)pFrom, pszData, size);
               }
               return -1;
            });
         pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
         pStep->setProp("Port", (void*)1);
         pStep->setWriteSignalDev(0x15e);
         if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
            delete pStep;
         }
      }

      {
         // FAC Data Report
         CEqReadStep* pStep = new CEqReadStep(0x6301, 108 * 2,
            [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
@@ -727,7 +732,6 @@
                  if (m_pActiveContext != nullptr) {
                     CJobDataS* pJobDataS = ((CGlass*)m_pActiveContext)->getJobDataS();
                     if (pJobDataS != nullptr) {
                        pJobDataS->serialize(szBuffer, 1024);
                        pJobDataS->serialize(szBuffer, 1024);
                        ack = (short)JobDataRequestAck::OK;
                     }
@@ -804,16 +808,27 @@
            m_pPort[i]->onReceiveLBData(pszData, size);
         }
      }
      m_pAligner->onReceiveLBData(pszData, size);


      // 更新信号到LoadPort, Robot, Aligner, Fliper
      m_pPort[0]->setLinkSignalBlock(0, &m_bLinkSignal[0][0]);
      m_pPort[1]->setLinkSignalBlock(0, &m_bLinkSignal[1][0]);
      m_pPort[2]->setLinkSignalBlock(0, &m_bLinkSignal[2][0]);
      m_pPort[3]->setLinkSignalBlock(0, &m_bLinkSignal[3][0]);
      m_pArmTray[0]->setLinkSignalBlock(0, &m_bLinkSignal[4][0]);
      m_pArmTray[1]->setLinkSignalBlock(0, &m_bLinkSignal[5][0]);
      m_pAligner->setLinkSignalBlock(0, &m_bLinkSignal[6][0]);
      m_pFliper->setLinkSignalBlock(0, &m_bLinkSignal[7][0]);
      m_pPort[0]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[0][0]);
      m_pPort[1]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[1][0]);
      m_pPort[2]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[2][0]);
      m_pPort[3]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[3][0]);
      m_pArmTray[0]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[4][0]);
      m_pArmTray[1]->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[5][0]);
      m_pAligner->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[6][0]);
      m_pFliper->setLinkSignalUpstreamBlock(0, &m_bLinkSignalToUpstream[7][0]);

      m_pPort[0]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[0][0]);
      m_pPort[1]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[1][0]);
      m_pPort[2]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[2][0]);
      m_pPort[3]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[3][0]);
      m_pArmTray[0]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[4][0]);
      m_pArmTray[1]->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[5][0]);
      m_pAligner->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[6][0]);
      m_pFliper->setLinkSignalDownstreamBlock(0, &m_bLinkSignalToDownstream[7][0]);
   }

   int CEFEM::onReceivedJob(int port, CJobDataS* pJobDataS)
@@ -872,4 +887,12 @@
   {
      return 10000;
   }

   void CEFEM::printDebugRobotState()
   {
      LOGI("<CEFEM>Robot status:%d, ARM1:%s, ARM2:%s",
         m_robotData.status,
         m_robotData.armState[0] ? _T("ON") : _T("OFF"),
         m_robotData.armState[1] ? _T("ON") : _T("OFF"));
   }
}