From 72a8c79352717cf4ef7751f4e0f5d07ee1a65ab6 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 01 九月 2025 17:42:10 +0800
Subject: [PATCH] Merge branch 'liuyang'
---
SourceCode/Bond/Servo/CBonder.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.h b/SourceCode/Bond/Servo/CBonder.h
index e05dce4..0746fa5 100644
--- a/SourceCode/Bond/Servo/CBonder.h
+++ b/SourceCode/Bond/Servo/CBonder.h
@@ -16,17 +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 BOOL onPreStoredJob(int port, CJobDataB* pJobDataB);
virtual int onProcessData(CProcessData* pProcessData);
+ virtual int onProcessStateChanged(PROCESS_STATE state);
+ virtual int getIndexerOperationModeBaseValue();
public:
void setIndex(unsigned int index);
unsigned int getIndex();
+ BOOL hasBondGlass();
+ BOOL hasG2Glass();
private:
unsigned int m_nIndex;
--
Gitblit v1.9.3