From 56fd8f57fcc763ae079ae752d82e41b38d7d9e5f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 16 六月 2025 10:50:16 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/ServoCommo.h |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoCommo.h b/SourceCode/Bond/Servo/ServoCommo.h
index 5cfc30d..6e70ac3 100644
--- a/SourceCode/Bond/Servo/ServoCommo.h
+++ b/SourceCode/Bond/Servo/ServoCommo.h
@@ -5,6 +5,8 @@
 #define BLOCK_BUFFER_MAX			1024
 #define ALIVE_TIMEOUT				15
 #define VCR_MAX						1
+#define PATH_MAX					8
+#define SIGNAL_MAX					8
 #define ARM_ALL						99
 
 	enum class PortType {
@@ -27,9 +29,9 @@
 	};
 
 	enum class MaterialsType {
-		G1 = 0,
-		G2 = 1,
-		G1G2 = 2
+		G1 = 1,
+		G2 = 2,
+		G1G2 = 3
 	};
 	typedef MaterialsType CassetteType;
 
@@ -108,9 +110,16 @@
 	enum class ROBOT_TASK_STATE {
 		Ready = 0,
 		Running,
+		Picking,
+		Placing,
+		Restoring,
 		Error,
 		Abort,
 		Completed
 	};
+
+	/* EQ Data changed code */
+#define EDCC_FETCHOUT_JOB				1000	/* 取片 */
+#define EDCC_STORED_JOB					1001	/* 放片 */
 }
 

--
Gitblit v1.9.3