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/BondEq/Common.h | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 100 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/BondEq/Common.h b/SourceCode/Bond/BondEq/Common.h
index 000ad4b..edd4118 100644
--- a/SourceCode/Bond/BondEq/Common.h
+++ b/SourceCode/Bond/BondEq/Common.h
@@ -7,6 +7,10 @@
#define UNIT1 _T("UNIT1")
+/* 监控数据id */
+#define MONITOR_ID_ALARM 1001
+
+
/* Context Ret code */
#define CRC_ACK_REJECT -3
#define CRC_TIMEOUT -2
@@ -27,11 +31,27 @@
#define RX_CODE_DATA1_END_SAMPLING 1009
#define RX_CODE_DATA1_MATERIAL_REMOVEED 1010
#define RX_CODE_PANEL_COMPLATE 1011
-#define RX_CODE_ALARM_EVENT 1012
-#define RX_CODE_EQSTATE_EVENT 1013
-#define RX_CODE_EFEM_STATUS_CHANGED 1014
-#define RX_CODE_EQ_STATE_CHANGED 1015
-#define RX_CODE_SELECT_COMPONENT 1016
+#define RX_CODE_ALARM_ON 1012
+#define RX_CODE_ALARM_OFF 1013
+#define RX_CODE_EQSTATE_EVENT 1014
+#define RX_CODE_EFEM_STATUS_CHANGED 1015
+#define RX_CODE_EQ_STATE_CHANGED 1016
+#define RX_CODE_SELECT_COMPONENT 1017
+#define RX_CODE_BONDER_BEEP 1018
+#define RX_CODE_BONDER_VELOCITY_RATIO 1019
+#define RX_CODE_BONDER_TACT_TIME 1020
+#define RX_CODE_BONDER_DAY_SHIFT_CAPACTITY 1021
+#define RX_CODE_BONDER_NIGHT_SHIFT_CAPACTITY 1022
+
+// 临时添加 m_bBlBtnsStates[7]
+#define RX_CODE_BONDER_STATES_BTN0 1023
+#define RX_CODE_BONDER_STATES_BTN1 1024
+#define RX_CODE_BONDER_STATES_BTN2 1025
+#define RX_CODE_BONDER_STATES_BTN3 1026
+#define RX_CODE_BONDER_STATES_BTN4 1027
+#define RX_CODE_BONDER_STATES_BTN5 1028
+#define RX_CODE_BONDER_STATES_BTN6 1029
+
/* 广播代码 */
#define BC_CODE_DATA1_MATERIAL_RECEIVED 5000
@@ -39,9 +59,10 @@
#define BC_CODE_DATA1_UPDATE 5002
#define BC_CODE_DATA1_END_SAMPLING 5003
#define BC_CODE_DATA1_MATERIAL_REMOVED 5004
-#define BC_CODE_ALARM_EVENT 5005
-#define BC_CODE_EQSTATE_EVENT 5006
-#define BC_CODE_RUN_RECIPE_RESULT 5007
+#define BC_CODE_ALARM_ON 5005
+#define BC_CODE_ALARM_OFF 5006
+#define BC_CODE_EQSTATE_EVENT 5007
+#define BC_CODE_RUN_RECIPE_RESULT 5008
/* Channel Name */
#define MC_CHANNEL1_NAME "McChannel1"
@@ -89,6 +110,77 @@
#define BTN1_TEXT_FOCUS RGB(51, 51, 51)
#define BTN1_TEXT_DISABLE RGB(191, 191, 191)
+
+/* 轴设定页面颜色定义 */
+
+/* 5个按钮页, 按钮背景色，正常状态*/
+#define BTN_PAGE_FACE_NORMAL_COLOR RGB(0, 168, 0)
+#define BTN_PAGE_FACE_SELECT_COLOR RGB(0, 232, 0)
+#define BTN_PAGE_TEXT_NORMAL_COLOR RGB(22, 22, 22)
+#define BTN_PAGE_TEXT_SELECT_COLOR RGB(22, 22, 22)
+
+/* JOG+, JOG-*/
+#define BTN_JOG_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_JOG_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_JOG_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_JOG_BKGND_NORMAL RGB(0, 232, 0)
+#define BTN_JOG_BKGND_HOVER RGB(0, 222, 0)
+#define BTN_JOG_BKGND_PRESS RGB(0, 168, 0)
+
+/* Sev按钮 */
+#define BTN_SEV_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_SEV_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_SEV_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_SEV_BKGND_NORMAL RGB(0, 232, 0)
+#define BTN_SEV_BKGND_HOVER RGB(0, 222, 0)
+#define BTN_SEV_BKGND_PRESS RGB(222, 0, 0)
+
+/* Stop按钮 */
+#define BTN_STOP_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_STOP_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_STOP_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_STOP_BKGND_NORMAL RGB(0, 168, 0)
+#define BTN_STOP_BKGND_HOVER RGB(0, 138, 0)
+#define BTN_STOP_BKGND_PRESS RGB(222, 0, 0)
+
+/* OPR 按钮 */
+#define BTN_OPR_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_OPR_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_OPR_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_OPR_BKGND_NORMAL RGB(222, 222, 222)
+#define BTN_OPR_BKGND_HOVER RGB(208, 208, 222)
+#define BTN_OPR_BKGND_PRESS RGB(0, 232, 0)
+
+/* 定位按钮 */
+#define BTN_POINT_FRAME_NORMAL RGB(88, 88, 88)
+#define BTN_POINT_FRAME_HOVER RGB(88, 88, 88)
+#define BTN_POINT_FRAME_PRESS RGB(88, 88, 88)
+#define BTN_POINT_BKGND_NORMAL RGB(222, 222, 222)
+#define BTN_POINT_BKGND_HOVER RGB(208, 208, 222)
+#define BTN_POINT_BKGND_PRESS RGB(0, 232, 0)
+
+
+/* 解除警告 按钮 */
+#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)
+
+
/* 按钮id */
#define VIEW_TOOL_BTN_CLOSE 0x1016
--
Gitblit v1.9.3