~chenluhua/Bond2.git

			@@ -16,7 +16,7 @@
			#include <vector>
			#include <map>
			#include <list>
			#include "CPanel.h"
			#include "CGlass.h"


			namespace SERVO {
			@@ -25,10 +25,12 @@
			#define VCR_MAX 1

			typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
			typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
			typedef struct _EquipmentListener
			{
			ONALIVE onAlive;
			ONALIVE onCimStateChanged;
			ONDATACHANGED onDataChanged;
			} EquipmentListener;

			// Memory Block 结构体定义
			@@ -89,9 +91,10 @@
			std::vector<CPin*>& CEquipment::getInputPins();
			std::vector<CPin*>& CEquipment::getOutputPins();
			virtual int recvIntent(CPin* pPin, CIntent* pIntent);
			virtual BOOL glassWillArrive(CPanel* pPanel);
			virtual BOOL glassWillArrive(CGlass* pGlass);
			virtual int outputGlass(int port);
			virtual int glassArrived(CPanel* pPanel);
			virtual int glassArrived(CGlass* pGlass);
			CGlass* getFrontGlass();

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

			protected:
			EquipmentListener m_listener;
			@@ -124,7 +127,7 @@
			MemoryBlock m_blockWriteBit;
			std::vector<CPin*> m_inputPins;
			std::vector<CPin*> m_outputPins;
			std::list<CPanel*> m_panelList;
			std::list<CGlass*> m_glassList;


			// 以下为从CC-Link读取到的Bit标志位