Merge branch 'clh' into liuyang

mrDarker

2025-06-26 da96e6da0b677c6a4e96308aaecd3d619a8e4db2

 SourceCode/Bond/Servo/CRobotTask.cpp

@@ -123,7 +123,7 @@
      transformPosAndSlot(toPos, toSlot, tarPos, tarSlot);

      m_robotCmdParam[ACTION_PICK] = {};
      m_robotCmdParam[ACTION_PICK].sequenceNo = static_cast<short>(seq+2);
      m_robotCmdParam[ACTION_PICK].sequenceNo = static_cast<short>(seq+1);
      m_robotCmdParam[ACTION_PICK].rcmd = static_cast<short>(SERVO::RCMD::Get);
      m_robotCmdParam[ACTION_PICK].armNo = static_cast<short>(armNo);
      m_robotCmdParam[ACTION_PICK].getPosition = static_cast<short>(srcPos);
@@ -137,13 +137,13 @@
      m_robotCmdParam[ACTION_PLACE].putSlotNo = static_cast<short>(tarSlot);

      m_robotCmdParam[ACTION_RESTORE] = {};
      m_robotCmdParam[ACTION_RESTORE].sequenceNo = static_cast<short>(seq + 1);
      m_robotCmdParam[ACTION_RESTORE].sequenceNo = static_cast<short>(seq + 3);
      m_robotCmdParam[ACTION_RESTORE].rcmd = static_cast<short>(SERVO::RCMD::Put);
      m_robotCmdParam[ACTION_RESTORE].armNo = static_cast<short>(armNo);
      m_robotCmdParam[ACTION_RESTORE].putPosition = static_cast<short>(srcPos);
      m_robotCmdParam[ACTION_RESTORE].putSlotNo = static_cast<short>(srcSlot);

      return seq + 1;
      return seq + 3;
   }

   ROBOT_CMD_PARAM& CRobotTask::getRobotCmdParam(int index)
@@ -188,6 +188,11 @@
      return m_state == ROBOT_TASK_STATE::Picking;
   }

   bool CRobotTask::isPicked()
   {
      return m_state == ROBOT_TASK_STATE::Picked;
   }

   bool CRobotTask::isPlacing()
   {
      return m_state == ROBOT_TASK_STATE::Placing;
@@ -227,10 +232,7 @@
      ASSERT(m_pEFEM);
      m_state = ROBOT_TASK_STATE::Picking;

      m_pEFEM->robotSendGet(m_robotCmdParam->sequenceNo,
         m_robotCmdParam[ACTION_PICK].armNo,
         m_robotCmdParam[ACTION_PICK].getPosition,
         m_robotCmdParam[ACTION_PICK].getSlotNo,
      m_pEFEM->robotCmd(m_robotCmdParam[ACTION_PICK],
         [&](int code) -> int {
            if (code == WOK) {
               LOGI(_T("RobotTask/get已下发到EFEM"));
@@ -243,15 +245,17 @@
         });
   }

   void CRobotTask::picked()
   {
      m_state = ROBOT_TASK_STATE::Picked;
   }

   void CRobotTask::place()
   {
      ASSERT(m_pEFEM);
      m_state = ROBOT_TASK_STATE::Placing;

      m_pEFEM->robotSendMoveToPut(m_robotCmdParam->sequenceNo,
         m_robotCmdParam[ACTION_PLACE].armNo,
         m_robotCmdParam[ACTION_PLACE].putPosition,
         m_robotCmdParam[ACTION_PLACE].putSlotNo,
      m_pEFEM->robotCmd(m_robotCmdParam[ACTION_PLACE],
         [&](int code) -> int {
            if (code == WOK) {
               LOGI(_T("RobotTask/put已下发到EFEM"));
@@ -269,10 +273,7 @@
      ASSERT(m_pEFEM);
      m_state = ROBOT_TASK_STATE::Restoring;

      m_pEFEM->robotSendMoveToPut(m_robotCmdParam->sequenceNo,
         m_robotCmdParam[ACTION_RESTORE].armNo,
         m_robotCmdParam[ACTION_RESTORE].putPosition,
         m_robotCmdParam[ACTION_RESTORE].putSlotNo,
      m_pEFEM->robotCmd(m_robotCmdParam[ACTION_RESTORE],
         [&](int code) -> int {
            if (code == WOK) {
               LOGI(_T("RobotTask/restore-put已下发到EFEM"));
@@ -290,6 +291,11 @@
      m_state = ROBOT_TASK_STATE::Completed;
   }

   void CRobotTask::restored()
   {
      m_state = ROBOT_TASK_STATE::Restored;
   }

   void CRobotTask::error()
   {
      m_state = ROBOT_TASK_STATE::Error;