From 6fc65c5cf54432d1044fbe9799aca76f7273798c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 23 五月 2025 18:02:27 +0800
Subject: [PATCH] Merge branch 'clh'

---
 SourceCode/Bond/Servo/Common.h |  163 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h
index cf7464a..7d09612 100644
--- a/SourceCode/Bond/Servo/Common.h
+++ b/SourceCode/Bond/Servo/Common.h
@@ -34,6 +34,9 @@
 #define EQ_BOX_ONLINE						RGB(0, 176, 80)
 #define EQ_BOX_FRAME1						RGB(22, 22, 22)
 #define EQ_BOX_FRAME2						RGB(255, 127, 39)
+#define CR_MSGBOX_BKGND						RGB(7, 71, 166)
+#define CR_MSGBOX_TITLE						RGB(200, 216, 246)
+#define CR_MSGBOX_MESSAGE					RGB(200, 216, 246)
 
 
 /* LOG BTN */
@@ -64,9 +67,10 @@
 #define EQ_ID_VACUUMBAKE		9
 #define EQ_ID_ALIGNER			10
 #define EQ_ID_BAKE_COOLING		11
-#define EQ_ID_ARM				12
-#define EQ_ID_ARM_TRAY1			13
-#define EQ_ID_ARM_TRAY2			14
+#define EQ_ID_MEASUREMENT		12
+#define EQ_ID_ARM				13
+#define EQ_ID_ARM_TRAY1			14
+#define EQ_ID_ARM_TRAY2			15
 #define EQ_ID_OPERATOR_REMOVE	999
 
 
@@ -110,30 +114,30 @@
 #define STEP_EQ_PORT4_TRANSFER_MODE		_T("EQPort4TransferMode")
 #define STEP_EQ_PORT4_ENABLE			_T("EQPort4Enable")
 #define STEP_EQ_PORT4_TYPE_ATUO			_T("EQPort4TypeAuto")
