From f6a5e27c91e635ad59d2fd45a52d56c085c7d066 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 26 八月 2025 12:37:22 +0800
Subject: [PATCH] 1.顶部工具条增加按钮"批运行"，用于ControlJob模式调度的运行； 2.CMaster增加startBatch，启动批运动模式； 3.CMaster在兼容原单片Glass调试的情况下，增加startBatch调度，开始实现调度功能。
---
SourceCode/Bond/Servo/CMaster.h | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 6cb2965..8187fc3 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -14,6 +14,7 @@
#include "CCLinkIEControl.h"
#include "CRobotTask.h"
#include "ProcessJob.h"
+#include "CControlJob.h"
#define CTStep_Unknow 0
@@ -38,6 +39,7 @@
STARTING,
RUNNING,
RUNNING_CONTINUOUS_TRANSFER,
+ RUNNING_BATCH,
STOPPING,
MSERROR
};
@@ -78,6 +80,7 @@
int term();
int start();
int startContinuousTransfer();
+ int startBatch();
int stop();
void clearError();
ULONGLONG getRunTime();
@@ -97,6 +100,7 @@
void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
void setPortEnable(unsigned int index, BOOL bEnable);
void setCompareMapsBeforeProceeding(BOOL bCompare);
+ void setJobMode(BOOL bJobMode);
void datetimeSync(SYSTEMTIME& time);
void enableEventReport(bool bEnable);
void enableAlarmReport(bool bEnable);
@@ -105,9 +109,14 @@
int carrierRelease(unsigned int port);
int getContinuousTransferCount();
void setContinuousTransferCount(int round);
- int setProcessJobs(std::vector<SERVO::CProcessJob*>& pjs);
- std::vector<SERVO::CProcessJob*>& getProcessJobs();
+ int setProcessJobs(std::vector<CProcessJob*>& pjs);
+ std::vector<CProcessJob*>& getProcessJobs();
+ CProcessJob* getProcessJob(const std::string& id);
+ int setControlJob(CControlJob& controlJob);
+ CControlJob* getControlJob();
CLoadPort* getPortWithCarrierId(const std::string& carrierId) const;
+ bool saveState() const;
+ bool loadState(const std::string& path);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -131,7 +140,7 @@
void setState(MASTERSTATE state);
CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2,
- int armNo = 1);
+ int armNo = 1, BOOL bJobMode = FALSE);
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);
@@ -147,6 +156,15 @@
bool slotUsable(const std::string& carrierId, uint16_t slot) const override;
bool ceidDefined(uint32_t ceid) const override;
+ public:
+ // 新增函数
+ CProcessJob* acquireNextProcessJob();
+ CGlass* acquireNextGlass();
+ int acquireGlassToQueue();
+ bool addGlassToQueue(CGlass* pGlass);
+ bool glassFromQueueToInPorcess(CGlass* pGlass);
+ bool glassFromInPorcessToComplete(CGlass* pGlass);
+
private:
CRITICAL_SECTION m_criticalSection;
MasterListener m_listener;
@@ -155,6 +173,7 @@
std::string m_strFilepath;
BOOL m_bDataModify;
bool m_bContinuousTransfer;
+ bool m_bBatch;
private:
/* 监控比特位的线程*/
@@ -183,15 +202,25 @@
// 在开始工艺前是否先需要先比较map
BOOL m_isCompareMapsBeforeProceeding;
+ BOOL m_bJobMode;
+
// 千传圈数计数
int m_nContinuousTransferCount;
int m_nContinuousTransferStep;
+ // 新增已经开始处理的ProcessJob列表
+ std::vector<CProcessJob*> m_inProcesJobs;
+ std::vector<CGlass*> m_queueGlasses;
+ std::vector<CGlass*> m_inProcesGlasses;
+ std::vector<CGlass*> m_completeGlasses;
+
private:
bool m_bEnableEventReport;
bool m_bEnableAlarmReport;
+ SERVO::CControlJob* m_pControlJob;
std::vector<SERVO::CProcessJob*> m_processJobs;
+ std::string m_strStatePath;
};
}
--
Gitblit v1.9.3