From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.h | 125 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 120 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 2288d79..2d4d697 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -13,14 +13,35 @@
#include "CArmTray.h"
#include "CCLinkIEControl.h"
#include "CRobotTask.h"
+#include "ProcessJob.h"
+#include "CControlJob.h"
+
+#define CTStep_Unknow 0
+#define CTStep_LoadPort_Aligner 1
+#define CTStep_Aligner_Fliper 2
+#define CTStep_Fliper_Bonder1 3
+#define CTStep_Bonder1_Bonder2 4
+#define CTStep_Bonder2_VacuumBake 5
+#define CTStep_VacuumBake_VacuumBake 6
+#define CTStep_VacuumBake_BakeCooling 7
+#define CTStep_BakeCooling_BakeCooling1 8
+#define CTStep_BakeCooling_BakeCooling2 9
+#define CTStep_BakeCooling_BakeCooling3 10
+#define CTStep_BakeCooling_Measurement 11
+#define CTStep_Measurement_LoadPort 12
+#define CTStep_begin CTStep_LoadPort_Aligner
+#define CTStep_end CTStep_Measurement_LoadPort
namespace SERVO {
- enum MASTERSTATE {
+ enum class MASTERSTATE {
READY = 0,
STARTING,
RUNNING,
- STOPPING
+ RUNNING_CONTINUOUS_TRANSFER,
+ RUNNING_BATCH,
+ STOPPING,
+ MSERROR
};
typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
@@ -30,6 +51,9 @@
typedef std::function<void(void* pMaster, CEquipment* pEquipment, CVcrEventReport* pReport)> ONEQVCREVENTREPORT;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, short status, __int64 data)> ONLOADPORTSTATUSCHANGED;
+ typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
+ typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
typedef struct _MasterListener
{
ONMASTERSTATECHANGED onMasterStateChanged;
@@ -39,9 +63,17 @@
ONEQVCREVENTREPORT onEqVcrEventReport;
ONEQDATACHANGED onEqDataChanged;
ONROBOTTASKEVENT onRobotTaskEvent;
+ ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
+ ONCTROUNDEND onCTRoundEnd;
+ ONPJSTART onCjStart;
+ ONPJSTART onCjEnd;
+ ONPJSTART onPjStart;
+ ONPJSTART onPjEnd;
+ ONPJSTART onPanelStart;
+ ONPJSTART onPanelEnd;
} MasterListener;
- class CMaster
+ class CMaster : public IResourceView
{
public:
CMaster();
@@ -54,7 +86,10 @@
int init();
int term();
int start();
+ int startContinuousTransfer();
+ int startBatch();
int stop();
+ void clearError();
ULONGLONG getRunTime();
MASTERSTATE getState();
unsigned DispatchProc();
@@ -62,8 +97,33 @@
void onTimer(UINT nTimerid);
std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
+ CEquipment* getEquipment(int id) const;
void setCacheFilepath(const char* pszFilepath);
int abortCurrentTask();
+ int restoreCurrentTask();
+ int resendCurrentTask();
+ void setPortType(unsigned int index, BOOL enable, int type, int mode,
+ int cassetteType, int transferMode, BOOL autoChangeEnable);
+ 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);
+ bool isAlarmReportEnable();
+ int proceedWithCarrier(unsigned int port);
+ int carrierRelease(unsigned int port);
+ int getContinuousTransferCount();
+ void setContinuousTransferCount(int round);
+ 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); }
@@ -87,11 +147,35 @@
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);
- void transformPosAndSlot(int srcPos, int srcSlot, int& tarPos, int& tarSlot);
+ CRobotTask* createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts);
+ CRobotTask* createTransferTask_continuous_transfer(CEquipment* pSrcEq, int nSrcSlot,
+ CEquipment* pTarEq, int nTarSlot, int armNo = 1);
+
+ public:
+ // —— IResourceView 覆写 ——（注意 const）
+ bool isProcessJobsEmpty() const override;
+ bool recipeExists(const std::string& ppid) const override;
+ bool carrierPresent(const std::string& carrierId) const override;
+ 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);
+ bool processJobFromInPorcessToComplete(CProcessJob* pProcessJob);
+ bool checkAndUpdatePjComplete(CProcessJob* pJob);
+ bool checkAndUpdateCjComplete(CControlJob* pJob);
+ CProcessJob* getGlassProcessJob(CGlass* pGlass);
+
private:
CRITICAL_SECTION m_criticalSection;
@@ -100,6 +184,8 @@
std::list<CEquipment*> m_listEquipment;
std::string m_strFilepath;
BOOL m_bDataModify;
+ bool m_bContinuousTransfer;
+ bool m_bBatch;
private:
/* 监控比特位的线程*/
@@ -121,6 +207,35 @@
// 当前任务和已完成任务列表
CRobotTask* m_pActiveRobotTask;
std::list< CRobotTask* > m_listTask;
+
+ // 错误代码
+ int m_nLastError;
+ std::string m_strLastError;
+
+ // 在开始工艺前是否先需要先比较map
+ BOOL m_isCompareMapsBeforeProceeding;
+ BOOL m_bJobMode;
+
+
+ // 千传圈数计数
+ int m_nContinuousTransferCount;
+ int m_nContinuousTransferStep;
+
+ // 新增已经开始处理的ProcessJob列表
+ std::vector<CProcessJob*> m_inProcesJobs;
+ std::vector<CProcessJob*> m_completeProcessJobs;
+ 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;
+
+ int m_nTestFlag;
};
}
--
Gitblit v1.9.3