From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期四, 19 六月 2025 16:18:33 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/CLoadPort.h | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/SourceCode/Bond/Servo/CLoadPort.h b/SourceCode/Bond/Servo/CLoadPort.h index 3156830..0910af3 100644 --- a/SourceCode/Bond/Servo/CLoadPort.h +++ b/SourceCode/Bond/Servo/CLoadPort.h @@ -17,11 +17,11 @@ 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 void onReceiveLBData(const char* pszData, size_t size); public: @@ -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,7 @@ int getQTimeFlag(); int getCassetteMappingState(); int getCassetteStatus(); - int testGenerateGlassList(MaterialsType type, int count, const char* pszPrefix, int startSuffix); + int testGenerateGlassList(MaterialsType type); public: static std::string& getPortTypeDescription(PortType portType, std::string& strDescription); @@ -63,7 +70,6 @@ static std::string& getCassetteStatusDescription(int state, std::string& strDescription); public: - virtual int outputGlass(int port); int sendCassetteCtrlCmd(short cmd, short* jobExistence, int jobExistenceSize, @@ -84,6 +90,7 @@ BOOL m_bEnable; BOOL m_bAutoChangeEnable; CPortStatusReport m_portStatusReport; + int m_nNextCassetteSequenceNo; }; } -- Gitblit v1.9.3