From cacea2da59a3acd73f3161d819a10e0060762616 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 06 五月 2025 14:54:13 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.h | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 407b505..14283bd 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -16,10 +16,17 @@
#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"
namespace SERVO {
@@ -30,12 +37,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 结构体定义
@@ -88,6 +97,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);
@@ -104,6 +114,25 @@
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标志位检测函数
public:
@@ -115,15 +144,13 @@
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);
+ short decodeRecipeListReport(const char* pszData, size_t size);
protected:
EquipmentListener m_listener;
@@ -140,7 +167,7 @@
// 以下为从CC-Link读取到的Bit标志位
- private:
+ protected:
ALIVE m_alive;
BOOL m_bCimState; // ON/OFF
BOOL m_bUpstreamInline;
@@ -149,10 +176,11 @@
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;
};
}
--
Gitblit v1.9.3