From 201046a8b83f34ea099a11043ade28d8457d7af9 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 02 八月 2025 10:47:04 +0800
Subject: [PATCH] 1. 添加计算时间戳宏 2. 重写切割两片玻璃函数 3. 添加分组过滤干扰点的函数
---
SourceCode/Bond/Servo/CRecipesManager.h | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRecipesManager.h b/SourceCode/Bond/Servo/CRecipesManager.h
index 489e2a5..388fe4e 100644
--- a/SourceCode/Bond/Servo/CRecipesManager.h
+++ b/SourceCode/Bond/Servo/CRecipesManager.h
@@ -1,6 +1,7 @@
#pragma once
#include <map>
#include "CRecipeList.h"
+#include <functional>
#define SS_NONE 0
@@ -10,6 +11,8 @@
#define SS_FAILED 4
namespace SERVO {
+ typedef std::function<void(int state)> ONSYNCINGSTATECHANGED;
+
class CRecipesManager
{
public:
@@ -17,11 +20,15 @@
virtual ~CRecipesManager();
public:
+ void setOnSyncingStateChanged(ONSYNCINGSTATECHANGED block);
unsigned TimeoutCheckWorkingProc();
int syncing();
void syncFailed();
- int decodeRecipeListReport(const char* pszData, size_t size);
+ void syncTimeout();
+ short decodeRecipeListReport(const char* pszData, size_t size);
+ short decodeRecipeParameterReport(const char* pszData, size_t size);
CRecipeList* getRecipeListFromTemp(int unitNo);
+ CRecipeList* getRecipeList(int unitNo);
public:
inline void lock() { ::EnterCriticalSection(&m_cs); };
@@ -35,8 +42,10 @@
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;
+ ONSYNCINGSTATECHANGED m_onSyncingStateChanged;
};
}
--
Gitblit v1.9.3