1. 合并代码

Darker

2025-02-25 2ffaec40444a4add7d8e638e5b20a2f81daa18af

 SourceCode/Bond/Servo/CMaster.h

@@ -8,9 +8,12 @@

namespace SERVO {
    typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
    typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
    typedef struct _MasterListener
    {
        ONEQALIVE            onEqAlive;
        ONEQALIVE              onEqCimStateChanged;
        ONEQSTEPEVENT          onEqStepEvent;
    } MasterListener;

    class CMaster
@@ -25,11 +28,11 @@
        int init();
        int term();
        void onTimer(UINT nTimerid);

        CEquipment* getEquipment(int id);

    private:
        int addEquipment(CEquipment* pEquipment);

        int addEFEM(StepListener& listener);

    private:
        MasterListener m_listener;