From 375342c11638685d6b7fecc2a979825c56d770f9 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 14 七月 2025 17:57:15 +0800
Subject: [PATCH] 1.CCollectionEvent，CLoadPort， CVariable类实现； 2.从.txt或csv中加载CVariable列表； 3.添加菜单，准备添加相关查看或编辑 CVariable列表的界面；

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

diff --git a/SourceCode/Bond/Servo/CRobotTask.h b/SourceCode/Bond/Servo/CRobotTask.h
index 7e83046..324b6cc 100644
--- a/SourceCode/Bond/Servo/CRobotTask.h
+++ b/SourceCode/Bond/Servo/CRobotTask.h
@@ -32,12 +32,15 @@
 		int getArmNo();
 		ROBOT_TASK_STATE getState();
 		bool isPicking();
+		bool isPicked();
 		bool isPlacing();
 		bool isRestoring();
 		void run();
 		void pick();
+		void picked();
 		void place();
 		void restore();
+		void restored();
 		void completed();
 		void error();
 		void abort();
@@ -55,6 +58,7 @@
 
 	private:
 		static std::string& generateId(std::string& out);
+		void transformPosAndSlot(int srcPos, int srcSlot, int& tarPos, int& tarSlot);
 
 	private:
 		ROBOT_TASK_STATE m_state;					/* 任务状态 */

--
Gitblit v1.9.3