~chenluhua/Bond2.git

			@@ -15,6 +15,8 @@
			#include "CEqVCREnableStep.h"
			#include "CEqPortChangeStep.h"
			#include "CEqReadIntStep.h"
			#include "CEqCassetteTransferStateStep.h"
			#include "CEqCassetteCtrlCmdStep.h"
			#include <vector>
			#include <map>
			#include <list>
			@@ -28,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;

			@@ -88,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();
			@@ -99,6 +104,9 @@
			void getGlassList(std::list<CGlass*>& list);
			CGlass* getFrontGlass();
			BOOL removeClass(CGlass* pGlass);
			bool isAlarmStep(SERVO::CStep* pStep);
			bool isCassetteTransferStateStep(SERVO::CStep* pStep);


			// 以下为从CC-Link读取到的Bit标志位检测函数
			public:
			@@ -114,8 +122,6 @@
			private:
			BOOL isBitOn(const char* pszData, size_t size, int index);
			inline BOOL equalBool(BOOL b1, BOOL b2);
			void checkReadStepSignal(unsigned int addr, const char* pszData, size_t size);
			void checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size);

			protected:
			inline void Lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -137,7 +143,7 @@


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

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