From 29b057b25d57dab9ed33aa2a1bc22b6dc68e1a4d Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 01 4월 2022 10:31:31 +0900
Subject: [PATCH] Ongoing70 #4006 CF AOI Review Align Fail시 재판정 Off 기능 추가
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 110 insertions(+), 39 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index aa133fc..dccb4d4 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -668,6 +668,8 @@
SendResultToSignalControl(PCControlSendData_ReviewResult_CPJT, SIGNAL_SEND_RESULT_SUCCESS);
SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_ReviewComplete_CPJT);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewStart] Send Review Success Signal!"));
+ //LONGREUN
+ //RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, 4);
m_pSP2P->ISP2P_UpdateReviewProcessStatus(ReviewProcessStatus_None, nPlanIndex);
AFM_SetAFMTracking(FALSE);
@@ -877,19 +879,27 @@
CSequenceProcessData* pProcessData = static_cast<CSequenceProcessData*>(pParameter);
m_nProcessStatus = pProcessData->nProcessStatus;
+ //LONGREUN
+ //SetSimulationMode(TRUE);
switch(pProcessData->nProcessStatus)
{
case ProcessLoading_CPJT:
Process_Loading();
+ //LONGREUN
+ //RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, 2);
break;
case ProcessAlignStart_CPJT:
Process_AlignStart();
+ //LONGREUN
+ //RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, 3);
break;
case ProcessReadRawFile_CPJT:
Process_ReadRawFile();
+ //LONGREUN
+ //RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, 1);
break;
@@ -899,9 +909,14 @@
case ProcessReviewEnd_CPJT:
Process_ReviewEnd();
+ //LONGREUN
+ //RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, 5);
+
break;
case ProcessReviewUnloding_CPJT:
Process_ReviewUnloading();
+ //LONGREUN
+ //RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, 0);
break;
}
@@ -923,7 +938,9 @@
bFileFind = FALSE;
- m_pSP2P->ISP2P_GetDiagnosisHistory();
+ /*< LYW 20211109 - #3662 Delete Start >*/
+ //m_pSP2P->ISP2P_GetDiagnosisHistory();
+ /*< LYW 20211109 - #3662 Delete End >*/
m_pSP2P->ISP2P_SetFirstReviewLeft(TRUE);
m_pSP2P->ISP2P_SetFirstReviewRight(TRUE);
@@ -1674,22 +1691,42 @@
if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_ReviewEndAck_CPJT))
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] Send Review End Ack!"));
}
+
+ CGlassResult* pGlassResult = m_pSP2P->ISP2P_GetCurrentGlassResult();
+ if (pGlassResult == NULL) return;
+
//#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD END
//original
// if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_ReviewEndAck_CPJT))
// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] Send Review End Ack!"));
CDitGlassRawClient* m_pDitGlassRaw = CDitGlassRawClient::GetInstance();
- if (m_pSP2P->ISP2P_GetWSIControl(0)!=NULL)
+ if (GetSimulationMode() == FALSE && m_pSP2P->ISP2P_GetWSIControl(0)!=NULL)
{
m_pSP2P->ISP2P_GetWSIControl(0)->SetWsiTimeOver();
m_pSP2P->ISP2P_GetWSIControl(1)->SetWsiTimeOver();
+ /*< LYW 20211015 - #3662 ADD Start >*/
+// m_pSP2P->ISP2P_GetWSIControl(0)->SetWsiEnd();
+// m_pSP2P->ISP2P_GetWSIControl(1)->SetWsiEnd();
+ /*< LYW 20211015 - #3662 ADD End >*/
}
if (GetLastPointCheck() == FALSE)
{
Sleep(1000);
}
- ReJudgeProcessing(m_pDitGlassRaw);
+ /*< LYW 20220401 - ##4006 MOD Start >*/
+ if (pGlassResult->m_AlignResult.GetResultCode() == Align_Success)
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] Review ReJudgeProcessing Startl!"));
+ ReJudgeProcessing(m_pDitGlassRaw);
+ }
+ else
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("Align Code = %d, ReJudgeProcessing SKIPl!"), pGlassResult->m_AlignResult.GetResultCode());
+ }
+ /*< LYW 20220401 - ##4006 MOD End >*/
+ //Origin
+ //ReJudgeProcessing(m_pDitGlassRaw);
m_pDitGlassRaw->GetGlassData()->m_tmReviewEnd = CTime::GetCurrentTime();
if (m_pDitGlassRaw->isConnect() != FALSE)
{
@@ -1715,9 +1752,6 @@
// SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_ReviewComplete_CPJT);
// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewStart] Send Review Success Signal!"));
}
-
- CGlassResult* pGlassResult = m_pSP2P->ISP2P_GetCurrentGlassResult();
- if (pGlassResult==NULL) return;
// review camera stop
ReviewCamera_CameraControl(CameraControlStop);
@@ -1750,15 +1784,17 @@
}
- g_pLog->DisplayMessage(_T("History map Start"));
- int nGlassResultCount = 0;
- CGlassResult* pHistoryResult = m_pSP2P->ISP2P_GetNewHistoryResult(nGlassResultCount); //taek 210201
- g_pLog->DisplayMessage(_T("History map Copy"));
- ReadAOIMemory2(pHistoryResult);
- g_pLog->DisplayMessage(_T("History map TransferData"));
- UpdateHistoryResultFromTransferData(pHistoryResult, pGlassResult);
- g_pLog->DisplayMessage(_T("History Button Enable"));
- m_pSP2P->ISP2P_GetDiagnosisHistory2();
+ /*< LYW 20211109 - #3662 Delete Start >*/
+ // g_pLog->DisplayMessage(_T("History map Start"));
+ // int nGlassResultCount = 0;
+ // CGlassResult* pHistoryResult = m_pSP2P->ISP2P_GetNewHistoryResult(nGlassResultCount); //taek 210201
+ // g_pLog->DisplayMessage(_T("History map Copy"));
+ // ReadAOIMemory2(pHistoryResult);
+ // g_pLog->DisplayMessage(_T("History map TransferData"));
+ // UpdateHistoryResultFromTransferData(pHistoryResult, pGlassResult);
+ // g_pLog->DisplayMessage(_T("History Button Enable"));
+ // m_pSP2P->ISP2P_GetDiagnosisHistory2();
+ /*< LYW 20211109 - #3662 Delete End >*/
/*int nModuleCount = m_pSP2P->ISP2P_GetModuleStatusCount();
for (int nModuleIdx = 0; nModuleIdx < nModuleCount; nModuleIdx++)
@@ -3626,6 +3662,10 @@
{
strPath.Format(_T("%s\\%s"), pNetworkInfo->m_strAlignImagePath, strGlassID);
pAlignCameraControl->SetSaveImageBasePath(strPath);
+ strPath.Format(_T("D:\\ResultData\\AlignOK\\%s"), strGlassID);
+ pAlignCameraControl->SetSaveImageOKPath(strPath);
+ strPath.Format(_T("D:\\ResultData\\AlignNG\\%s"), strGlassID);
+ pAlignCameraControl->SetSaveImageNGPath(strPath);
}
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Make Align image path End "));
}
@@ -3772,6 +3812,12 @@
pGlassResult->m_AlignRecipe.dMatchingRate = pRsRcpAlignInfo->m_dMatchingRate;
pGlassResult->m_AlignRecipe.strFirstImageFile = pRsRcpAlignInfo->m_strFirstImageFile;
pGlassResult->m_AlignRecipe.strSecondImageFile = pRsRcpAlignInfo->m_strSecondImageFile;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ pGlassResult->m_AlignRecipe.strFirstAssistantImageFile = pRsRcpAlignInfo->m_strFirstAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strSecondAssistantImageFile = pRsRcpAlignInfo->m_strSecondAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strMatchingPixelStandard = pRsRcpAlignInfo->m_strMatchingPixelStandard;
+ pGlassResult->m_AlignRecipe.strMatchingAlarmCondition = pRsRcpAlignInfo->m_strMatchingAlarmCondition;
+ /*< LYW 20211012 - #3671 ADD End >*/
pGlassResult->m_AlignRecipe.strTotalPitchImageFile = pRsRcpAlignInfo->m_strTotalPitchImageFile;
// edge find param
@@ -4660,6 +4706,16 @@
SetWsiType(0);
WSIAllReadySignal(1);
Sleep(1000);
+
+ /*< LYW 20211028 - #3718 ADD Start >*/
+ // WSI Redeay �넚�떊�썑 Review TimeOver 1�쉶 異붽� 泥댄겕
+ if (GetProcessStatus() == ProcessReviewEnd_CPJT || GetProcessStatus() == ProcessReviewUnloding_CPJT)
+ {
+ g_pLog->DisplayMessage(_T("[ProcessStop] WSI StartProcessing Sequence Stop Status : %d"), GetProcessStatus());
+ return TRUE;
+ }
+ /*< LYW 20211028 - #3718 ADD End >*/
+
if(!WSIAllStartSignal())
{
g_pLog->DisplayMessage(_T("[WSI] WSI Start Fail!!"));
@@ -7621,8 +7677,13 @@
int nReviewAliveCamera01 = 0;
//foucs
- nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast * 1000;
- nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview01ImageContrast * 1000;
+ /*< LYW 20211109 - #3662 MOD Start >*/
+ nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetReview00ImageContrast() * 1000;
+ nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetReview01ImageContrast() * 1000;
+ /*< LYW 20211109 - #3662 MOD End >*/
+ /*< Origin Code >*/
+// nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast * 1000;
+// nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview01ImageContrast * 1000;
//nRev_PC_HDD_CHECK = GetDiskUsage() * 1000;
//nWSI1_PC_HDD_CHECK = nRev_PC_HDD_CHECK;//GetDiskUsage() * 1000;
@@ -7988,29 +8049,37 @@
int nReviewAliveCamera01 = 1000;
//foucs
+ /*< LYW 20211109 - #3662 MOD Start >*/
if (m_pSP2P != NULL)
{
- if (m_pSP2P->ISP2P_GetCurrentGlassResult() != NULL)
- {
-
- nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast * 1000;
- nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview01ImageContrast * 1000;
-
- if (m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast <=-2 || m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast >=999)
- {
- nRev_Cam1_Image_Contrast = 0 * 1000;
- }
- if (m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast <=-2|| m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast >=999)
- {
- nRev_Cam2_Image_Contrast = 0 * 1000;
- }
- }
- else
- {
- nRev_Cam1_Image_Contrast = 0;
- nRev_Cam2_Image_Contrast = 0;
- }
+ nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetReview00ImageContrast() * 1000;
+ nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetReview01ImageContrast() * 1000;
}
+ /*< LYW 20211109 - #3662 MOD End >*/
+ /*< Origin Code >*/
+// if (m_pSP2P != NULL)
+// {
+// if (m_pSP2P->ISP2P_GetCurrentGlassResult() != NULL)
+// {
+//
+// nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast * 1000;
+// nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview01ImageContrast * 1000;
+//
+// if (m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast <=-2 || m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast >=999)
+// {
+// nRev_Cam1_Image_Contrast = 0 * 1000;
+// }
+// if (m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast <=-2|| m_pSP2P->ISP2P_GetCurrentGlassResult()->nReview00ImageContrast >=999)
+// {
+// nRev_Cam2_Image_Contrast = 0 * 1000;
+// }
+// }
+// else
+// {
+// nRev_Cam1_Image_Contrast = 0;
+// nRev_Cam2_Image_Contrast = 0;
+// }
+// }
@@ -8636,8 +8705,10 @@
case PCControlRecv_ManualMode_CPJT: // manual mode on
{
- m_pSP2P->ISP2P_GetDiagnosisHistory2();
-
+ /*< LYW 20211109 - #3662 Delete Start >*/
+ //m_pSP2P->ISP2P_GetDiagnosisHistory2();
+ /*< LYW 20211109 - #3662 Delete End >*/
+
m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Mode] Manual Mode"));
bResult = SetProcessMode(ProcessManualMode_CPJT);
if (bResult==FALSE) m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Mode] Manual Mode Error!"));
--
Gitblit v1.9.3