From 405bd36e812c3645e8d9d84700777e2eaeb036ec Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 30 五月 2025 16:18:17 +0800
Subject: [PATCH] Merge branch 'clh'

---
 SourceCode/Bond/Servo/CLoadPort.h |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/SourceCode/Bond/Servo/CLoadPort.h b/SourceCode/Bond/Servo/CLoadPort.h
index 3e011fc..7bc8702 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:
@@ -36,10 +36,10 @@
 		void setIndex(unsigned int index);
 		unsigned int getIndex();
 		BOOL isEnable();
-		int getPortType();
-		int getPortMode();
-		int getCessetteType();
-		int getTransferMode();
+		PortType getPortType();
+		PortMode getPortMode();
+		CassetteType getCessetteType();
+		TransferMode getTransferMode();
 		BOOL isAutoChange();
 		int getPortStatus();
 		int getCassetteSequenceNo();
@@ -48,13 +48,13 @@
 		int getQTimeFlag();
 		int getCassetteMappingState();
 		int getCassetteStatus();
-		int testGenerateGlassList(MaterialsType type, int count, const char* pszPrefix, int startSuffix);
+		int testGenerateGlassList(MaterialsType type, const char* pszPrefix, int startSuffix);
 
 	public:
-		static std::string& getPortTypeDescription(int portType, std::string& strDescription);
-		static std::string& getPortModeDescription(int portMode, std::string& strDescription);
-		static std::string& getPortCassetteTypeDescription(int casseteType, std::string& strDescription);
-		static std::string& getPortTransferModeDescription(int mode, std::string& strDescription);
+		static std::string& getPortTypeDescription(PortType portType, std::string& strDescription);
+		static std::string& getPortModeDescription(PortMode portMode, std::string& strDescription);
+		static std::string& getPortCassetteTypeDescription(CassetteType casseteType, std::string& strDescription);
+		static std::string& getPortTransferModeDescription(TransferMode mode, std::string& strDescription);
 		static std::string& getEnableModeDescription(int mode, std::string& strDescription);
 		static std::string& getPortStatusDescription(int portStatus, std::string& strDescription);
 		static std::string& getLoadingCassetteTypeDescription(int type, std::string& strDescription);
@@ -63,7 +63,6 @@
 		static std::string& getCassetteStatusDescription(int state, std::string& strDescription);
 
 	public:
-		virtual int outputGlass(int port);
 		int sendCassetteCtrlCmd(short cmd,
 			short* jobExistence,
 			int jobExistenceSize,
@@ -77,10 +76,10 @@
 
 	private:
 		unsigned int m_nIndex;
-		int m_nType;
-		int m_nMode;
-		int m_nCassetteType;
-		int m_nTransferMode;
+		PortType m_portType;
+		PortMode m_portMode;
+		CassetteType m_cassetteType;
+		TransferMode m_transferMode;
 		BOOL m_bEnable;
 		BOOL m_bAutoChangeEnable;
 		CPortStatusReport m_portStatusReport;

--
Gitblit v1.9.3