From 6d5796902a980f189f470a4e8ea7084548c52f49 Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 월, 26 6월 2023 17:43:48 +0900
Subject: [PATCH] Ongoing80 #4528 CF AOI Review Motor Offset 기능 추가 1. Motor Offset 설정 Dlg 추가. 2. Offset 파라미터 추가. 3. Motor Offset 기능 적용
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 602b2fc..ef642c6 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -168,6 +168,7 @@
m_nGlassCount = 0;
m_nStackZeroReviewCondition = 0;
m_nUploadResultFailCount = 0;
+ m_nStackUploadFailGlassCount = 0;
CDitGlassRawClient* pDitGlassRaw = CDitGlassRawClient::GetInstance();
if(pDitGlassRaw->ConnectServer() == FALSE)
{
@@ -549,10 +550,16 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail Data!"));
}
- AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence 蹂�寃�
-
+ /*< SWK 20221226 - #4403 MOD Start >*/
+// AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence 蹂�寃�
+//
+// SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
+// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));
SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));
+
+ AlignCamera_CameraControl(CameraControlStop);
+ /*< SWK 20221226 - #4403 MOD End >*/
// LJY-20180905
m_pSP2P->ISP2P_UpdateAlignResultStatus(0, pGlassResult);
@@ -1069,7 +1076,6 @@
// #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;
CString strGlassStepIdTemp = NULL;
@@ -1077,7 +1083,6 @@
strGlassIDTemp = pTransferData->strGlassID;
strGlassStepIdTemp = pTransferData->strStepID;
-
strGlassIDTemp = pTransferData->strGlassID;
strcpy(pDitRawClient->GetGlassData()->m_strGlassID, strGlassIDTemp);
@@ -1102,7 +1107,8 @@
/*bFileFind = FindRawBinFile(strFileName);*/
pDitRawClient->SetReviewStart();
- Sleep(1000);
+ //< SWK 20221226 - #4403 DEL >
+// Sleep(1000);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Transfer Data Read Success!"));
@@ -1319,7 +1325,8 @@
}
//#3561 210908 LYW ADD End
- Sleep(300);
+ //< SWK 20221226 - #4403 MOD >
+ Sleep(100);
//original
// if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_AlignStartAck_CPJT))
@@ -1441,7 +1448,9 @@
//pDitRawClient->SetReviewStart();
- Sleep(500);
+ //< SWK 20221226 - #4403 DEL >
+// Sleep(500);
+
//CString strJudgeData;
m_pSP2P->ISP2P_GetSignalControl()->WriteData(_T("17110"), sizeof(pDitRawClient->GetGlassData()->m_strGlassJudge), pDitRawClient->GetGlassData()->m_strGlassJudge);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] ReadRawFile!"));
@@ -1502,7 +1511,8 @@
int nTotalPlanCount = CalculatePlanData(pGlassResult);
m_pSP2P->ISP2P_DisplayMessage(_T("[Read Raw File] Review All Plan Total Count : %d"), nTotalPlanCount);
- Sleep(1000);
+ //< SWK 20221226 - #4403 DEL >
+// Sleep(1000);
// send review ready
//#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD START
if (GetSimulationMode() == FALSE)
@@ -3675,7 +3685,9 @@
tmServerLoadingTime = CTime::GetCurrentTime();
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] access Shared Memory Fail"));
strPath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), pNetworkInfo->m_strUploadImagePath, strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
- strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
+ //< SWK 20221226 - #4403 MOD >
+// strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
+ strImagePath.Format(_T("%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
CreateDirectory(strPath, NULL);
pReviewProcessor->SetUploadImagePath(strPath);
pReviewProcessor->SetReviewImagePath(strImagePath);
@@ -4364,6 +4376,7 @@
// set offset
ApplyMotorOffset(pReview->nModuleIdx, pReview->nZoomIdx, MotorOffsetCamera + MotorOffsetMag+MotorOffset_Glass, dDefectPosX, dDefectPosY);
+ m_pSP2P->CalcMotorOffSetValue(pReview->nModuleIdx, dDefectPosX, dDefectPosY); //< KEJ 20230622 - #4526 ADD >
//xpostemp = dDefectPosX;
//ypostemp = dDefectPosY;
@@ -4664,6 +4677,7 @@
// set offset
ApplyMotorOffset(pReview->nModuleIdx, pReview->nZoomIdx, MotorOffsetCamera + MotorOffsetMag + MotorOffset_Glass, dDefectPosX, dDefectPosY);
+ m_pSP2P->CalcMotorOffSetValue(pReview->nModuleIdx, dDefectPosX, dDefectPosY); //< KEJ 20230622 - #4526 ADD >
//xpostemp = dDefectPosX;
//ypostemp = dDefectPosY;
@@ -4920,6 +4934,8 @@
// set offset
ApplyMotorOffset(pWsi->nModuleIdx, -1, MotorOffsetCamera + MotorOffsetWSI + MotorOffset_Glass, dDefectPosX, dDefectPosY);
+
+ m_pSP2P->CalcMotorOffSetValue(pWsi->nModuleIdx, dDefectPosX, dDefectPosY); //< KEJ 20230622 - #4526 ADD >
m_pSP2P->GetOffSetValue(nModuleIdx, pWsi->nAOICameraIdx, pWsi->nAOIScanIdx, pWsi->nUMOriginX / 1000.0, xpostemp, ypostemp);
@@ -8395,10 +8411,18 @@
if (UploadResult == FALSE)
{
UploadResultFailCount++;
+ m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is False"));
if (UploadResultFailCount >= 3)
{
- m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail!"));
- SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
+ //SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
+ m_nStackUploadFailGlassCount++;
+ m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail Glass Count = %d"),m_nStackUploadFailGlassCount);
+ if (m_nStackUploadFailGlassCount >= m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nResultFileUploadFailAlarmCondition)
+ {
+ SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
+ m_nStackUploadFailGlassCount = 0;
+ m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail Alarm!"));
+ }
SetUploadResultFailCount(-1);
}
else
@@ -8406,6 +8430,11 @@
SetUploadResultFailCount(UploadResultFailCount);
}
}
+ else
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is True"));
+ m_nStackUploadFailGlassCount = 0;
+ }
}
//#3358 KYH FDC ADD END
--
Gitblit v1.9.3