From 1c8098f74227411b5417c560eb7e6d7c0a61ae6e Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期四, 04 九月 2025 16:28:52 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/CRecipeList.h | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CRecipeList.h b/SourceCode/Bond/Servo/CRecipeList.h index 74e89c3..6b1ac0d 100644 --- a/SourceCode/Bond/Servo/CRecipeList.h +++ b/SourceCode/Bond/Servo/CRecipeList.h @@ -1,4 +1,4 @@ -#pragma once +锘�#pragma once #include <map> @@ -15,13 +15,25 @@ int addRecipePacket(int totalCount,int totalGroup, int currentGroup, const char* pszData, size_t size); int addRecipe(int index, short id); std::map<int, short>& getIds(); + std::unordered_map<short, std::vector<uint8_t>>& getParamsRawData(); void reset(); + void reset2(); + + // 娣诲姞鍙傛暟鍖� + int addParamsPacket(int totalCount, int totalGroup, int currentGroup, + short unitId, short recipeId, + const char* pszData, size_t size); + + // 猸� 鏂板搴忓垪鍖栧拰鍙嶅簭鍒楀寲鍑芥暟 + bool serialize(const std::string& filename) const; + bool deserialize(const std::string& filename); private: int m_nUnitNo; int m_nToatlGroupCount; int m_nCurrentGroupCount; std::map<int, short> m_ids; + std::unordered_map<short, std::vector<uint8_t>> m_paramsRawData; }; } -- Gitblit v1.9.3