From 1fd49a571338b6c946bb05dcdf59ec1468df5c50 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 목, 22 12월 2022 12:31:43 +0900
Subject: [PATCH] ongoing50 #4403 CF AOI Reveiw TACT 지연 개선 1. 일정 시간 유지 신호 처리 시 동기화로 인한 불합리 개선 - 일정 시간 유지 필요 시 스래드풀 작업큐를 이용하여 루프처리 방식으로 변경 - 유지 신호 처리 중 출력 신호 발생 시 작업큐에 등록하여 유지 신호와 결합하여 출력 처리 2. FDC 보고 항목 중 SW 버전 체크 루프 불합리 개선 - 프로그램 시작 시 연동 프로그램 버전 체크 간 실행되지 않는 프로그램이 있는 경우 무한 루프 발생 - 무한 루프로 인한 CPU 점유 상승->루프 중간 Sleep추가 및 코드 간소화 3. 로그 메시지에 시간 ms단위 추가(황만수SM 작업 내역 병합)
---
ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp b/ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp
index de39519..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,9 +300,9 @@
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
+ /*< 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(1000);
- //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+ /*< 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);
}
--
Gitblit v1.9.3