Merge branch 'clh' into liuyang

mrDarker

2025-10-22 e8a27bb203fe2aff70390a5eca002d7438da9b0f

 SourceCode/Bond/Servo/ServoCommo.h

@@ -19,6 +19,19 @@
   }                                                      \
}

#define CHECK_RUN_ACTIVE_ROBOT_TASK(art) {                           \
   if (art != nullptr) {                                       \
      art->pick();                                          \
      std::string strDescription = art->getDescription();               \
      unlock();                                             \
      if (m_listener.onRobotTaskEvent != nullptr) {                  \
         m_listener.onRobotTaskEvent(this, art, ROBOT_EVENT_CREATE);      \
      }                                                   \
      LOGI("创建新任务<%s>...", strDescription.c_str());               \
      continue;                                             \
   }                                                      \
}

namespace SERVO {
#define BLOCK_BUFFER_MAX         1024
#define ALIVE_TIMEOUT            15
@@ -60,6 +73,7 @@
   };

   enum class MaterialsType {
      G0 = 0,
      G1 = 1,
      G2 = 2,
      G1G2 = 3
@@ -209,5 +223,21 @@
   /* EQ Data changed code */
#define EDCC_FETCHOUT_JOB            1000   /* ȡƬ */
#define EDCC_STORED_JOB               1001   /* 放片 */


   /* Cassette Ctrl CMD */
#define CCC_MAP_DOWNLOAD         1
#define CCC_CLAMP               2
#define CCC_UNCLAMP               3
#define CCC_RECLAMP               4
#define CCC_PROCESS_START         5
#define CCC_PROCESS_START_BY_COUNT   6
#define CCC_PROCESS_PAUSE         7
#define CCC_PROCESS_RESUME         8
#define CCC_PROCESS_ABORT         9
#define CCC_PROCESS_CANCEL         10
#define CCC_PROCESS_END            11
#define CCC_ID_UPDATE            12
#define CCC_MAP_UPDATE            13
}