Merge branch 'master' into liuyang

mrDarker

2025-06-12 6d71f1d8264b929ca71bf133246b894ed955c079

 SourceCode/Bond/Servo/CMaster.h

@@ -63,6 +63,7 @@
        std::list<CEquipment*>& getEquipmentList();
        CEquipment* getEquipment(int id);
        void setCacheFilepath(const char* pszFilepath);
        int abortCurrentTask();

    private:
        inline void lock() { EnterCriticalSection(&m_criticalSection); }