~chenluhua/Bond2.git

			@@ -13,6 +13,10 @@
			#include "CEqCimMessageClearStep.h"
			#include "CEqDateTimeSetCmdStep.h"
			#include "CEqVCREnableStep.h"
			#include "CEqPortChangeStep.h"
			#include "CEqReadIntStep.h"
			#include "CEqCassetteTransferStateStep.h"
			#include "CEqCassetteCtrlCmdStep.h"
			#include <vector>
			#include <map>
			#include <list>
			@@ -26,10 +30,12 @@

			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;

			@@ -86,6 +92,7 @@
			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();
			@@ -94,6 +101,13 @@
			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 isCassetteTransferStateStep(SERVO::CStep* pStep);
			int setEqMode(short mode);
			int setCimMode(BOOL bOn);

			// 以下为从CC-Link读取到的Bit标志位检测函数
			public:
			@@ -130,7 +144,7 @@


			// 以下为从CC-Link读取到的Bit标志位
			private:
			protected:
			ALIVE m_alive;
			BOOL m_bCimState; // ON/OFF
			BOOL m_bUpstreamInline;
			@@ -139,7 +153,7 @@
			BOOL m_bAutoRecipeChange;
			BOOL m_bVCREnable[VCR_MAX];

			private:
			protected:
			CCCLinkIEControl* m_pCclink;
			std::map<unsigned int, CStep*> m_mapStep;
			int m_nBaseAlarmId;