From bea6407b376a4e426f0b120bae569fba6ab867db Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 08 十一月 2025 17:55:47 +0800
Subject: [PATCH] 1.CMaster.cpp 第 1644/1667/1691 行在记录 SV 曲线时通过 getGlassFromSlot(0) 取玻璃，而各设备的 initSlots() 都是从 1 开始编号（例如 CBonder.cpp (line 408)、CVacuumBake.cpp (line 415) 等）。槽位 0 永远不存在，所以 pGlass 始终是 nullptr，pGlass->addSVData(...) 的分支从未执行。结果 SERVO::CGlass::m_svDatas 里没有任何曲线数据，GlassJson::ToPrettyString 生成的 pretty 字符串也就没有 sv_datas，导出 CSV 时自然读不到曲线。 同一段代码还有一个潜在 Bug：虽然判断了 channel - 1 < bonderTypes.size()，但真正索引却用的是 bonderTypes[channel]。索引偏移会导致数据类型错位，最后一个通道甚至可能越界。即使修正了槽位，这里也需要同步改成 bonderTypes[channel - 1]（另外两处 vacuumbakeTypes、coolingTypes 也一样）。
---
SourceCode/Bond/Servo/Common.h | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h
index 913285f..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,6 +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(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)
@@ -79,6 +81,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")
@@ -247,6 +292,8 @@
#define STEP_EQ_PANEL_DATA_REPORT _T("EQPanelDataReport")
#define STEP_EQ_FAC_DATA_REPORT _T("EQFacDataReport")
#define STEP_EFEM_PANEL_DATA_REQUEST _T("EFEMPanelDataRequest")
+#define STEP_EQ_JOB_PROCESS_START_REPORT _T("EQJobProcessStartReport")
+#define STEP_EQ_JOB_PROCESS_END_REPORT _T("EQJobProcessEndReport")
/* Step ID */
#define STEP_ID_CIMMODE_CHANGED_CMD_REPLY 0x550
@@ -319,6 +366,9 @@
#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_PROCESS_START_REPORT 0x5BF
+#define STEP_ID_JOB_PROCESS_END_REPORT 0x5C0
+#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
@@ -395,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
@@ -493,4 +547,9 @@
#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 // 回撤
+
+
+/* PPID名字最大长度 */
+#define PPID_NAME_MAX 80
\ No newline at end of file
--
Gitblit v1.9.3