From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期五, 30 一月 2026 11:16:24 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/Common.h | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h index 3031752..41b56e7 100644 --- a/SourceCode/Bond/Servo/Common.h +++ b/SourceCode/Bond/Servo/Common.h @@ -19,7 +19,12 @@ #define RX_CODE_MASTER_STATE_CHANGED 1011 #define RX_CODE_EQ_ROBOT_TASK 1012 #define RX_CODE_LOADPORT_STATUS_CHANGED 1014 +#define RX_CODE_CONTROL_STATE_CHANGED 1015 +#define RX_CODE_CONTROLJOB_CHANGED 1016 +/* 软件侧 ALID */ +#define ALID_SOFTWARE_PAUSE_EVENT 9000 +#define ALID_SOFTWARE_TEST_ALARM 9099 /* Channel Name */ #define MC_CHANNEL1_NAME "McChannel1" @@ -29,6 +34,7 @@ #define APPDLG_BACKGROUND_COLOR RGB(255, 255, 255) #define LOGDLG_BACKGROUND_COLOR RGB(255, 255, 255) #define PANEL_MASTER_BACKGROUND_COLOR RGB(255, 255, 255) +#define PANEL_PRODUCTION_BACKGROUND_COLOR RGB(255, 255, 255) #define PANEL_ATTRIBUTES_BACKGROUND_COLOR RGB(255, 255, 255) #define PANEL_EQUIPMENT_BACKGROUND_COLOR RGB(255, 255, 255) #define PAGE_GRPAH1_BACKGROUND_COLOR RGB(255, 255, 255) @@ -46,6 +52,8 @@ #define STATUSBAR_BK_STARTING RGB(58, 127, 78) #define STATUSBAR_BK_RUNNING RGB(34, 177, 76) #define STATUSBAR_BK_ALARM RGB(255, 127, 39) +#define CIM_STATUS_BK_SELECTED STATUSBAR_BK_RUNNING +#define CIM_STATUS_BK_DISCONNECTED STATUSBAR_BK_NORMAL /* LOG BTN */ #define BTN_LOG_FRAME_NORMAL RGB(88, 88, 88) @@ -552,4 +560,25 @@ /* PPID名字最大长度 */ -#define PPID_NAME_MAX 80 \ No newline at end of file +#define PPID_NAME_MAX 80 + + +/* 解除警告 按钮 */ +#define BTN_ALARM_OFF_FRAME_NORMAL RGB(88, 88, 88) +#define BTN_ALARM_OFF_FRAME_HOVER RGB(88, 88, 88) +#define BTN_ALARM_OFF_FRAME_PRESS RGB(88, 88, 88) +#define BTN_ALARM_OFF_BKGND_NORMAL RGB(255, 127, 39) +#define BTN_ALARM_OFF_BKGND_HOVER RGB(255, 157, 59) +#define BTN_ALARM_OFF_BKGND_PRESS RGB(255, 100, 29) + +/* 静音按钮 */ +#define BTN_SOUND_OFF_FRAME_NORMAL RGB(88, 88, 88) +#define BTN_SOUND_OFF_FRAME_HOVER RGB(88, 88, 88) +#define BTN_SOUND_OFF_FRAME_PRESS RGB(88, 88, 88) +#define BTN_SOUND_OFF_BKGND_NORMAL RGB(255, 127, 39) +#define BTN_SOUND_OFF_BKGND_HOVER RGB(255, 157, 59) +#define BTN_SOUND_OFF_BKGND_PRESS RGB(255, 100, 29) +#define BTN_SOUND_ON_BKGND_NORMAL RGB(100, 200, 100) +#define BTN_SOUND_ON_BKGND_HOVER RGB(150, 250, 150) +#define BTN_SOUND_ON_BKGND_PRESS RGB(50, 150, 50) + -- Gitblit v1.9.3