From 9ad2aa59da822e9d30c5e0cd677025fe6e12df95 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 화, 09 11월 2021 17:37:17 +0900
Subject: [PATCH] Ongoing90 #3662 CF AOI Review 전설비 알람 발생 조치
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 106 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 66d291a..4b3b22e 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);
@@ -1685,8 +1702,8 @@
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();
+// m_pSP2P->ISP2P_GetWSIControl(0)->SetWsiEnd();
+// m_pSP2P->ISP2P_GetWSIControl(1)->SetWsiEnd();
/*< LYW 20211015 - #3662 ADD End >*/
}
if (GetLastPointCheck() == FALSE)
@@ -1754,15 +1771,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++)
@@ -7641,8 +7660,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;
@@ -8008,29 +8032,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;
+// }
+// }
@@ -8656,8 +8688,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