-#define STEP_EQ_P1_CASSETTE_EMPTY		_T("EQPort1CassetteEmpty")
-#define STEP_EQ_P1_CASSETTE_LOAD_EADY	_T("EQPort1CassetteLoadReady")
-#define STEP_EQ_P1_CASSETTE_LOADED		_T("EQPort1CassetteLoaded")
-#define STEP_EQ_P1_CASSETTE_INUSE		_T("EQPort1CassetteInUse")
-#define STEP_EQ_P1_CASSETTE_UNLOAD_EADY	_T("EQPort1CassetteUnloadReady")
-#define STEP_EQ_P1_CASSETTE_BLOCKED		_T("EQPort1CassetteBlocked")
-#define STEP_EQ_P2_CASSETTE_EMPTY		_T("EQPort2CassetteEmpty")
-#define STEP_EQ_P2_CASSETTE_LOAD_EADY	_T("EQPort2CassetteLoadReady")
-#define STEP_EQ_P2_CASSETTE_LOADED		_T("EQPort2CassetteLoaded")
-#define STEP_EQ_P2_CASSETTE_INUSE		_T("EQPort2CassetteInUse")
-#define STEP_EQ_P2_CASSETTE_UNLOAD_EADY	_T("EQPort2CassetteUnloadReady")
-#define STEP_EQ_P2_CASSETTE_BLOCKED		_T("EQPort2CassetteBlocked")
-#define STEP_EQ_P3_CASSETTE_EMPTY		_T("EQPort3CassetteEmpty")
-#define STEP_EQ_P3_CASSETTE_LOAD_EADY	_T("EQPort3CassetteLoadReady")
-#define STEP_EQ_P3_CASSETTE_LOADED		_T("EQPort3CassetteLoaded")
-#define STEP_EQ_P3_CASSETTE_INUSE		_T("EQPort3CassetteInUse")
-#define STEP_EQ_P3_CASSETTE_UNLOAD_EADY	_T("EQPort3CassetteUnloadReady")
-#define STEP_EQ_P3_CASSETTE_BLOCKED		_T("EQPort3CassetteBlocked")
-#define STEP_EQ_P4_CASSETTE_EMPTY		_T("EQPort4CassetteEmpty")
-#define STEP_EQ_P4_CASSETTE_LOAD_EADY	_T("EQPort4CassetteLoadReady")
-#define STEP_EQ_P4_CASSETTE_LOADED		_T("EQPort4CassetteLoaded")
-#define STEP_EQ_P4_CASSETTE_INUSE		_T("EQPort4CassetteInUse")
-#define STEP_EQ_P4_CASSETTE_UNLOAD_EADY	_T("EQPort4CassetteUnloadReady")
-#define STEP_EQ_P4_CASSETTE_BLOCKED		_T("EQPort4CassetteBlocked")
+#define STEP_EQ_PORT1_EMPTY				_T("EQPort1Empty")
+#define STEP_EQ_PORT1_LOAD_EADY			_T("EQPort1LoadReady")
+#define STEP_EQ_PORT1_LOADED			_T("EQPort1Loaded")
+#define STEP_EQ_PORT1_INUSE				_T("EQPort1InUse")
+#define STEP_EQ_PORT1_UNLOAD_EADY		_T("EQPort1UnloadReady")
+#define STEP_EQ_PORT1_BLOCKED			_T("EQPort1Blocked")
+#define STEP_EQ_PORT2_EMPTY				_T("EQPort2Empty")
+#define STEP_EQ_PORT2_LOAD_EADY			_T("EQPort2LoadReady")
+#define STEP_EQ_PORT2_LOADED			_T("EQPort2Loaded")
+#define STEP_EQ_PORT2_INUSE				_T("EQPort2InUse")
+#define STEP_EQ_PORT2_UNLOAD_EADY		_T("EQPort2UnloadReady")
+#define STEP_EQ_PORT2_BLOCKED			_T("EQPort2Blocked")
+#define STEP_EQ_PORT3_EMPTY				_T("EQPort3Empty")
+#define STEP_EQ_PORT3_LOAD_EADY			_T("EQPort3LoadReady")
+#define STEP_EQ_PORT3_LOADED			_T("EQPort3Loaded")
+#define STEP_EQ_PORT3_INUSE				_T("EQPort3InUse")
+#define STEP_EQ_PORT3_UNLOAD_EADY		_T("EQPort3UnloadReady")
+#define STEP_EQ_PORT3_BLOCKED			_T("EQPort3Blocked")
+#define STEP_EQ_PORT4_EMPTY				_T("EQPort4Empty")
+#define STEP_EQ_PORT4_LOAD_EADY			_T("EQPort4LoadReady")
+#define STEP_EQ_PORT4_LOADED			_T("EQPort4Loaded")
+#define STEP_EQ_PORT4_INUSE				_T("EQPort4InUse")
+#define STEP_EQ_PORT4_UNLOAD_EADY		_T("EQPort4UnloadReady")
+#define STEP_EQ_PORT4_BLOCKED			_T("EQPort4Blocked")
 #define STEP_EQ_P1_CASSETTE_CTRL_CMD	_T("EQPort1CassetteCtrlCmd")
 #define STEP_EQ_P2_CASSETTE_CTRL_CMD	_T("EQPort2CassetteCtrlCmd")
 #define STEP_EQ_P3_CASSETTE_CTRL_CMD	_T("EQPort3CassetteCtrlCmd")
@@ -209,7 +213,31 @@
 #define STEP_EQ_STORED_JOB15			_T("EQStoredJobReport15")
 #define STEP_EQ_DISPATCHINT_MODE_CHANGE	_T("EQDispatchingModeChangeCommand")
 #define STEP_EFEM_ROBOT_CMD				_T("EFEMRobotCmd")
