From 6bb39b058bce38f80645e1e54d03a172f74dba3b Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 09 7월 2021 09:04:43 +0900
Subject: [PATCH] Ongoing100 #3495 CF AOI Review[QD, Blue] GlassLoading 시 다운 현상 조치
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index aaf6ed8..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);
@@ -964,7 +978,7 @@
// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Revolver Set GoHome Success!"));
//}
- //210330 kyh Align Image 초기화
+ //#3357 KYH Align Image 초기화 ADD START
CCameraControlAlign* pAlignCameraControl = m_pSP2P->ISP2P_GetAlignCameraControl();
if (pAlignCameraControl != NULL)
{
@@ -972,6 +986,7 @@
g_pLog->DisplayMessage(_T("[Align] Align Image Clear"));
}
+ //#3357 KYH Align Image 초기화 ADD END
// get transfer data
int nResultCode = 0;
@@ -1026,6 +1041,10 @@
}
+
+ // #3381 LYW CF AOI Review 전설비 FDC TackTime 오보고 현상 개선 ADD START
+ pDitRawClient->GetGlassData()->m_tmReviewLoading = CTime::GetCurrentTime();
+ // #3381 LYW CF AOI Review 전설비 FDC TackTime 오보고 현상 개선 ADD END
CString strGlassIDTemp = NULL;
@@ -1042,6 +1061,7 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] Send Loading Success Signal!"));
strFileName.Format(_T("%s_%s"), strGlassIDTemp, strGlassStepIdTemp);
+ //업데이트시
bFileFind = FindRawBinFile(strFileName);
//bFileFind = TRUE;
@@ -1507,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)
{
@@ -1523,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를 기다린다.
//음 ... 로직 오류인데일단 추가
@@ -3121,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
}
}
@@ -4494,7 +4514,7 @@
SetWsiType(0);
WSIAllReadySignal(1);
- Sleep(500);
+ Sleep(1000);
if(!WSIAllStartSignal())
{
g_pLog->DisplayMessage(_T("[WSI] WSI Start Fail!!"));
@@ -4570,8 +4590,10 @@
VectorDouble vectorCollisionPosX;
vectorCollisionPosX.clear();
-
+ //WSI 좌우 겐트리 동시이동
+ pMotorControl->GantrySetTwoGantrySyncModeSend(1);
+
// WSI result count
for (int nModuleIdx = 0; nModuleIdx < Module_GetModuleStatusCount(); nModuleIdx++)
{
@@ -4617,8 +4639,6 @@
return 0;
}
}
- //WSI 좌우 겐트리 동시이동
- pMotorControl->GantrySetTwoGantrySyncModeSend(1);
// get result index
int nStartIdx = pWsiResult->GetStartSReviewResultIndex();
@@ -7727,7 +7747,8 @@
pSignalControl->WritePacketData(_T("15100"), sizeof(DVDataPack_CPJT), (short*)&DVData);*/
}
-void CSequenceProcessor_CPJT::MakeDVData2() //210325 kyh FDC
+//#3358 KYH FDC 데이터 전송 시점 개선 ADD START
+void CSequenceProcessor_CPJT::MakeDVData2()
{
const CRsRcpReviewInfo* pRsRcpReviewInfo = m_pSP2P->ISP2P_Recipe_GetRsRcpReviewInfo();
@@ -7981,8 +8002,6 @@
pSignalControl->WritePacketData(_T("16128"), sizeof(nWSI1_PC_HDD_CHECK), (short*)&nWSI1_PC_HDD_CHECK);
pSignalControl->WritePacketData(_T("16132"), sizeof(nWSI2_PC_HDD_CHECK), (short*)&nWSI2_PC_HDD_CHECK);
-
-
pSignalControl->WritePacketData(_T("16136"), sizeof(nReviewVersion), (short*)&nReviewVersion);
pSignalControl->WritePacketData(_T("16140"), sizeof(nWSI00Version), (short*)&nWSI00Version);
pSignalControl->WritePacketData(_T("16144"), sizeof(nWSI01Version), (short*)&nWSI01Version);
@@ -7990,6 +8009,7 @@
return;
}
+//#3358 KYH FDC 데이터 전송 시점 개선 ADD END
DWORD CSequenceProcessor_CPJT::GetDiskUsage()
{
--
Gitblit v1.9.3