From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CBonder.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.h b/SourceCode/Bond/Servo/CBonder.h
index 04785d3..4e8edcd 100644
--- a/SourceCode/Bond/Servo/CBonder.h
+++ b/SourceCode/Bond/Servo/CBonder.h
@@ -16,15 +16,20 @@
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 BOOL glassWillArrive(CGlass* pGlass);
+ virtual int onProcessData(CProcessData* pProcessData);
+ virtual int onProcessStateChanged(PROCESS_STATE state);
+ virtual int getIndexerOperationModeBaseValue();
public:
void setIndex(unsigned int index);
unsigned int getIndex();
+ BOOL hasBondClass();
+ BOOL hasG2Class();
private:
unsigned int m_nIndex;
--
Gitblit v1.9.3