From 3404823d074a08b8c0824b505db16168f7e66201 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 09 六月 2025 09:49:10 +0800
Subject: [PATCH] Merge branch 'clh'
---
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 2cd8654..63edbeb 100644
--- a/SourceCode/Bond/Servo/CRobotTask.h
+++ b/SourceCode/Bond/Servo/CRobotTask.h
@@ -1,6 +1,7 @@
#pragma once
#include "ServoCommo.h"
#include "Context.h"
+#include "CEFEM.h"
namespace SERVO {
@@ -16,6 +17,7 @@
std::string getSimpleDescription() const;
void setContext(CContext* pContext);
CContext* getContext();
+ void setEFEM(CEFEM* pEFEM);
void setRobotTransferParam(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot);
ROBOT_CMD_PARAM& getRobotCmdParam();
time_t getCreateTime();
@@ -23,6 +25,7 @@
time_t getStoredTime();
time_t getFinishTime();
ROBOT_TASK_STATE getState();
+ void run();
void completed();
void error();
void abort();
@@ -50,5 +53,6 @@
time_t m_timeFinish; /* 结束时间 */
ROBOT_CMD_PARAM m_robotCmdParam; /* 参数 */
CContext* m_pContext;
+ CEFEM* m_pEFEM;
};
}
--
Gitblit v1.9.3