From a056810ab4c5fa63777f6fdddfeb190bbd9a6f54 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 08 九月 2025 14:05:25 +0800
Subject: [PATCH] Merge branch 'liuyang'
---
SourceCode/Bond/Servo/CMeasurement.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMeasurement.h b/SourceCode/Bond/Servo/CMeasurement.h
index a1d8bac..5ac68c9 100644
--- a/SourceCode/Bond/Servo/CMeasurement.h
+++ b/SourceCode/Bond/Servo/CMeasurement.h
@@ -15,13 +15,16 @@
virtual void init();
virtual void term();
virtual void initPins();
+ virtual void initSteps();
virtual void initSlots();
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
virtual int getIndexerOperationModeBaseValue();
-
- };
+ virtual int parsingParams(const char* pszData, size_t size, std::vector<CParam>& parsms);
+ virtual int parsingProcessData(const char* pszData, size_t size, std::vector<CParam>& parsms);
+ virtual int parsingSVData(const char* pszData, size_t size, std::vector<CParam>& parsms);
+ };
}
--
Gitblit v1.9.3