From 6c48319c60c4eb6ad4ff3631f5caa6b297d2e787 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 18 8월 2021 09:06:18 +0900
Subject: [PATCH] Merge branch 'feature/#3561_CF_AOI_Review_Align_카메라_끊김_현상_조치' into feature/#3562_CF_AOI_Review_실행_프로그램_경로_변경
---
ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
index de5f5ca..de39519 100644
--- a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
+++ b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
@@ -303,7 +303,7 @@
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
//if (11000 <= GetTickCount() - stTime)
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
- if (1000 <= GetTickCount() - stTime)
+ if (1500 <= GetTickCount() - stTime)
{
break;
}
@@ -313,7 +313,7 @@
m_pDP2P->IDP2P_SetAFMTracking(nSelModuleIndex, TRUE);
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
//Sleep(1000);
- Sleep(500);
+ Sleep(1000);
//#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
CString strimagename;
@@ -888,8 +888,21 @@
for (int nIdx = 0; nIdx < nPanelCount; nIdx++)
{
- const SPositionData* pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
- const SPositionData* pDataPos = pProcessResult->GetPositionData_Squareness(nIdx);
+ //LYW 210811
+ const SPositionData* pSettingPos;
+ const SPositionData* pDataPos;
+
+ if (nSelModuleIndex == 1)
+ {
+ pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
+ pDataPos = pProcessResult->GetPositionData_Squareness(nIdx + 3);
+ }
+ else
+ {
+ pSettingPos = pSettingResult->GetPositionData_Squareness(nIdx);
+ pDataPos = pProcessResult->GetPositionData_Squareness(nIdx);
+ }
+ //LYW 210811
if (pSettingPos == NULL || pDataPos == NULL) continue;
dMotorPosX[nIdx] = pSettingPos->dPosX;
--
Gitblit v1.9.3