Bond2
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
mrDarker
2025-08-27 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 
 SourceCode/Bond/Servo/CMaster.h


@@ -39,6 +39,7 @@


        STARTING,


        RUNNING,


        RUNNING_CONTINUOUS_TRANSFER,


        RUNNING_BATCH,


        STOPPING,


        MSERROR


    };


@@ -52,6 +53,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;


@@ -63,6 +65,8 @@


        ONROBOTTASKEVENT        onRobotTaskEvent;


        ONLOADPORTSTATUSCHANGED   onLoadPortStatusChanged;


        ONCTROUNDEND            onCTRoundEnd;


        ONPJSTART               onPjStart;


        ONPJSTART               onPjEnd;


    } MasterListener;




    class CMaster : public IResourceView


@@ -79,6 +83,7 @@


        int term();


        int start();


        int startContinuousTransfer();


        int startBatch();


        int stop();


        void clearError();


        ULONGLONG getRunTime();


@@ -98,6 +103,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);


@@ -137,7 +143,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);


@@ -153,6 +159,18 @@


        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 checkAndUpdatePjComplete(CProcessJob* pJob);


        CProcessJob* getGlassProcessJob(CGlass* pGlass);






    private:


        CRITICAL_SECTION m_criticalSection;


        MasterListener m_listener;


@@ -161,6 +179,7 @@


        std::string m_strFilepath;


        BOOL m_bDataModify;


        bool m_bContinuousTransfer;


        bool m_bBatch;




    private:


        /* 监控比特位的线程*/


@@ -189,11 +208,19 @@




        // 在开始工艺前是否先需要先比较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;