From 29b057b25d57dab9ed33aa2a1bc22b6dc68e1a4d Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 01 4월 2022 10:31:31 +0900
Subject: [PATCH] Ongoing70 #4006 CF AOI Review Align Fail시 재판정 Off 기능 추가
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 283 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 181 insertions(+), 102 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index a795da2..dccb4d4 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);
@@ -1674,22 +1691,42 @@
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))
// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] Send Review End Ack!"));
CDitGlassRawClient* m_pDitGlassRaw = CDitGlassRawClient::GetInstance();
- if (m_pSP2P->ISP2P_GetWSIControl(0)!=NULL)
+ if (GetSimulationMode() == FALSE && m_pSP2P->ISP2P_GetWSIControl(0)!=NULL)
{
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();
+ /*< LYW 20211015 - #3662 ADD End >*/
}
if (GetLastPointCheck() == FALSE)
{
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)
{
@@ -1715,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);
@@ -1750,15 +1784,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++)
@@ -3400,67 +3436,76 @@
void CSequenceProcessor_CPJT::UpdateHistoryResultFromTransferData(CGlassResult *pHistoryResult, CGlassResult* pGlassResult)
{
- if (pHistoryResult == NULL || pGlassResult == NULL) return;
+ try
+ {
+ if (pHistoryResult == NULL || pGlassResult == NULL) return;
- CTime time = CTime::GetCurrentTime();
+ CTime time = CTime::GetCurrentTime();
- CString strTime = _T("");
- strTime.Format(_T("%04d-%02d-%02d %02d:%02d:%02d"), time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());
+ CString strTime = _T("");
+ strTime.Format(_T("%04d-%02d-%02d %02d:%02d:%02d"), time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond());
- // update transfer data to glass result
- pHistoryResult->m_nGlassSizeX = pGlassResult->m_nGlassSizeX;
- pHistoryResult->m_nGlassSizeY = pGlassResult->m_nGlassSizeY;
- pHistoryResult->m_nCollisionDistanceX = pGlassResult->m_nCollisionDistanceX;
- pHistoryResult->m_nCollisionDistanceY = pGlassResult->m_nCollisionDistanceY;
- pHistoryResult->m_nCollisionXPos1 = pGlassResult->m_nCollisionXPos1;
- pHistoryResult->m_nCollisionXPos2 = pGlassResult->m_nCollisionXPos2;
- pHistoryResult->m_nOriginDir = pGlassResult->m_nOriginDir;
- pHistoryResult->m_strResultDate = pGlassResult->m_strResultDate;
- pHistoryResult->m_vecReviewScheduleResult = pGlassResult->m_vecReviewScheduleResult;
- pHistoryResult->m_nCornerCutDir = pGlassResult->m_nCornerCutDir;
- pHistoryResult->m_bReadRawFile = pGlassResult->m_bReadRawFile;
- pHistoryResult->m_vecReviewResult = pGlassResult->m_vecReviewResult;
- pHistoryResult->m_strGlassLastName = pGlassResult->m_strGlassLastName;
- pHistoryResult->m_strGlassID = pGlassResult->m_strGlassID;
- pHistoryResult->m_strGlassCode = pGlassResult->m_strGlassCode;
- pHistoryResult->m_strMode = pGlassResult->m_strMode;
- pHistoryResult->m_strGlassType = pGlassResult->m_strGlassType;
- pHistoryResult->m_strDummyType = pGlassResult->m_strDummyType;
- pHistoryResult->m_strProdID = pGlassResult->m_strProdID;
- pHistoryResult->m_strOperID = pGlassResult->m_strOperID;
- pHistoryResult->m_strLotID = pGlassResult->m_strLotID;
- pHistoryResult->m_strPPID = pGlassResult->m_strPPID;
- pHistoryResult->m_strPPID_RC = pGlassResult->m_strPPID_RC;
- pHistoryResult->m_strJobType = pGlassResult->m_strJobType;
- pHistoryResult->m_strJobID = pGlassResult->m_strJobID;
- pHistoryResult->m_strLotSeqNum = pGlassResult->m_strLotSeqNum;
- pHistoryResult->m_strSlotSeqNum = pGlassResult->m_strSlotSeqNum;
- pHistoryResult->m_strPropertyCode = pGlassResult->m_strPropertyCode;
- pHistoryResult->m_strJobJudgeCode = pGlassResult->m_strJobJudgeCode;
- pHistoryResult->m_strJobGradeCode = pGlassResult->m_strJobGradeCode;
- pHistoryResult->m_strSubstrateType = pGlassResult->m_strSubstrateType;
- pHistoryResult->m_strProcessingFlag = pGlassResult->m_strProcessingFlag;
- pHistoryResult->m_strInspectionFlag = pGlassResult->m_strInspectionFlag;
- pHistoryResult->m_strSkipFlag = pGlassResult->m_strSkipFlag;
- pHistoryResult->m_strJobSize = pGlassResult->m_strJobSize;
- pHistoryResult->m_strGlassThickness = pGlassResult->m_strGlassThickness;
- pHistoryResult->m_strJobAngle = pGlassResult->m_strJobAngle;
- pHistoryResult->m_strJobFlip = pGlassResult->m_strJobFlip;
- pHistoryResult->m_strCuttingGlassType = pGlassResult->m_strCuttingGlassType;
- pHistoryResult->m_strProcessingCount = pGlassResult->m_strProcessingCount;
- pHistoryResult->m_strInspectionJudgeData = pGlassResult->m_strInspectionJudgeData;
- pHistoryResult->m_strPairJobID = pGlassResult->m_strPairJobID;
- pHistoryResult->m_strPairFlag = pGlassResult->m_strPairFlag;
- pHistoryResult->m_strOptionValue = pGlassResult->m_strOptionValue;
- pHistoryResult->m_strReserved = pGlassResult->m_strReserved;
- pHistoryResult->strGlassScanSchedule = pGlassResult->strGlassScanSchedule;// cmark
- pHistoryResult->m_strStepID = pGlassResult->m_strRTMSStepID; //taek 210126
- pHistoryResult->m_strEquipID = pGlassResult->m_strEquipID;
- pHistoryResult->m_strProcessID = pGlassResult->m_strProcessID;
- pHistoryResult->m_strUploadImgFileName = pGlassResult->m_strUploadImgFileName;
- pHistoryResult->m_strUnLoadingTime = strTime;
- pHistoryResult->m_mapDefectResult = pGlassResult->m_mapDefectResult;
- pHistoryResult->m_AlignResult = pGlassResult->m_AlignResult;
+ // update transfer data to glass result
+ pHistoryResult->m_nGlassSizeX = pGlassResult->m_nGlassSizeX;
+ pHistoryResult->m_nGlassSizeY = pGlassResult->m_nGlassSizeY;
+ pHistoryResult->m_nCollisionDistanceX = pGlassResult->m_nCollisionDistanceX;
+ pHistoryResult->m_nCollisionDistanceY = pGlassResult->m_nCollisionDistanceY;
+ pHistoryResult->m_nCollisionXPos1 = pGlassResult->m_nCollisionXPos1;
+ pHistoryResult->m_nCollisionXPos2 = pGlassResult->m_nCollisionXPos2;
+ pHistoryResult->m_nOriginDir = pGlassResult->m_nOriginDir;
+ pHistoryResult->m_strResultDate = pGlassResult->m_strResultDate;
+ pHistoryResult->m_vecReviewScheduleResult = pGlassResult->m_vecReviewScheduleResult;
+ pHistoryResult->m_nCornerCutDir = pGlassResult->m_nCornerCutDir;
+ pHistoryResult->m_bReadRawFile = pGlassResult->m_bReadRawFile;
+ pHistoryResult->m_vecReviewResult = pGlassResult->m_vecReviewResult;
+ pHistoryResult->m_strGlassLastName = pGlassResult->m_strGlassLastName;
+ pHistoryResult->m_strGlassID = pGlassResult->m_strGlassID;
+ pHistoryResult->m_strGlassCode = pGlassResult->m_strGlassCode;
+ pHistoryResult->m_strMode = pGlassResult->m_strMode;
+ pHistoryResult->m_strGlassType = pGlassResult->m_strGlassType;
+ pHistoryResult->m_strDummyType = pGlassResult->m_strDummyType;
+ pHistoryResult->m_strProdID = pGlassResult->m_strProdID;
+ pHistoryResult->m_strOperID = pGlassResult->m_strOperID;
+ pHistoryResult->m_strLotID = pGlassResult->m_strLotID;
+ pHistoryResult->m_strPPID = pGlassResult->m_strPPID;
+ pHistoryResult->m_strPPID_RC = pGlassResult->m_strPPID_RC;
+ pHistoryResult->m_strJobType = pGlassResult->m_strJobType;
+ pHistoryResult->m_strJobID = pGlassResult->m_strJobID;
+ pHistoryResult->m_strLotSeqNum = pGlassResult->m_strLotSeqNum;
+ pHistoryResult->m_strSlotSeqNum = pGlassResult->m_strSlotSeqNum;
+ pHistoryResult->m_strPropertyCode = pGlassResult->m_strPropertyCode;
+ pHistoryResult->m_strJobJudgeCode = pGlassResult->m_strJobJudgeCode;
+ pHistoryResult->m_strJobGradeCode = pGlassResult->m_strJobGradeCode;
+ pHistoryResult->m_strSubstrateType = pGlassResult->m_strSubstrateType;
+ pHistoryResult->m_strProcessingFlag = pGlassResult->m_strProcessingFlag;
+ pHistoryResult->m_strInspectionFlag = pGlassResult->m_strInspectionFlag;
+ pHistoryResult->m_strSkipFlag = pGlassResult->m_strSkipFlag;
+ pHistoryResult->m_strJobSize = pGlassResult->m_strJobSize;
+ pHistoryResult->m_strGlassThickness = pGlassResult->m_strGlassThickness;
+ pHistoryResult->m_strJobAngle = pGlassResult->m_strJobAngle;
+ pHistoryResult->m_strJobFlip = pGlassResult->m_strJobFlip;
+ pHistoryResult->m_strCuttingGlassType = pGlassResult->m_strCuttingGlassType;
+ pHistoryResult->m_strProcessingCount = pGlassResult->m_strProcessingCount;
+ pHistoryResult->m_strInspectionJudgeData = pGlassResult->m_strInspectionJudgeData;
+ pHistoryResult->m_strPairJobID = pGlassResult->m_strPairJobID;
+ pHistoryResult->m_strPairFlag = pGlassResult->m_strPairFlag;
+ pHistoryResult->m_strOptionValue = pGlassResult->m_strOptionValue;
+ pHistoryResult->m_strReserved = pGlassResult->m_strReserved;
+ pHistoryResult->strGlassScanSchedule = pGlassResult->strGlassScanSchedule;// cmark
+ pHistoryResult->m_strStepID = pGlassResult->m_strRTMSStepID; //taek 210126
+ pHistoryResult->m_strEquipID = pGlassResult->m_strEquipID;
+ pHistoryResult->m_strProcessID = pGlassResult->m_strProcessID;
+ pHistoryResult->m_strUploadImgFileName = pGlassResult->m_strUploadImgFileName;
+ pHistoryResult->m_strUnLoadingTime = strTime;
+ pHistoryResult->m_mapDefectResult = pGlassResult->m_mapDefectResult;
+ pHistoryResult->m_AlignResult = pGlassResult->m_AlignResult;
+ }
+ catch (...)
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Review End] UpdateHistoryResultFromTransferData Error"));
+ return;
+ }
+
}
void CSequenceProcessor_CPJT::CreateResultDirectory(const CString& strGlassID, const CString& strDate)
@@ -3617,6 +3662,10 @@
{
strPath.Format(_T("%s\\%s"), pNetworkInfo->m_strAlignImagePath, strGlassID);
pAlignCameraControl->SetSaveImageBasePath(strPath);
+ strPath.Format(_T("D:\\ResultData\\AlignOK\\%s"), strGlassID);
+ pAlignCameraControl->SetSaveImageOKPath(strPath);
+ strPath.Format(_T("D:\\ResultData\\AlignNG\\%s"), strGlassID);
+ pAlignCameraControl->SetSaveImageNGPath(strPath);
}
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Make Align image path End "));
}
@@ -3763,6 +3812,12 @@
pGlassResult->m_AlignRecipe.dMatchingRate = pRsRcpAlignInfo->m_dMatchingRate;
pGlassResult->m_AlignRecipe.strFirstImageFile = pRsRcpAlignInfo->m_strFirstImageFile;
pGlassResult->m_AlignRecipe.strSecondImageFile = pRsRcpAlignInfo->m_strSecondImageFile;
+ /*< LYW 20211012 - #3671 ADD Start >*/
+ pGlassResult->m_AlignRecipe.strFirstAssistantImageFile = pRsRcpAlignInfo->m_strFirstAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strSecondAssistantImageFile = pRsRcpAlignInfo->m_strSecondAssistantImageFile;
+ pGlassResult->m_AlignRecipe.strMatchingPixelStandard = pRsRcpAlignInfo->m_strMatchingPixelStandard;
+ pGlassResult->m_AlignRecipe.strMatchingAlarmCondition = pRsRcpAlignInfo->m_strMatchingAlarmCondition;
+ /*< LYW 20211012 - #3671 ADD End >*/
pGlassResult->m_AlignRecipe.strTotalPitchImageFile = pRsRcpAlignInfo->m_strTotalPitchImageFile;
// edge find param
@@ -4651,6 +4706,16 @@
SetWsiType(0);
WSIAllReadySignal(1);
Sleep(1000);
+
+ /*< LYW 20211028 - #3718 ADD Start >*/
+ // WSI Redeay �넚�떊�썑 Review TimeOver 1�쉶 異붽� 泥댄겕
+ if (GetProcessStatus() == ProcessReviewEnd_CPJT || GetProcessStatus() == ProcessReviewUnloding_CPJT)
+ {
+ g_pLog->DisplayMessage(_T("[ProcessStop] WSI StartProcessing Sequence Stop Status : %d"), GetProcessStatus());
+ return TRUE;
+ }
+ /*< LYW 20211028 - #3718 ADD End >*/
+
if(!WSIAllStartSignal())
{
g_pLog->DisplayMessage(_T("[WSI] WSI Start Fail!!"));
@@ -7612,8 +7677,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;
@@ -7979,29 +8049,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;
+// }
+// }
@@ -8460,8 +8538,8 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Send] Review Start Ack! => %d"), 1);
break;
- case PCControlSend_ResultDataComplete_CPJT:
- m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Send] Result Data Complete! => %d"), 1);
+ case PCControlSend_ReviewEndAck_CPJT:
+ m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Send] Review End Ack! => %d"), 1);
break;
}
}
@@ -8627,8 +8705,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!"));
@@ -8823,12 +8903,11 @@
break;
case PCControlRecv_Autodiagnosis:
{
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
CSignalControl* pSignalControl = m_pSP2P->ISP2P_GetSignalControl();
CString strDiagnosisMode;
pSignalControl->ReadData(_T("11160"), 2, strDiagnosisMode);
int nDiagnosisMode = atoi(strDiagnosisMode);
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Signal] Diagno start => %d, DiagnosisMode => %d"), bSignalOn, nDiagnosisMode);
if (bSignalOn) {
@@ -8838,7 +8917,7 @@
m_pSP2P->ISP2P_GetDiagnosisManager()->RecvSignalToSignalControl(0, nDiagnosisMode);
}
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
else
bResult = SendSignalOffToSignalControl(PCControlSendSignalIndex_DiagnoAck, 0);
--
Gitblit v1.9.3