浏览代码

fix the bug when Disconnect oxford eds device.

cxs 3 年之前
父节点
当前提交
acdb40a8a8

+ 1 - 1
OTSCPP/OTSControl/OTSSemBase.cpp

@@ -30,7 +30,7 @@ namespace OTSController {
 		}
 
 		// attempt 1000 times until SEM in place
-		long nAttempTime = 10;
+		long nAttempTime = 2;
 		double dSetPositionX = (double)a_poiPosition.x;
 		double dSetPositionY = (double)a_poiPosition.y;
 		double dSetPositionR = a_dRotation;

+ 4 - 3
OTSCPP/OTSControl/Oxford/OTSSEMOxford.h

@@ -23,11 +23,12 @@ namespace OTSController {
 		{ 
 			if (!m_oxfordImpl)
 			{
-				m_oxfordImpl = OxfordImpl::GetInstance();
+				return false;
+			}
+			m_oxfordImpl = OxfordImpl::GetInstance();
 
 
-				return m_oxfordImpl->DisConnect();
-			}
+			return m_oxfordImpl->DisConnect();
 			return true;
 		
 		};// do nothing for this controller

+ 1 - 1
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.h

@@ -226,7 +226,7 @@ protected:
 	{
 		
 		m_bIsStageUpdated = true;
-		LogTrace(__FILE__, __LINE__, _T("StageUpdated!"));
+		//LogTrace(__FILE__, __LINE__, _T("StageUpdated!"));
 	}
 	bool m_bIsStageUpdated;
 	bool m_bIsColumnUpdated;