Merge branch 'clh'

LAPTOP-SNT8I5JK\Boounion

2025-05-30 405bd36e812c3645e8d9d84700777e2eaeb036ec

 SourceCode/Bond/Servo/CMaster.h

@@ -12,6 +12,7 @@
#include "CArm.h"
#include "CArmTray.h"
#include "CCLinkIEControl.h"
#include "CRobotTask.h"


namespace SERVO {
@@ -42,11 +43,12 @@
    {
    public:
        CMaster();
        ~CMaster();
        virtual ~CMaster();


    public:
        void setListener(MasterListener listener);
        CRobotTask* getActiveRobotTask();
        int init();
        int term();
        int start();
@@ -80,6 +82,7 @@
        int readCache();
        void serialize(CArchive& ar);
        void setState(MASTERSTATE state);
        CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq);

    private:
        CRITICAL_SECTION m_criticalSection;
@@ -105,6 +108,10 @@
        ULONGLONG m_ullStartTime;
        ULONGLONG m_ullRunTime;
        MASTERSTATE m_state;

        // 当前任务和已完成任务列表
        CRobotTask* m_pActiveRobotTask;
        std::list< CRobotTask* > m_listTask;
    };
}