Merge branch 'clh' into liuyang

mrDarker

2025-06-16 56fd8f57fcc763ae079ae752d82e41b38d7d9e5f

 SourceCode/Bond/Servo/CRobotTask.cpp

@@ -167,9 +167,30 @@
      return m_timeFinish;
   }

   int CRobotTask::getArmNo()
   {
      return m_robotCmdParam[ACTION_PICK].armNo;

   }

   ROBOT_TASK_STATE CRobotTask::getState()
   {
      return m_state;
   }

   bool CRobotTask::isPicking()
   {
      return m_state == ROBOT_TASK_STATE::Picking;
   }

   bool CRobotTask::isPlacing()
   {
      return m_state == ROBOT_TASK_STATE::Placing;
   }

   bool CRobotTask::isRestoring()
   {
      return m_state == ROBOT_TASK_STATE::Restoring;
   }

   void CRobotTask::run()
@@ -299,6 +320,9 @@
      switch (m_state) {
      case ROBOT_TASK_STATE::Ready:     return _T("Ready");
      case ROBOT_TASK_STATE::Running:   return _T("Running");
      case ROBOT_TASK_STATE::Picking:   return _T("Picking");
      case ROBOT_TASK_STATE::Placing:   return _T("Placing");
      case ROBOT_TASK_STATE::Restoring: return _T("Restoring");
      case ROBOT_TASK_STATE::Error:     return _T("Error");
      case ROBOT_TASK_STATE::Abort:     return _T("Abort");
      case ROBOT_TASK_STATE::Completed: return _T("Completed");