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/CAligner.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAligner.h b/SourceCode/Bond/Servo/CAligner.h
index d48eb87..a6081ca 100644
--- a/SourceCode/Bond/Servo/CAligner.h
+++ b/SourceCode/Bond/Servo/CAligner.h
@@ -16,12 +16,12 @@
virtual void term();
virtual void initPins();
virtual void initSlots();
+ virtual void initSteps();
+ virtual void onReceiveLBData(const char* pszData, size_t size);
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);
};
}
--
Gitblit v1.9.3