From 331f447bb0e5eccf0b3161ab287c1372b14b8480 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 08 八月 2025 11:53:58 +0800
Subject: [PATCH] 1.增加千传计数,保存计数,重启软件时恢复; 2.千传测试模式,打印相关日志,方便后期提取,用于统计; 3.千传模式时烘烤两腔体都要进入; 4.千传模式时,Fliper到Bonder修改为用手臂2取料; 5.修复千传模式不计运行时的问题; 6.千传模式,最后收料强制放入第一层; 6.修复Buf, 当任务未生成(在符合条件后仍有1秒间隙)而机器单元发送FetchOutJob时,数据检验失败的问题,增加Sleep, 缩小间隙;

---
 SourceCode/Bond/Servo/CMaster.h |  134 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 0fefda3..e5f868d 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -3,42 +3,168 @@
 #include "CEquipment.h"
 #include "CEFEM.h"
 #include "CBonder.h"
+#include "CLoadPort.h"
+#include "CFliper.h"
+#include "CAligner.h"
+#include "CVacuumBake.h"
+#include "CBakeCooling.h"
+#include "CMeasurement.h"
+#include "CArm.h"
+#include "CArmTray.h"
 #include "CCLinkIEControl.h"
+#include "CRobotTask.h"
 
+
+#define CTStep_begin        0
+#define CTStep_end          99
 
 namespace SERVO {
+    enum class MASTERSTATE {
+        READY = 0,
+        STARTING,
+        RUNNING,
+        RUNNING_CONTINUOUS_TRANSFER,
+        STOPPING,
+        MSERROR
+    };
+
+    typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
     typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
     typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
+    typedef std::function<void(void* pMaster, CEquipment* pEquipment, int state, int alarmId, int unitId, int level)> ONEQALARM;
+    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 struct _MasterListener
     {
+        ONMASTERSTATECHANGED    onMasterStateChanged;
         ONEQALIVE				onEqAlive;
         ONEQALIVE		        onEqCimStateChanged;
-        ONEQSTEPEVENT		    onEqStepEvent;
+        ONEQALARM               onEqAlarm;
+        ONEQVCREVENTREPORT	    onEqVcrEventReport;
+        ONEQDATACHANGED         onEqDataChanged;
+        ONROBOTTASKEVENT        onRobotTaskEvent;
+        ONLOADPORTSTATUSCHANGED	onLoadPortStatusChanged;
+        ONCTROUNDEND            onCTRoundEnd;
     } MasterListener;
 
     class CMaster
     {
     public:
         CMaster();
-        ~CMaster();
+        virtual ~CMaster();
 
 
     public:
         void setListener(MasterListener listener);
+        CRobotTask* getActiveRobotTask();
         int init();
         int term();
+        int start();
+        int startContinuousTransfer();
+        int stop();
+        void clearError();
+        ULONGLONG getRunTime();
+        MASTERSTATE getState();
+        unsigned DispatchProc();
+        unsigned ReadBitsProc();
         void onTimer(UINT nTimerid);
         std::list<CEquipment*>& getEquipmentList();
         CEquipment* getEquipment(int id);
+        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 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);
 
     private:
-        int addEquipment(CEquipment* pEquipment);
-        int addEFEM(StepListener& listener);
+        inline void lock() { EnterCriticalSection(&m_criticalSection); }
+        inline void unlock() { LeaveCriticalSection(&m_criticalSection); }
+        int addToEquipmentList(CEquipment* pEquipment);
+        CLoadPort* addLoadPort(int index);
+        CFliper* addFliper();
+        CVacuumBake* addVacuumBake();
+        CAligner* addAligner();
+        CEFEM* addEFEM();
+        CArm* addArm();
+        CArmTray* addArmTray(int index);
+        CBonder* addBonder(int index);
+        CBakeCooling* addBakeCooling();
+        CMeasurement* addMeasurement();
+        void connectEquipments();
+        int saveCache();
+        int saveCacheAndBackups();
+        int readCache();
+        void serialize(CArchive& ar);
+        void setState(MASTERSTATE state);
+        CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
+            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);
+        CRobotTask* createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts);
+        CRobotTask* createTransferTask_continuous_transfer(CEquipment* pSrcEq, int nSrcSlot,
+            CEquipment* pTarEq, int nTarSlot, int armNo = 1);
 
     private:
+        CRITICAL_SECTION m_criticalSection;
         MasterListener m_listener;
         CCCLinkIEControl m_cclink;
         std::list<CEquipment*> m_listEquipment;
+        std::string m_strFilepath;
+        BOOL m_bDataModify;
+        bool m_bContinuousTransfer;
+
+    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
+        BOOL m_isCompareMapsBeforeProceeding;
+
+        // 千传圈数计数
+        int m_nContinuousTransferCount;
+        int m_nContinuousTransferStep;
+
+    private:
+        bool m_bEnableEventReport;
+        bool m_bEnableAlarmReport;
     };
 }
 

--
Gitblit v1.9.3