~chenluhua/Bond2.git

			@@ -51,6 +51,8 @@
			m_state = MASTERSTATE::READY;
			m_pActiveRobotTask = nullptr;
			m_nLastError = 0;
			m_bEnableEventReport = true;
			m_bEnableAlarmReport = true;
			InitializeCriticalSection(&m_criticalSection);
			}

			@@ -1585,4 +1587,19 @@
			time.wHour, time.wMinute, time.wSecond);
			}
			}

			void CMaster::enableEventReport(bool bEnable)
			{
			m_bEnableEventReport = bEnable;
			}

			void CMaster::enableAlarmReport(bool bEnable)
			{
			m_bEnableAlarmReport = bEnable;
			}

			bool CMaster::isAlarmReportEnable()
			{
			return m_bEnableAlarmReport;
			}
			}