From 258d9d2d72bbf199cd86fd3e7bd824e1f117bab8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 29 五月 2025 17:49:46 +0800
Subject: [PATCH] 1.放片物流控制和模拟测试；
---
SourceCode/Bond/Servo/CMaster.h | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index be53515..93ff6cc 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -12,6 +12,7 @@
#include "CArm.h"
#include "CArmTray.h"
#include "CCLinkIEControl.h"
+#include "CRobotTask.h"
namespace SERVO {
@@ -42,11 +43,12 @@
{
public:
CMaster();
- ~CMaster();
+ virtual ~CMaster();
public:
void setListener(MasterListener listener);
+ CRobotTask* getActiveRobotTask();
int init();
int term();
int start();
@@ -80,6 +82,7 @@
int readCache();
void serialize(CArchive& ar);
void setState(MASTERSTATE state);
+ CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq);
private:
CRITICAL_SECTION m_criticalSection;
@@ -105,6 +108,10 @@
ULONGLONG m_ullStartTime;
ULONGLONG m_ullRunTime;
MASTERSTATE m_state;
+
+ // 当前任务和已完成任务列表
+ CRobotTask* m_pActiveRobotTask;
+ std::list< CRobotTask* > m_listTask;
};
}
--
Gitblit v1.9.3