From ea996431950e6ecff451bd40d1228f51d077475c Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 28 4월 2022 09:22:18 +0900
Subject: [PATCH] Ongoing100 #4086 CF AOI Review FDC SW Version 추가 요청
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index de293e5..e18344f 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -1691,6 +1691,10 @@
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))
@@ -1710,7 +1714,19 @@
{
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)
{
@@ -1736,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);
@@ -7759,6 +7772,9 @@
pSignalControl->WritePacketData(_T("16140"), sizeof(nWSI00Version), (short*)&nWSI00Version);
pSignalControl->WritePacketData(_T("16144"), sizeof(nWSI01Version), (short*)&nWSI01Version);
+ /*< LYW 20220415 - #4086 ADD Start >*/ //異붽� �븘�슂
+ /*< LYW 20220415 - #4086 ADD End >*/
+
//CCHImageData pImageData;
//CCHImageData pImageData2;
@@ -8034,6 +8050,14 @@
int nWSI01Version = 20210422;
int nReviewAliveCamera00 = 1000;
int nReviewAliveCamera01 = 1000;
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ int nFDCGRMSWVersion = 20200101;
+ int nFDCFTPUploaderSWVersion = 20200101;
+ int nFDCSyncSWVersion = 20200101;
+ int nFDCReviewSWVersion = 20200101;
+ int nFDCWSISWVersion00 = 20200101;
+ int nFDCWSISWVersion01 = 20200101;
+ /*< LYW 20220415 - #4086 ADD End >*/
//foucs
/*< LYW 20211109 - #3662 MOD Start >*/
@@ -8041,6 +8065,15 @@
{
nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetReview00ImageContrast() * 1000;
nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetReview01ImageContrast() * 1000;
+
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ nFDCGRMSWVersion = m_pSP2P->ISP2P_GetGRMSWVersion();
+ nFDCFTPUploaderSWVersion = m_pSP2P->ISP2P_GetFTPUploaderSWVersion();
+ nFDCSyncSWVersion = m_pSP2P->ISP2P_GetSyncSWVersion();
+ nFDCReviewSWVersion = m_pSP2P->ISP2P_GetReviewSWVersion();
+ nFDCWSISWVersion00 = m_pSP2P->ISP2P_GetWSISWVersion(0);
+ nFDCWSISWVersion01 = m_pSP2P->ISP2P_GetWSISWVersion(1);
+ /*< LYW 20220415 - #4086 ADD End >*/
}
/*< LYW 20211109 - #3662 MOD End >*/
/*< Origin Code >*/
@@ -8184,13 +8217,22 @@
pSignalControl->WritePacketData(_T("16116"), sizeof(nRev_Cam1_Image_Contrast), (short*)&nRev_Cam1_Image_Contrast);
pSignalControl->WritePacketData(_T("16120"), sizeof(nRev_Cam2_Image_Contrast), (short*)&nRev_Cam2_Image_Contrast);
- pSignalControl->WritePacketData(_T("16124"), sizeof(nRev_PC_HDD_CHECK), (short*)&nRev_PC_HDD_CHECK);
- 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);
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ pSignalControl->WritePacketData(_T("16124"), sizeof(nFDCSyncSWVersion), (short*)&nFDCSyncSWVersion);
+ pSignalControl->WritePacketData(_T("16128"), sizeof(nFDCReviewSWVersion), (short*)&nFDCReviewSWVersion);
+ pSignalControl->WritePacketData(_T("16132"), sizeof(nFDCFTPUploaderSWVersion), (short*)&nFDCFTPUploaderSWVersion);
+ pSignalControl->WritePacketData(_T("16136"), sizeof(nFDCGRMSWVersion), (short*)&nFDCGRMSWVersion);
+ pSignalControl->WritePacketData(_T("16140"), sizeof(nFDCWSISWVersion00), (short*)&nFDCWSISWVersion00);
+ pSignalControl->WritePacketData(_T("16144"), sizeof(nFDCWSISWVersion01), (short*)&nFDCWSISWVersion01);
+ /*< LYW 20220415 - #4086 ADD End >*/
- pSignalControl->WritePacketData(_T("16136"), sizeof(nReviewVersion), (short*)&nReviewVersion);
- pSignalControl->WritePacketData(_T("16140"), sizeof(nWSI00Version), (short*)&nWSI00Version);
- pSignalControl->WritePacketData(_T("16144"), sizeof(nWSI01Version), (short*)&nWSI01Version);
+// pSignalControl->WritePacketData(_T("16124"), sizeof(nRev_PC_HDD_CHECK), (short*)&nRev_PC_HDD_CHECK);
+// 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);
return;
@@ -9244,7 +9286,7 @@
AFM_SetAFMTracking(FALSE);
SetWsiType(0);
- WSIAllReadySignal(0);
+ WSIAllReadySignal(1);
// send wsi start
if(!WSIUserAllStartSignal())
@@ -9475,7 +9517,8 @@
VectorDouble vectorCollisionPosX;
vectorCollisionPosX.clear();
-
+ //WSI
+ pMotorControl->GantrySetTwoGantrySyncModeSend(1);
// WSI result count
for (int nModuleIdx=0; nModuleIdx<Module_GetModuleStatusCount(); nModuleIdx++)
@@ -9564,6 +9607,15 @@
}
}
+ if (vectorPosX.empty() == TRUE)
+ {
+ //3360 LYW_ CF AOI QD Review WSI XY MotorMoving Error START
+ g_pLog->DisplayMessage(_T("[GantryAutoGo] No Exist Send Point,TwoGantrySyncMode OFF!"), vectorPosX.size());
+ g_pLog->DisplayMessage(_T("[GantryAutoGo] (%d)Gantry Path Send Fail"), pModuleStatus->GetGantryIndex()); //taek 210128
+ pMotorControl->GantrySetTwoGantrySyncModeSend(0);
+ //3360 LYW_ CF AOI QD Review WSI XY MotorMoving Error END
+ }
+
if (m_pSP2P->ISP2P_GetReviewProcessor()->CheckMotionComplete() == FALSE)
{
g_pLog->DisplayMessage(_T("[GantryAutoGo] Motor IS Not Ready "));
--
Gitblit v1.9.3