~chenluhua/Bond2.git

			@@ -31,6 +31,7 @@
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, CVcrEventReport* pReport)> ONEQVCREVENTREPORT;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
			typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
			typedef std::function<void(void* pMaster, CEquipment* pEquipment, short scanMap)> ONLOADPORTINUSE;
			typedef struct _MasterListener
			{
			ONMASTERSTATECHANGED onMasterStateChanged;
			@@ -40,6 +41,7 @@
			ONEQVCREVENTREPORT onEqVcrEventReport;
			ONEQDATACHANGED onEqDataChanged;
			ONROBOTTASKEVENT onRobotTaskEvent;
			ONLOADPORTINUSE onLoadPortInUse;
			} MasterListener;

			class CMaster
			@@ -66,8 +68,12 @@
			CEquipment* getEquipment(int id);
			void setCacheFilepath(const char* pszFilepath);
			int abortCurrentTask();
			int restoreCurrentTask();
			int resendCurrentTask();
			void setPortType(unsigned int index, BOOL enable, int type, int mode,
			int cassetteType, int transferMode, BOOL autoChangeEnable);
			void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
			void setCompareMapsBeforeProceeding(BOOL bCompare);

			private:
			inline void lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -95,7 +101,8 @@
			CRobotTask* createTransferTask_bonder_to_bakecooling(CEquipment* pSrcEq, CEquipment* pTarEq);
			CRobotTask* createTransferTask_bake_to_cooling(CEquipment* pSrcEq);
			CRobotTask* createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq);

			CRobotTask* createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts);

			private:
			CRITICAL_SECTION m_criticalSection;
			MasterListener m_listener;
			@@ -128,6 +135,9 @@
			// 错误代码
			int m_nLastError;
			std::string m_strLastError;

			// 在开始工艺前是否先需要先比较map
			BOOL m_isCompareMapsBeforeProceeding;
			};
			}