From 8b30a702f2e70073e57ed354519b5df5ea78749c Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 05 六月 2025 08:45:39 +0800
Subject: [PATCH] 1. 添加任务停止按钮
---
SourceCode/Bond/Servo/CMaster.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index ba4fd04..621a773 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -84,7 +84,8 @@
int readCache();
void serialize(CArchive& ar);
void setState(MASTERSTATE state);
- CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq);
+ CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
+ MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2);
private:
CRITICAL_SECTION m_criticalSection;
--
Gitblit v1.9.3