From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/Common.h |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h
index 913285f..632b505 100644
--- a/SourceCode/Bond/Servo/Common.h
+++ b/SourceCode/Bond/Servo/Common.h
@@ -79,6 +79,49 @@
 #define EQ_ID_ARM				101
 #define EQ_ID_OPERATOR_REMOVE	102
 
+/* Equipment Name */
+#define EQ_NAME_LOADPORT1			"LoadPort1"
+#define EQ_NAME_LOADPORT2			"LoadPort2"
+#define EQ_NAME_LOADPORT3			"LoadPort3"
+#define EQ_NAME_LOADPORT4			"LoadPort4"
+#define EQ_NAME_ARM_TRAY1			"ArmTray1"
+#define EQ_NAME_ARM_TRAY2			"ArmTray2"
+#define EQ_NAME_ALIGNER				"Aligner"
+#define EQ_NAME_FLIPER				"Fliper"
+#define EQ_NAME_VACUUMBAKE			"VacuumBake"
+#define EQ_NAME_BONDER1				"Bonder1"
+#define EQ_NAME_BONDER2				"Bonder2"
+#define EQ_NAME_BAKE_COOLING		"BakeCooling"
+#define EQ_NAME_MEASUREMENT			"Measurement"
+#define EQ_NAME_EFEM				"EFEM"
+#define EQ_NAME_ARM					"Arm"
+#define EQ_NAME_OPERATOR_REMOVE		"OperatorRemove"
+
+// 设备元信息结构体
+struct DeviceMetaInfo {
+	int nDeviceID;
+	const char* strDeviceName;  // 指针,仅指向常量字符串
+};
+
+// 全局设备元信息列表
+static const DeviceMetaInfo g_allDeviceMetaInfos[] = {
+	{EQ_ID_LOADPORT1, EQ_NAME_LOADPORT1},
+	{EQ_ID_LOADPORT2, EQ_NAME_LOADPORT2},
+	{EQ_ID_LOADPORT3, EQ_NAME_LOADPORT3},
+	{EQ_ID_LOADPORT4, EQ_NAME_LOADPORT4},
+	{EQ_ID_ARM_TRAY1, EQ_NAME_ARM_TRAY1},
+	{EQ_ID_ARM_TRAY2, EQ_NAME_ARM_TRAY2},
+	{EQ_ID_ALIGNER,   EQ_NAME_ALIGNER},
+	{EQ_ID_FLIPER,    EQ_NAME_FLIPER},
+	{EQ_ID_VACUUMBAKE, EQ_NAME_VACUUMBAKE},
+	{EQ_ID_Bonder1, EQ_NAME_BONDER1},
+	{EQ_ID_Bonder2, EQ_NAME_BONDER2},
+	{EQ_ID_BAKE_COOLING, EQ_NAME_BAKE_COOLING},
+	{EQ_ID_MEASUREMENT, EQ_NAME_MEASUREMENT},
+	{EQ_ID_EFEM, EQ_NAME_EFEM},
+	{EQ_ID_ARM, EQ_NAME_ARM},
+	{EQ_ID_OPERATOR_REMOVE, EQ_NAME_OPERATOR_REMOVE},
+};
 
 /* step name */
 #define STEP_MODE						_T("EQMode")
@@ -319,6 +362,7 @@
 #define STEP_ID_FETCHED_OUT_JOB_REPORT13		0x5BB
 #define STEP_ID_FETCHED_OUT_JOB_REPORT14		0x5BC
 #define STEP_ID_FETCHED_OUT_JOB_REPORT15		0x5BD
+#define STEP_ID_JOB_DATA_REQUEST				0x5C1
 #define STEP_ID_PANEL_DATA_REQUEST				0x5D0
 #define STEP_ID_PANEL_DATA_REPORT				0x5D1
 #define STEP_ID_IN_OP_CMD_REPLY					0x5F0
@@ -493,4 +537,5 @@
 #define ROBOT_EVENT_CREATE		0   // 新任务创建
 #define ROBOT_EVENT_FINISH		1   // 正常完成
 #define ROBOT_EVENT_ERROR		2   // 出现错误
-#define ROBOT_EVENT_ABORT		3   // 人为中止
\ No newline at end of file
+#define ROBOT_EVENT_ABORT		3   // 人为中止
+#define ROBOT_EVENT_RESTORE		4   // 回撤
\ No newline at end of file

--
Gitblit v1.9.3