From 7c35ff8d9a626f69a8a8b7de3d73dc9d73de9dd7 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期六, 13 九月 2025 10:51:32 +0800 Subject: [PATCH] 1. 解决读取报警文件错误的问题，提高兼容性（可能文件是在MacOS编辑的，导致换行符不一样） --- SourceCode/Bond/Servo/CRecipeList.h | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CRecipeList.h b/SourceCode/Bond/Servo/CRecipeList.h index 7cb4577..6b1ac0d 100644 --- a/SourceCode/Bond/Servo/CRecipeList.h +++ b/SourceCode/Bond/Servo/CRecipeList.h @@ -1,4 +1,4 @@ -#pragma once +锘�#pragma once #include <map> @@ -12,16 +12,28 @@ public: int getUnitNo(); - int addRecipePacket(int totalGroup, int currentGroup, const char* pszData, size_t size); + 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