From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期日, 04 一月 2026 10:45:07 +0800 Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。 --- SourceCode/Bond/Servo/Common.h | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h index ce4a9d9..ed3798c 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 */ @@ -28,13 +29,14 @@ #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) #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) @@ -45,6 +47,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) @@ -444,6 +448,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 +551,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