~chenluhua/Bond2.git

			@@ -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,13 @@
			#include "CEqCimMessageClearStep.h"
			#include "CEqDateTimeSetCmdStep.h"
			#include "CEqVCREnableStep.h"
			#include "CEqPortChangeStep.h"
			#include "CEqReadIntStep.h"
			#include "CEqCassetteTransferStateStep.h"
			#include <vector>
			#include <map>
			#include <list>
			#include "CGlass.h"


			namespace SERVO {
			@@ -20,10 +28,14 @@
			#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 struct _EquipmentListener
			{
			ONALIVE onAlive;
			ONALIVE onCimStateChanged;
			ONALARM onAlarm;
			ONDATACHANGED onDataChanged;
			} EquipmentListener;

			// Memory Block 结构体定义
			@@ -75,10 +87,23 @@
			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);

			// 以下为从CC-Link读取到的Bit标志位检测函数
			public:
			@@ -98,6 +123,7 @@
			protected:
			inline void Lock() { EnterCriticalSection(&m_criticalSection); }
			inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
			void addGlassToList(CGlass* pGlass);

			protected:
			EquipmentListener m_listener;
			@@ -108,6 +134,10 @@
			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: