Merge branch 'clh' into liuyang

darker

2025-02-18 4289dfbba5033a08e9aea375f439e2ea7e0648da

 SourceCode/Bond/Servo/CMaster.h

@@ -11,6 +11,7 @@
    typedef struct _MasterListener
    {
        ONEQALIVE            onEqAlive;
        ONEQALIVE              onEqCimStateChanged;
    } MasterListener;

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

        CEquipment* getEquipment(int id);

    private:
        int addEquipment(CEquipment* pEquipment);


    private:
        MasterListener m_listener;