From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 16:18:33 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CRecipesManager.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CRecipesManager.h b/SourceCode/Bond/Servo/CRecipesManager.h
index 489e2a5..4c35285 100644
--- a/SourceCode/Bond/Servo/CRecipesManager.h
+++ b/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;
 	};

--
Gitblit v1.9.3