Merge branch 'master' into liuyang

mrDarker

2025-06-03 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516

 SourceCode/Bond/Servo/CRecipesManager.h

@@ -20,7 +20,8 @@
      unsigned TimeoutCheckWorkingProc();
      int syncing();
      void syncFailed();
      int decodeRecipeListReport(const char* pszData, size_t size);
      short decodeRecipeListReport(const char* pszData, size_t size);
      short decodeRecipeParameterReport(const char* pszData, size_t size);
      CRecipeList* getRecipeListFromTemp(int unitNo);

   public:
@@ -35,6 +36,7 @@
      CRITICAL_SECTION m_cs;      // 同步锁
      int m_nSyncStatus;
      int m_nTotalMasterRecipeCount;
      int m_nTotalParameterCount;
      std::map<int, CRecipeList*> m_mapRecipes;
      std::map<int, CRecipeList*> m_mapRecipesTemp;
   };