From 410ea79955e2d115643a38f40e006f1aeaba897b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 26 四月 2025 14:39:23 +0800
Subject: [PATCH] 1.增加CVcrEventStep
---
SourceCode/Bond/Servo/CEquipment.h | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index ad84bee..b041c86 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -1,6 +1,8 @@
#pragma once
#include "Log.h"
#include "CCLinkIEControl.h"
+#include "CSample.h"
+#include "CPin.h"
#include "CEqModeStep.h"
#include "CEqStatusStep.h"
#include "CEqAlarmStep.h"
@@ -11,7 +13,16 @@
#include "CEqCimMessageClearStep.h"
#include "CEqDateTimeSetCmdStep.h"
#include "CEqVCREnableStep.h"
+#include "CEqPortChangeStep.h"
+#include "CEqReadIntStep.h"
+#include "CEqCassetteTransferStateStep.h"
+#include "CEqCassetteCtrlCmdStep.h"
+#include "CEqJobEventStep.h"
+#include "CEqVcrEventStep.h"
+#include <vector>
#include <map>
+#include <list>
+#include "CGlass.h"
namespace SERVO {
@@ -20,10 +31,16 @@
#define VCR_MAX 1
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 结构体定义
@@ -75,10 +92,31 @@
std::map<unsigned int, CStep*>& getSteps();
virtual void init();
virtual void term();
+ virtual void initPins() = 0;
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();
+ std::vector<CPin*>& CEquipment::getOutputPins();
+ virtual int recvIntent(CPin* pPin, CIntent* pIntent);
+ virtual BOOL glassWillArrive(CGlass* pGlass);
+ virtual int outputGlass(int port);
+ virtual int glassArrived(CGlass* pGlass);
+ 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 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);
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -98,6 +136,7 @@
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
+ void addGlassToList(CGlass* pGlass);
protected:
EquipmentListener m_listener;
@@ -108,9 +147,13 @@
StationIdentifier m_station;
MemoryBlock m_blockReadBit;
MemoryBlock m_blockWriteBit;
+ std::vector<CPin*> m_inputPins;
+ std::vector<CPin*> m_outputPins;
+ std::list<CGlass*> m_glassList;
+
// 以下为从CC-Link读取到的Bit标志位
- private:
+ protected:
ALIVE m_alive;
BOOL m_bCimState; // ON/OFF
BOOL m_bUpstreamInline;
@@ -119,7 +162,7 @@
BOOL m_bAutoRecipeChange;
BOOL m_bVCREnable[VCR_MAX];
- private:
+ protected:
CCCLinkIEControl* m_pCclink;
std::map<unsigned int, CStep*> m_mapStep;
int m_nBaseAlarmId;
--
Gitblit v1.9.3