From d38d98d99e873d0a48e75aa9f8472cff4574c132 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 30 四月 2025 17:46:50 +0800
Subject: [PATCH] 1.添加CEqReadStep, 以后大部分读数据可能要使用这个类,可以简单程序。 2.文档;

---
 SourceCode/Bond/Servo/CEquipment.h |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 7dd0501..e16140a 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -17,6 +17,11 @@
 #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>
@@ -31,12 +36,14 @@
 	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 结构体定义
@@ -89,6 +96,7 @@
 		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);
@@ -105,7 +113,24 @@
 		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);
 
 
 	// 以下为从CC-Link读取到的Bit标志位检测函数
@@ -118,14 +143,11 @@
 		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);
-
 	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);
 
 	protected:

--
Gitblit v1.9.3