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/CBonder.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.h b/SourceCode/Bond/Servo/CBonder.h
index 4e8edcd..714b949 100644
--- a/SourceCode/Bond/Servo/CBonder.h
+++ b/SourceCode/Bond/Servo/CBonder.h
@@ -24,12 +24,13 @@
virtual int onProcessData(CProcessData* pProcessData);
virtual int onProcessStateChanged(PROCESS_STATE state);
virtual int getIndexerOperationModeBaseValue();
+ virtual int parsingParams(const char* pszData, size_t size, std::vector<CParam>& parsms);
public:
void setIndex(unsigned int index);
unsigned int getIndex();
- BOOL hasBondClass();
- BOOL hasG2Class();
+ BOOL hasBondGlass();
+ BOOL hasG2Glass();
private:
unsigned int m_nIndex;
--
Gitblit v1.9.3