From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.h | 134 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 119 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index e5f868d..e2844bd 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -1,4 +1,4 @@
-#pragma once
+锘�#pragma once
#include <list>
#include "CEquipment.h"
#include "CEFEM.h"
@@ -13,10 +13,30 @@
#include "CArmTray.h"
#include "CCLinkIEControl.h"
#include "CRobotTask.h"
+#include "ProcessJob.h"
+#include "CControlJob.h"
+#include "../DAQBridge/core/Collector.h"
-#define CTStep_begin 0
-#define CTStep_end 99
+#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
+
+#define ER_CODE_NOERROR 0
+#define ER_CODE_OPERATION_MODE_FAIL -1
+#define ER_CODE_AOI_NG -2
namespace SERVO {
enum class MASTERSTATE {
@@ -24,8 +44,10 @@
STARTING,
RUNNING,
RUNNING_CONTINUOUS_TRANSFER,
+ RUNNING_BATCH,
STOPPING,
- MSERROR
+ MSERROR,
+ ATHERERROR
};
typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
@@ -37,6 +59,7 @@
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;
@@ -48,9 +71,15 @@
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();
@@ -64,7 +93,8 @@
int term();
int start();
int startContinuousTransfer();
- int stop();
+ int startBatch();
+ int stop(int nErCode = ER_CODE_NOERROR);
void clearError();
ULONGLONG getRunTime();
MASTERSTATE getState();
@@ -73,15 +103,18 @@
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,
+ void setPortTypeEx(unsigned int index, BOOL enable, int type, int mode,
int cassetteType, int transferMode, BOOL autoChangeEnable);
+ void setPortType(unsigned int index, int type);
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);
@@ -90,6 +123,22 @@
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();
+ void setStateFile(const std::string& path);
+ int getWipGlasses(std::vector<CGlass*>& glasses);
+ void test();
+ bool moveGlassToBuf(int eqid, int slotNo);
+ bool moveGlassToSlot(int eqid, int slotNo);
+ int getPortCassetteSnSeed(int port);
+ void setPortCassetteSnSeed(int port, int seed);
+ CGlass* getGlass(int scrPort, int scrSlot);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -113,13 +162,46 @@
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);
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:
+ int getLastError();
+ std::string& getLastErrorText();
+
+ 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);
+ bool completeControlJob();
+ bool forceCompleteControlJob(std::string description);
+ bool canCreateControlJob();
+ bool canCompleteControlJob();
+ bool canDeleteControlJob();
+
+ // DAQ Bridge閻╃鍙�
+ Collector* getCollector() const { return m_pCollector; }
private:
CRITICAL_SECTION m_criticalSection;
@@ -129,42 +211,64 @@
std::string m_strFilepath;
BOOL m_bDataModify;
bool m_bContinuousTransfer;
+ bool m_bBatch;
private:
- /* 监控比特位的线程*/
+ /* 鐩戞帶姣旂壒浣嶇殑绾跨▼*/
HANDLE m_hEventReadBitsThreadExit[2];
HANDLE m_hReadBitsThreadHandle;
unsigned m_nReadBitsThreadAddr;
- // 调度线程
+ // 璋冨害绾跨▼
HANDLE m_hDispatchEvent;
HANDLE m_hEventDispatchThreadExit[2];
HANDLE m_hDispatchThreadHandle;
unsigned m_nDispatchThreadAddr;
- // 启动时间，运行时间，状态
+ // 鍚姩鏃堕棿锛岃繍琛屾椂闂达紝鐘舵��
ULONGLONG m_ullStartTime;
ULONGLONG m_ullRunTime;
MASTERSTATE m_state;
- // 当前任务和已完成任务列表
+ // 褰撳墠浠诲姟鍜屽凡瀹屾垚浠诲姟鍒楄〃
CRobotTask* m_pActiveRobotTask;
std::list< CRobotTask* > m_listTask;
- // 错误代码
+ // 閿欒浠ｇ爜
int m_nLastError;
std::string m_strLastError;
- // 在开始工艺前是否先需要先比较map
+ // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁鍏堥渶瑕佸厛姣旇緝map
BOOL m_isCompareMapsBeforeProceeding;
+ BOOL m_bJobMode;
- // 千传圈数计数
+
+ // 鍗冧紶鍦堟暟璁℃暟
int m_nContinuousTransferCount;
int m_nContinuousTransferStep;
+ int m_nContinuousWorkingPort;
+ int m_nContinuousWorkingSlot;
+
+ // 鏂板宸茬粡寮�濮嬪鐞嗙殑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;
+ std::list<CGlass*> m_bufGlass;
+
+ private:
+ Collector* m_pCollector = nullptr;
+ void CreateDAQBridgeServer();
};
}
--
Gitblit v1.9.3