~chenluhua/Bond2.git

			@@ -133,7 +133,7 @@
			LOGI("<CEquipment-%s>发送RobotCmdS成功.", m_strName.c_str());
			}
			else {
			LOGI("<CEquipment-%s>发送RobotCmds失败，code:%d", m_strName.c_str(), code);
			LOGE("<CEquipment-%s>发送RobotCmds失败，code:%d", m_strName.c_str(), code);
			}

			return 0;
			@@ -367,7 +367,7 @@
			void CEFEM::initPins()
			{
			// 加入Pin初始化代码
			LOGI("<CEFEM>initPins");
			LOGD("<CEFEM>initPins");
			}

			void CEFEM::initSteps()
			@@ -456,25 +456,6 @@
			pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
			pStep->setWriteSignalDev(0x49);
			if (addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
			delete pStep;
			}
			}

			{
			// VCR Event Report
			// 机器上报扫码结果，扫码器预计安装在巡边检机器上
			CEqReadStep* pStep = new CEqReadStep(0x5fef, 15 * 2,
			[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
			if (code == ROK && pszData != nullptr && size > 0) {
			decodeVCREventReport((CStep*)pFrom, pszData, size);
			}
			return -1;
			});
			pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
			pStep->setProp("Port", (void*)1);
			pStep->setWriteSignalDev(0x4a);
			pStep->setReturnDev(0x91e);
			if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
			delete pStep;
			}
			}
			@@ -697,9 +678,11 @@
			}
			}

			// FAC Data Report
			addFacDataReportStep(0x6589, 0x04d, 1);
			/*
			{
			// FAC Data Report
			CEqReadStep* pStep = new CEqReadStep(0x6301, 108 * 2,
			CEqReadStep* pStep = new CEqReadStep(0x6589, 133 * 2,
			[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
			if (code == ROK && pszData != nullptr && size > 0) {
			decodeFacDataReport((CStep*)pFrom, pszData, size);
			@@ -713,6 +696,7 @@
			delete pStep;
			}
			}
			*/

			{
			// JOB Data Request
			@@ -890,7 +874,7 @@

			void CEFEM::printDebugRobotState()
			{
			LOGI("<CEFEM>Robot status:%d, ARM1:%s, ARM2:%s",
			LOGD("<CEFEM>Robot status:%d, ARM1:%s, ARM2:%s",
			m_robotData.status,
			m_robotData.armState[0] ? _T("ON") : _T("OFF"),
			m_robotData.armState[1] ? _T("ON") : _T("OFF"));