From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期三, 22 十月 2025 14:24:34 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/Common.h | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h index ce4a9d9..3031752 100644 --- a/SourceCode/Bond/Servo/Common.h +++ b/SourceCode/Bond/Servo/Common.h @@ -18,6 +18,7 @@ #define RX_CODE_EQ_DATA_CHANGED 1010 #define RX_CODE_MASTER_STATE_CHANGED 1011 #define RX_CODE_EQ_ROBOT_TASK 1012 +#define RX_CODE_LOADPORT_STATUS_CHANGED 1014 /* Channel Name */ @@ -34,7 +35,7 @@ #define PAGE_GRPAH2_BACKGROUND_COLOR RGB(255, 255, 255) #define EQ_BOX_OFFLINE RGB(222, 222, 222) #define EQ_BOX_ONLINE RGB(0, 176, 80) -#define EQ_BOX_OCCUPIED RGB(0, 204, 102) +#define EQ_BOX_OCCUPIED RGB(255, 127, 39) #define EQ_BOX_FRAME1 RGB(22, 22, 22) #define EQ_BOX_FRAME2 RGB(255, 127, 39) #define CR_MSGBOX_BKGND RGB(7, 71, 166) @@ -444,6 +445,10 @@ #define STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY 0x699 #define STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY 0x69A #define STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY 0x69B +#define STEP_ID_PROT1_CASSETTE_CTR_CMD_REPLY 0x6A0 +#define STEP_ID_PROT2_CASSETTE_CTR_CMD_REPLY 0x6A1 +#define STEP_ID_PROT3_CASSETTE_CTR_CMD_REPLY 0x6A2 +#define STEP_ID_PROT4_CASSETTE_CTR_CMD_REPLY 0x6A3 #define STEP_ID_ROBOT_CMD_REPLY 0x6b0 @@ -543,4 +548,8 @@ #define ROBOT_EVENT_FINISH 1 // 正常完成 #define ROBOT_EVENT_ERROR 2 // 出现错误 #define ROBOT_EVENT_ABORT 3 // 人为中止 -#define ROBOT_EVENT_RESTORE 4 // 回撤 \ No newline at end of file +#define ROBOT_EVENT_RESTORE 4 // 回撤 + + +/* PPID名字最大长度 */ +#define PPID_NAME_MAX 80 \ No newline at end of file -- Gitblit v1.9.3