From 5fe38f3aa84459690a59667bff205f3f350c086c Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 28 四月 2025 18:03:39 +0800
Subject: [PATCH] 1.把LoadPort相关的step移到CLoadPort下，交它们当前efem的子设备来处理，逻辑上比较顺。
---
SourceCode/Bond/Servo/CEquipment.h | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 82e21ca..c4a9ab5 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -18,6 +18,7 @@
#include "CEqCassetteTransferStateStep.h"
#include "CEqCassetteCtrlCmdStep.h"
#include "CEqJobEventStep.h"
+#include "CEqVcrEventStep.h"
#include <vector>
#include <map>
#include <list>
@@ -32,12 +33,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 结构体定义
@@ -106,7 +109,14 @@
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);
@@ -124,14 +134,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