~chenluhua/Bond2.git

			@@ -16,11 +16,12 @@


			namespace SERVO {
			enum MASTERSTATE {
			enum class MASTERSTATE {
			READY = 0,
			STARTING,
			RUNNING,
			STOPPING
			STOPPING,
			MSERROR
			};

			typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
			@@ -55,6 +56,7 @@
			int term();
			int start();
			int stop();
			void clearError();
			ULONGLONG getRunTime();
			MASTERSTATE getState();
			unsigned DispatchProc();
			@@ -63,6 +65,10 @@
			std::list<CEquipment*>& getEquipmentList();
			CEquipment* getEquipment(int id);
			void setCacheFilepath(const char* pszFilepath);
			int abortCurrentTask();
			int restoreCurrentTask();
			void setPortType(unsigned int index, BOOL enable, int type, int mode,
			int cassetteType, int transferMode, BOOL autoChangeEnable);

			private:
			inline void lock() { EnterCriticalSection(&m_criticalSection); }
			@@ -85,10 +91,13 @@
			void serialize(CArchive& ar);
			void setState(MASTERSTATE state);
			CRobotTask* createTransferTask(CEquipment* pSrcEq, CEquipment* pTarEq,
			MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2);
			MaterialsType primaryType = MaterialsType::G1, MaterialsType secondaryType = MaterialsType::G2,
			int armNo = 1);
			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;
			@@ -117,6 +126,10 @@
			// 当前任务和已完成任务列表
			CRobotTask* m_pActiveRobotTask;
			std::list< CRobotTask* > m_listTask;

			// 错误代码
			int m_nLastError;
			std::string m_strLastError;
			};
			}