-
+#define STEP_EFEM_IN_OP_MODE_CHANGE		_T("EFEMIndexerOperationModeChangeCommand")
+#define STEP_PORT1_TYPE_CHANGE			_T("Port1TypeChange")
+#define STEP_PORT2_TYPE_CHANGE			_T("Port2TypeChange")
+#define STEP_PORT3_TYPE_CHANGE			_T("Port3TypeChange")
+#define STEP_PORT4_TYPE_CHANGE			_T("Port4TypeChange")
+#define STEP_PORT1_MODE_CHANGE			_T("Port1ModeChange")
+#define STEP_PORT2_MODE_CHANGE			_T("Port2ModeChange")
+#define STEP_PORT3_MODE_CHANGE			_T("Port3ModeChange")
+#define STEP_PORT4_MODE_CHANGE			_T("Port4ModeChange")
+#define STEP_PORT1_TRANSFER_MODE_CHANGE	_T("Port1TransferModeChange")
+#define STEP_PORT2_TRANSFER_MODE_CHANGE	_T("Port2TransferModeChange")
+#define STEP_PORT3_TRANSFER_MODE_CHANGE	_T("Port3TransferModeChange")
+#define STEP_PORT4_TRANSFER_MODE_CHANGE	_T("Port4TransferModeChange")
+#define STEP_PORT1_ENABLE_MODE_CHANGE	_T("Port1EnableModeChange")
+#define STEP_PORT2_ENABLE_MODE_CHANGE	_T("Port2EnableModeChange")
+#define STEP_PORT3_ENABLE_MODE_CHANGE	_T("Port3EnableModeChange")
+#define STEP_PORT4_ENABLE_MODE_CHANGE	_T("Port4EnableModeChange")
+#define STEP_PORT1_TYPE_AUTO_CHANGE		_T("Port1TypeAutoChange")
+#define STEP_PORT2_TYPE_AUTO_CHANGE		_T("Port2TypeAutoChange")
+#define STEP_PORT3_TYPE_AUTO_CHANGE		_T("Port3TypeAutoChange")
+#define STEP_PORT4_TYPE_AUTO_CHANGE		_T("Port4TypeAutoChange")
+#define STEP_PORT1_CASSETTE_TYPE_CHANGE	_T("Port1CassetteTypeChange")
+#define STEP_PORT2_CASSETTE_TYPE_CHANGE	_T("Port2CassetteTypeChange")
+#define STEP_PORT3_CASSETTE_TYPE_CHANGE	_T("Port3CassetteTypeChange")
+#define STEP_PORT4_CASSETTE_TYPE_CHANGE	_T("Port4CassetteTypeChange")
 
 
 /* Step ID */
@@ -282,7 +310,8 @@
 #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_DISPATCHING_MODE_CHANGE_REPLY	0x5E2
+#define STEP_ID_IN_OP_CMD_REPLY					0x5F0
+#define STEP_ID_DISPATCHING_MODE_CHANGE_REPLY	0x5F1
 #define STEP_ID_PORT1_TYPE_CHANGE				0x600
 #define STEP_ID_PORT2_TYPE_CHANGE				0x601
 #define STEP_ID_PORT3_TYPE_CHANGE				0x602
@@ -307,31 +336,56 @@
 #define STEP_ID_PORT2_TYPE_AUTO_CHANGE			0x629
 #define STEP_ID_PORT3_TYPE_AUTO_CHANGE			0x62A
 #define STEP_ID_PORT4_TYPE_AUTO_CHANGE			0x62B
