From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期二, 03 六月 2025 15:13:42 +0800 Subject: [PATCH] Merge branch 'master' into liuyang --- SourceCode/Bond/Servo/Common.h | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h index 7d09612..590226c 100644 --- a/SourceCode/Bond/Servo/Common.h +++ b/SourceCode/Bond/Servo/Common.h @@ -16,6 +16,8 @@ #define RX_CODE_ALARM_SET 1008 #define RX_CODE_ALARM_CLEAR 1009 #define RX_CODE_EQ_DATA_CHANGED 1010 +#define RX_CODE_MASTER_STATE_CHANGED 1011 +#define RX_CODE_EQ_ROBOT_TASK 1012 /* Channel Name */ @@ -37,7 +39,10 @@ #define CR_MSGBOX_BKGND RGB(7, 71, 166) #define CR_MSGBOX_TITLE RGB(200, 216, 246) #define CR_MSGBOX_MESSAGE RGB(200, 216, 246) - +#define TOP_TOOLBAR_BACKGROUND RGB(240, 240, 240) +#define STATUSBAR_BK_NORMAL RGB(195, 195, 195) +#define STATUSBAR_BK_RUNNING RGB(34, 177, 76) +#define STATUSBAR_BK_ALARM RGB(255, 127, 39) /* LOG BTN */ #define BTN_LOG_FRAME_NORMAL RGB(88, 88, 88) @@ -56,22 +61,22 @@ #define BTN_ALARM_BKGND_PRESS RGB(133, 203, 225) /* Equipment ID */ -#define EQ_ID_EFEM 1 -#define EQ_ID_Bonder1 2 -#define EQ_ID_Bonder2 3 -#define EQ_ID_LOADPORT1 4 -#define EQ_ID_LOADPORT2 5 -#define EQ_ID_LOADPORT3 6 -#define EQ_ID_LOADPORT4 7 +#define EQ_ID_LOADPORT1 1 +#define EQ_ID_LOADPORT2 2 +#define EQ_ID_LOADPORT3 3 +#define EQ_ID_LOADPORT4 4 +#define EQ_ID_ARM_TRAY1 5 +#define EQ_ID_ARM_TRAY2 6 +#define EQ_ID_ALIGNER 7 #define EQ_ID_FLIPER 8 #define EQ_ID_VACUUMBAKE 9 -#define EQ_ID_ALIGNER 10 -#define EQ_ID_BAKE_COOLING 11 -#define EQ_ID_MEASUREMENT 12 -#define EQ_ID_ARM 13 -#define EQ_ID_ARM_TRAY1 14 -#define EQ_ID_ARM_TRAY2 15 -#define EQ_ID_OPERATOR_REMOVE 999 +#define EQ_ID_Bonder1 10 +#define EQ_ID_Bonder2 11 +#define EQ_ID_BAKE_COOLING 12 +#define EQ_ID_MEASUREMENT 13 +#define EQ_ID_EFEM 100 +#define EQ_ID_ARM 101 +#define EQ_ID_OPERATOR_REMOVE 102 /* step name */ @@ -405,12 +410,7 @@ /* 流程控制相关代码 */ -#define FLOW_REJECT 0x0 -#define FLOW_ACCEPT 0x1 #define FLOW_TEST 0x1000 -#define FLOW_SIGNAL 0x1001 -#define FLOW_DATA 0x1002 -#define FLOW_MOVE_MATERIAL 0x1003 /* Port Status */ -- Gitblit v1.9.3