From 18108a94f48b2cd6f9fce59aa5ed1d1ccc3f27b2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 18 六月 2025 17:34:44 +0800
Subject: [PATCH] 1. 系统日志修复关闭连接 2. 删除之前模仿台达的数据库管理类 3. 重做配方主界面 4. 配方管理类添加更新PPID和描述的函数
---
SourceCode/Bond/Servo/CMaster.h | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 7eeffad..2f8577d 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -63,6 +63,9 @@
std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
void setCacheFilepath(const char* pszFilepath);
+ int abortCurrentTask();
+ void setPortType(unsigned int index, BOOL enable, int type, int mode,
+ int cassetteType, int transferMode, BOOL autoChangeEnable);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -85,9 +88,11 @@
void serialize(CArchive& ar);
void setState(MASTERSTATE state);
CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
- MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2);
- CRobotTask* createTransferTask_bonder_to_bakecooling(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);
private:
CRITICAL_SECTION m_criticalSection;
--
Gitblit v1.9.3