From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMeasurement.h | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMeasurement.h b/SourceCode/Bond/Servo/CMeasurement.h
index 67b072e..5ac68c9 100644
--- a/SourceCode/Bond/Servo/CMeasurement.h
+++ b/SourceCode/Bond/Servo/CMeasurement.h
@@ -15,8 +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