-#define STEP_ID_PORT1_CASSETTIE_EMPTY			0x638
-#define STEP_ID_PORT1_CASSETTIE_LOAD_READY		0x640
-#define STEP_ID_PORT1_CASSETTIE_LOADED			0x648
-#define STEP_ID_PORT1_CASSETTIE_INUSE			0x650
-#define STEP_ID_PORT1_CASSETTIE_UNLOAD_READY	0x658
-#define STEP_ID_PORT1_CASSETTIE_BLOCKED			0x660
-#define STEP_ID_PORT2_CASSETTIE_EMPTY			0x639
-#define STEP_ID_PORT2_CASSETTIE_LOAD_READY		0x641
-#define STEP_ID_PORT2_CASSETTIE_LOADED			0x649
-#define STEP_ID_PORT2_CASSETTIE_INUSE			0x651
-#define STEP_ID_PORT2_CASSETTIE_UNLOAD_READY	0x659
-#define STEP_ID_PORT2_CASSETTIE_BLOCKED			0x661
-#define STEP_ID_PORT3_CASSETTIE_EMPTY			0x63a
-#define STEP_ID_PORT3_CASSETTIE_LOAD_READY		0x642
-#define STEP_ID_PORT3_CASSETTIE_LOADED			0x64a
-#define STEP_ID_PORT3_CASSETTIE_INUSE			0x652
-#define STEP_ID_PORT3_CASSETTIE_UNLOAD_READY	0x65a
-#define STEP_ID_PORT3_CASSETTIE_BLOCKED			0x662
-#define STEP_ID_PORT4_CASSETTIE_EMPTY			0x63b
-#define STEP_ID_PORT4_CASSETTIE_LOAD_READY		0x643
-#define STEP_ID_PORT4_CASSETTIE_LOADED			0x64b
-#define STEP_ID_PORT4_CASSETTIE_INUSE			0x653
-#define STEP_ID_PORT4_CASSETTIE_UNLOAD_READY	0x65b
-#define STEP_ID_PORT4_CASSETTIE_BLOCKED			0x663
-#define STEP_ID_ROBOT_CMD_REPLY					0x6b0
+#define STEP_ID_PORT1_EMPTY						0x638
+#define STEP_ID_PORT1_LOAD_READY				0x640
+#define STEP_ID_PORT1_LOADED					0x648
+#define STEP_ID_PORT1_INUSE						0x650
+#define STEP_ID_PORT1_UNLOAD_READY				0x658
+#define STEP_ID_PORT1_BLOCKED					0x660
+#define STEP_ID_PORT2_EMPTY						0x639
+#define STEP_ID_PORT2_LOAD_READY				0x641
+#define STEP_ID_PORT2_LOADED					0x649
+#define STEP_ID_PORT2_INUSE						0x651
+#define STEP_ID_PORT2_UNLOAD_READY				0x659
+#define STEP_ID_PORT2_BLOCKED					0x661
+#define STEP_ID_PORT3_EMPTY						0x63a
+#define STEP_ID_PORT3_LOAD_READY				0x642
+#define STEP_ID_PORT3_LOADED					0x64a
+#define STEP_ID_PORT3_INUSE						0x652
+#define STEP_ID_PORT3_UNLOAD_READY				0x65a
+#define STEP_ID_PORT3_BLOCKED					0x662
+#define STEP_ID_PORT4_EMPTY						0x63b
+#define STEP_ID_PORT4_LOAD_READY				0x643
+#define STEP_ID_PORT4_LOADED					0x64b
+#define STEP_ID_PORT4_INUSE						0x653
+#define STEP_ID_PORT4_UNLOAD_READY				0x65b
+#define STEP_ID_PORT4_BLOCKED					0x663
+#define STEP_ID_PROT1_TYPE_CHANGE_REPLY			0x670
+#define STEP_ID_PROT2_TYPE_CHANGE_REPLY			0x671
+#define STEP_ID_PROT3_TYPE_CHANGE_REPLY			0x672
+#define STEP_ID_PROT4_TYPE_CHANGE_REPLY			0x673
+#define STEP_ID_PROT1_MODE_CHANGE_REPLY			0x678
+#define STEP_ID_PROT2_MODE_CHANGE_REPLY			0x679
+#define STEP_ID_PROT3_MODE_CHANGE_REPLY			0x67A
+#define STEP_ID_PROT4_MODE_CHANGE_REPLY			0x67B
+#define STEP_ID_PROT1_TRANSFER_MODE_CHANGE_REPLY	0x680
+#define STEP_ID_PROT2_TRANSFER_MODE_CHANGE_REPLY	0x681
+#define STEP_ID_PROT3_TRANSFER_MODE_CHANGE_REPLY	0x682
+#define STEP_ID_PROT4_TRANSFER_MODE_CHANGE_REPLY	0x683
+#define STEP_ID_PROT1_ENABLE_MODE_CHANGE_REPLY		0x688
+#define STEP_ID_PROT2_ENABLE_MODE_CHANGE_REPLY		0x689
+#define STEP_ID_PROT3_ENABLE_MODE_CHANGE_REPLY		0x68A
+#define STEP_ID_PROT4_ENABLE_MODE_CHANGE_REPLY		0x68B
+#define STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY		0x690
+#define STEP_ID_PROT2_TYPE_AUTO_CHANGE_REPLY		0x691
+#define STEP_ID_PROT3_TYPE_AUTO_CHANGE_REPLY		0x692
+#define STEP_ID_PROT4_TYPE_AUTO_CHANGE_REPLY		0x693
+#define STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY	0x698
+#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_ROBOT_CMD_REPLY						0x6b0
+
 
 
 /* base alarm */
@@ -361,6 +415,7 @@
 
 /* Port Status */
 #define PORT_LOAD_READY				1
+#define PORT_LOAD_REQUEST			PORT_LOAD_READY
 #define PORT_LOADED					2
 #define PORT_INUSE					3
 #define PORT_LOAD_COMPLETE			PORT_INUSE

--
Gitblit v1.9.3