From 23cce52f9abd7dfd8e4eddd6068810e70c0a4ffa Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 12 六月 2025 15:10:40 +0800
Subject: [PATCH] 1.转换为新的站号和Slot
---
SourceCode/Bond/Servo/CMaster.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 2be2371..2288d79 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -63,6 +63,7 @@
std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
void setCacheFilepath(const char* pszFilepath);
+ int abortCurrentTask();
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -85,9 +86,12 @@
void serialize(CArchive& ar);
void setState(MASTERSTATE state);
CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
- MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2);
+ MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2,
+ int armNo = 1);
CRobotTask* createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq);
CRobotTask* createTransferTask_bake_to_cooling(CEquipment* pSrcEq);
+ CRobotTask* createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq);
+ void transformPosAndSlot(int srcPos, int srcSlot, int& tarPos, int& tarSlot);
private:
CRITICAL_SECTION m_criticalSection;
--
Gitblit v1.9.3