From 1e8e3473cb124f9e51dfc1ca35e5cb13b1668bdc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 10 五月 2025 10:46:19 +0800
Subject: [PATCH] 1.重命名类名称和文件名;

---
 SourceCode/Bond/Servo/CEquipment.h |   72 +++++++++++++++++++++++++++++++----
 1 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index a740c89..e655f2c 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -15,10 +15,22 @@
 #include "CEqVCREnableStep.h"
 #include "CEqPortChangeStep.h"
 #include "CEqReadIntStep.h"
+#include "CEqCassetteTransferStateStep.h"
+#include "CEqCassetteCtrlCmdStep.h"
+#include "CEqJobEventStep.h"
+#include "CEqVcrEventStep.h"
+#include "CEqCurrentRecipeChangeStep.h"
+#include "CEqWriteStep.h"
+#include "CEqReadStep.h"
 #include <vector>
 #include <map>
 #include <list>
 #include "CGlass.h"
+#include "CRecipesManager.h"
+#include "CJobDataA.h"
+#include "CJobDataB.h"
+#include "CJobDataC.h"
+#include "CJobDataS.h"
 
 
 namespace SERVO {
@@ -28,11 +40,15 @@
 
 	typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
 	typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
+	typedef std::function<void(void* pEiuipment, int state, int alarmId, int unitId, int level)> ONALARM;
+	typedef std::function<void(void* pEiuipment, void* pReport)> ONVCREVENTREPORT;
 	typedef struct _EquipmentListener
 	{
 		ONALIVE				onAlive;
 		ONALIVE				onCimStateChanged;
+		ONALARM				onAlarm;
 		ONDATACHANGED		onDataChanged;
+		ONVCREVENTREPORT	onVcrEventReport;
 	} EquipmentListener;
 
 	// Memory Block 结构体定义
@@ -62,6 +78,8 @@
 		virtual const char* getClassName() = 0;
 		virtual void setListener(EquipmentListener listener);
 		void setCcLink(CCCLinkIEControl* pCcLink);
+		virtual BOOL isArm() { return FALSE; };
+		void setArm(CEquipment* pEquipment);
 		void setBaseAlarmId(int nBaseId);
 		int getBaseAlarmId();
 		void setID(int nID);
@@ -85,9 +103,11 @@
 		virtual void init();
 		virtual void term();
 		virtual void initPins() = 0;
+		virtual void initSteps();
 		virtual void onTimer(UINT nTimerid);
 		virtual void serialize(CArchive& ar);
 		virtual void onReceiveLBData(const char* pszData, size_t size);
+		virtual int onStepEvent(CStep* pStep, int code);
 		virtual CPin* addPin(PinType type, char* pszName);
 		CPin* getPin(char* pszName);
 		std::vector<CPin*>& CEquipment::getInputPins();
@@ -99,6 +119,37 @@
 		void getGlassList(std::list<CGlass*>& list);
 		CGlass* getFrontGlass();
 		BOOL removeClass(CGlass* pGlass);
+		bool isAlarmStep(SERVO::CStep* pStep);
+		bool isVcrEventStep(SERVO::CStep* pStep);
+		bool isCassetteTransferStateStep(SERVO::CStep* pStep);
+		bool isPortTypeStep(SERVO::CStep* pStep);
+		bool isPortModeStep(SERVO::CStep* pStep);
+		bool isPortCassetteTypeStep(SERVO::CStep* pStep);
+		bool isPortTransferModeStep(SERVO::CStep* pStep);
+		bool isPortEnableStep(SERVO::CStep* pStep);
+		bool isPortTypeAutoChangeEnableStep(SERVO::CStep* pStep);
+		bool isCimMessageConfirmStep(SERVO::CStep* pStep);
+		int setEqMode(short mode);
+		int setCimMode(BOOL bOn);
+		int setCimMessage(const char* pszMessage, short id, short nTouchPanelNo);
+		int clearCimMessage(short id, short nTouchPanelNo);
+		int setDateTime(short year, short month, short day, short hour, short minute, short second);
+		
+		// 请求主配方列表
+		// unitNo: 0:local; Others:unit No
+		int masterRecipeListRequest(short unitNo);
+
+		// 请求配方参数
+		// masterRecipeId: 主配方id
+		// localRecipeId: 本地配方id
+		// unitNo: 0:local; Others:unit No
+		int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);
+
+	public:
+		int fetchedOut(const char* pszGlassId);
+		int storeJob(const char* pszGlassId);
+		BOOL isGlassListEmpty();
+
 
 	// 以下为从CC-Link读取到的Bit标志位检测函数
 	public:
@@ -110,17 +161,16 @@
 		BOOL isAutoRecipeChange();
 		BOOL isVCREnable(unsigned int index);
 
-
-	private:
-		BOOL isBitOn(const char* pszData, size_t size, int index);
-		inline BOOL equalBool(BOOL b1, BOOL b2);
-		void checkReadStepSignal(unsigned int addr, const char* pszData, size_t size);
-		void checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size);
-
 	protected:
 		inline void Lock() { EnterCriticalSection(&m_criticalSection); }
 		inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
+		BOOL isBitOn(const char* pszData, size_t size, int index);
+		inline BOOL equalBool(BOOL b1, BOOL b2);
 		void addGlassToList(CGlass* pGlass);
+		short decodeRecipeListReport(const char* pszData, size_t size);
+		short decodeRecipeParameterReport(const char* pszData, size_t size);
+		int decodeFetchedOutJobReport(int port, const char* pszData, size_t size);
+		int onFetchedOut(int port, const char* pszGlassId);
 
 	protected:
 		EquipmentListener m_listener;
@@ -137,7 +187,7 @@
 
 
 		// 以下为从CC-Link读取到的Bit标志位
-	private:
+	protected:
 		ALIVE m_alive;
 		BOOL m_bCimState;			// ON/OFF
 		BOOL m_bUpstreamInline;
@@ -146,10 +196,14 @@
 		BOOL m_bAutoRecipeChange;
 		BOOL m_bVCREnable[VCR_MAX];
 
-	private:
+	protected:
 		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
 		int m_nBaseAlarmId;
+		CRecipesManager m_recipesManager;
+
+	private:
+		CEquipment* m_pArm;
 	};
 }
 

--
Gitblit v1.9.3