From e5fa774d622d6852fe8e1f033045aed221649108 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 15 10월 2021 13:24:54 +0900
Subject: [PATCH] Ongoing80 #3662 CF AOI Review 전설비 알람 발생 조치
---
ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
index de5f5ca..5670280 100644
--- a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
+++ b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
@@ -62,7 +62,7 @@
m_pManager->m_bProcessAll = true;
ProcessAll();
break;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
case DiagnosisMode_Review :
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisMode_Review START"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
@@ -116,7 +116,7 @@
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
break;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
case DiagnosisMode_Flatness:
m_pManager->m_bProcessAll = false;
ProcessFlatness();
@@ -167,7 +167,7 @@
m_pDP2P->IDP2P_SetDialogTap(1);
ProcessFlatness();
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(2000);
Sleep(1000);
@@ -175,7 +175,7 @@
strMessage.Format(_T("[CDiagnosisProcessor] DiagnosisJudge FAIL"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
m_pManager->m_bProcessAll = false;
@@ -300,10 +300,10 @@
int stTime = GetTickCount();
while (1)
{
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//if (11000 <= GetTickCount() - stTime)
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
- if (1000 <= GetTickCount() - stTime)
+ /*< LYW 20210719 : #3517 ADD End >*/
+ if (1500 <= GetTickCount() - stTime)
{
break;
}
@@ -311,10 +311,10 @@
}
m_pDP2P->IDP2P_SetAFMTracking(nSelModuleIndex, TRUE);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(1000);
- Sleep(500);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ Sleep(1000);
+ /*< LYW 20210719 : #3517 ADD End >*/
CString strimagename;
strimagename.Format(_T("%s_Module[%d]Index[%d].bmp"), m_pManager->m_strResultImageFileName, nSelModuleIndex, nIdx);
@@ -462,10 +462,10 @@
}
m_pDP2P->IDP2P_SetWsiManualMeasure(nSelModuleIndex, dXpos, dYpos);
// move panel
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(2000);
Sleep(1000);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
m_pDP2P->IDP2P_MotorGo(nSelModuleIndex, dXpos, dYpos);
if (m_pDP2P->IDP2P_IsGantryMotionEnd(nSelModuleIndex) == FALSE)
@@ -477,10 +477,10 @@
int stTime = GetTickCount();
while (1)
{
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//if (10000 <= GetTickCount() - stTime)
if (11000 <= GetTickCount() - stTime)
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
{
break;
}
@@ -545,14 +545,14 @@
CDiagnosisInfo * pSettingInfo = m_pManager->GetDiagnosisInfo();
if (pSettingInfo == NULL) return 0;
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
if (pSettingInfo->GetFlastnessSkipMode() == TRUE) {
strMessage.Format(_T("[CDiagnosisProcessor] FlastnessSkipMode!"));
m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
return 0;
}
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
int nSelModuleIndex = m_pDP2P->IDP2P_GetSelectedModuleIndex();
int nFlatnessMode = pSettingInfo->GetFlatnessMode();
@@ -593,10 +593,10 @@
{
// AF Home
m_pDP2P->IDP2P_AFMHomePosition(0);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
//Sleep(5000);
Sleep(1000);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< LYW 20210719 : #3517 ADD End >*/
m_pDP2P->IDP2P_SetAFMTracking(0, TRUE);
Sleep(500);
}
@@ -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