From 2f0684bf01209b9ddfdc53da44fb85f4db6db326 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 06 六月 2025 15:56:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CRobotTask.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CRobotTask.h b/SourceCode/Bond/Servo/CRobotTask.h
index 0fa435f..2cd8654 100644
--- a/SourceCode/Bond/Servo/CRobotTask.h
+++ b/SourceCode/Bond/Servo/CRobotTask.h
@@ -13,6 +13,7 @@
 	public:
 		std::string& getId();
 		std::string getDescription() const;
+		std::string getSimpleDescription() const;
 		void setContext(CContext* pContext);
 		CContext* getContext();
 		void setRobotTransferParam(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot);
@@ -22,10 +23,14 @@
 		time_t getStoredTime();
 		time_t getFinishTime();
 		ROBOT_TASK_STATE getState();
+		void completed();
+		void error();
+		void abort();
 		int getSrcPosition();
 		int getSrcSlot();
 		int getTarPosition();
 		int getTarSlot();
+		CString getStateString();
 
 		// 从源地拔片
 		void fetchOut();

--
Gitblit v1.9.3