From 6e67289f2d2512398095e69b269906e5b02d5696 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 09 7월 2021 09:14:44 +0900
Subject: [PATCH] Merge branch 'feature/#3486_CF_AOI_Review_Review_History_프로그램_테스트_및_적용' into feature/#3495_CF_AOI_Review(QD,_Blue)_GlassLoading_시_다운_현상_조치
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index c969d8d..ebac4f6 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -788,6 +788,20 @@
if (( nTotalCount += pGlassResult->GetTotalSReviewResultCount()) > 0)
{
m_pSP2P->ISP2P_DisplayMessage(_T("[Sequence Processor] Review Plan Start!"));
+ //LYW DCOLL 임시조치
+ CDitGlassRawClient *pDitRawClient = CDitGlassRawClient::GetInstance();
+ if (pDitRawClient->isConnect() == TRUE)
+ {
+
+ _grmDefectData* pSharedDefect = pDitRawClient->GetDefectData(0);//pReviewResult->nDefectidx2
+ _grmDefectReviewData * pSharedDefectReview = &pSharedDefect->m_ReviewDefect;
+
+ //size_t CharactersConverted;
+ //wcstombs_s(&CharactersConverted, pSharedDefectReview->m_strRevImageName, pReviewResult->strImgFileName, _TRUNCATE);
+
+ strcpy(pSharedDefectReview->m_strRevImageName, "");
+ }
+ //LYW DCOLL 임시조치
::Sleep(nWaitTime);
m_pSP2P->ISP2P_GetReviewProcessor()->ResetGantryDone();
bExcute = ReviewStartProcessing(pGlassResult, nPlanIdx);
@@ -1048,8 +1062,8 @@
strFileName.Format(_T("%s_%s"), strGlassIDTemp, strGlassStepIdTemp);
//업데이트시
- //bFileFind = FindRawBinFile(strFileName);
- bFileFind = TRUE;
+ bFileFind = FindRawBinFile(strFileName);
+ //bFileFind = TRUE;
pDitRawClient->SetReviewStart();
Sleep(1000);
@@ -1244,7 +1258,6 @@
if(pAlignCameraControl->AlignCameraDisconnectCheck() == FALSE)
{
SendResultToSignalControl(PCControlSendData_AlignResult_CPJT, SIGNAL_SEND_RESULT_FAIL);
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail! Align Cam Disconnect"));
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Algin Camera Disconnect!!!!"));
}
}
@@ -1514,6 +1527,9 @@
{
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] ReviewEnd!"));
+ 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)
{
@@ -1530,9 +1546,6 @@
m_pDitGlassRaw->GetGlassData()->m_nReviewNum = m_pSP2P->ISP2P_GetReviewProcessor()->GetPlanReviewCount();
//SendDVDataToSignalControl();// 안쓰쥬
-
- if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_ReviewEndAck_CPJT))
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] Send Review End Ack!"));
//OverTime 발생시 제어에서 END ACK를 기다리는게 아니라 걍 Conplete를 기다린다.
//음 ... 로직 오류인데일단 추가
@@ -3128,7 +3141,7 @@
strReadData = pTransferData->strRerferData;
break;
}
- m_pSP2P->ISP2P_DisplayMessage(_T("[ReadTransferData] Name: %s, Addr: %s, Size: %d, Data: %s"), pInfo->strName, strReadAddress, nReadSize, strReadData); //0517
+ // m_pSP2P->ISP2P_DisplayMessage(_T("[ReadTransferData] Name: %s, Addr: %s, Size: %d, Data: %s"), pInfo->strName, strReadAddress, nReadSize, strReadData); //0517
}
}
@@ -4581,7 +4594,6 @@
//WSI 좌우 겐트리 동시이동
pMotorControl->GantrySetTwoGantrySyncModeSend(1);
-
// WSI result count
for (int nModuleIdx = 0; nModuleIdx < Module_GetModuleStatusCount(); nModuleIdx++)
{
@@ -4627,7 +4639,6 @@
return 0;
}
}
-
// get result index
int nStartIdx = pWsiResult->GetStartSReviewResultIndex();
@@ -6085,7 +6096,6 @@
pReviewScheduler->GetPathSchedulerParam()->SetSelectModuleType(type);
nSchedulingCount = pReviewScheduler->PathScheduling(vecPathData, vecStartPathData);
-
if (nSchedulingCount>0)
{
--
Gitblit v1.9.3