~chenluhua/Bond2.git

			@@ -54,6 +54,11 @@
			ATHERERROR
			};

			enum class CurveMode {
			Production = 0,
			EmptyChamber
			};

			typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
			typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
			typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
			@@ -113,6 +118,8 @@
			void clearError();
			ULONGLONG getRunTime();
			MASTERSTATE getState();
			void setCurveMode(CurveMode mode);
			CurveMode getCurveMode() const;
			unsigned DispatchProc();
			unsigned ReadBitsProc();
			void onTimer(UINT nTimerid);
			@@ -254,6 +261,7 @@
			ULONGLONG m_ullStartTime;
			ULONGLONG m_ullRunTime;
			MASTERSTATE m_state;
			CurveMode m_curveMode;

			// 当前任务和已完成任务列表
			CRobotTask* m_pActiveRobotTask;