Merge branch 'EAPSimulator' into clh

LAPTOP-SNT8I5JK\Boounion

2025-07-28 e51c6d1360f9679dd8e4dd3379ce0db1886badbf

 SourceCode/Bond/Servo/CMaster.h

@@ -31,6 +31,7 @@
    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 scanMap)> ONLOADPORTINUSE;
    typedef struct _MasterListener
    {
        ONMASTERSTATECHANGED    onMasterStateChanged;
@@ -40,6 +41,7 @@
        ONEQVCREVENTREPORT       onEqVcrEventReport;
        ONEQDATACHANGED         onEqDataChanged;
        ONROBOTTASKEVENT        onRobotTaskEvent;
        ONLOADPORTINUSE         onLoadPortInUse;
    } MasterListener;

    class CMaster
@@ -67,9 +69,15 @@
        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 setCompareMapsBeforeProceeding(BOOL bCompare);
        void datetimeSync(SYSTEMTIME& time);
        void enableEventReport(bool bEnable);
        void enableAlarmReport(bool bEnable);
        bool isAlarmReportEnable();

    private:
        inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -131,6 +139,12 @@
        // 错误代码
        int m_nLastError;
        std::string m_strLastError;

        // 在开始工艺前是否先需要先比较map
        BOOL m_isCompareMapsBeforeProceeding;
    private:
        bool m_bEnableEventReport;
        bool m_bEnableAlarmReport;
    };
}