From 88c9c1847ce8cfe8d94fe6c509b5af6f07a7b0fa Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 21 五月 2025 13:49:11 +0800
Subject: [PATCH] 1.补充上一提交;
---
SourceCode/Bond/Servo/Common.h | 104 ++++++++++++++++++++++++++-------------------------
1 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h
index c315229..3ddf79a 100644
--- a/SourceCode/Bond/Servo/Common.h
+++ b/SourceCode/Bond/Servo/Common.h
@@ -64,9 +64,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 +111,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")
@@ -309,30 +310,30 @@
#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_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_ROBOT_CMD_REPLY 0x6b0
@@ -364,6 +365,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