From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期四, 26 六月 2025 08:46:11 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/CLoadPort.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CLoadPort.h b/SourceCode/Bond/Servo/CLoadPort.h index 7bc8702..bc91232 100644 --- a/SourceCode/Bond/Servo/CLoadPort.h +++ b/SourceCode/Bond/Servo/CLoadPort.h @@ -31,8 +31,15 @@ int setCassetteType(CassetteType type, ONWRITED onWritedBlock = nullptr); int setTransferMode(TransferMode mode, ONWRITED onWritedBlock = nullptr); int eableAutoChange(BOOL bEnable, ONWRITED onWritedBlock = nullptr); + void localEanblePort(BOOL bEnable); + void localSetPortType(PortType type); + void localSetPortMode(PortMode mode); + void localSetCessetteType(CassetteType type); + void localSetTransferMode(TransferMode mode); + void localAutoChangeEnable(BOOL bEnable); public: + short getNextCassetteSequenceNo(); void setIndex(unsigned int index); unsigned int getIndex(); BOOL isEnable(); @@ -48,7 +55,8 @@ int getQTimeFlag(); int getCassetteMappingState(); int getCassetteStatus(); - int testGenerateGlassList(MaterialsType type, const char* pszPrefix, int startSuffix); + int testGenerateGlassList(MaterialsType type); + int testGenerateGlassListFromConfig(const SERVO::PortConfig& config); public: static std::string& getPortTypeDescription(PortType portType, std::string& strDescription); @@ -83,6 +91,7 @@ BOOL m_bEnable; BOOL m_bAutoChangeEnable; CPortStatusReport m_portStatusReport; + int m_nNextCassetteSequenceNo; }; } -- Gitblit v1.9.3