From 3ce48f6dbeb537e252edb0d62c88a28796e36674 Mon Sep 17 00:00:00 2001 From: SWK <sungwk82@diteam.co.kr> Date: 월, 26 12월 2022 15:04:42 +0900 Subject: [PATCH] ongoing60 #4403 CF AOI Review TACT 지연 개선 1. 신호 출력 방식 재개선 - 유지 시간이 없는 신호는 바로 출력 진행하도록 변경 2. 불필요 Delay 제거 및 시퀀스 변경 - 얼라인 측정 종료 처리 간 제어 신호 먼저 출력 후 카메라 Stop으로 변경 - 물류 정보 읽기 처리 후 1000ms Delay 삭제 - 얼라인 측정 시작(카메라 Live Start) 후 Delay 300ms -> 100ms(이미지 들어오는 시간 확보 필요) - ReadRawFile 처리 시작 전 500ms Delay 삭제 - Path Scheduling 완료 후 Review Ready 신호 출력 전 1000ms Delay 삭제 3. 버그 수정 - 이미지 저장 경로 생성 간 예외 처리 부분 버그 수정 4. 로그 시간 출력 불합리 개선 - 로그 시간이 파일 출력 시점으로 작성되어 로그 스래드 지연 시 시간이 맞지 않는 불합리 있음 - 로그 시간은 로그 발생 시점에 시간 저장, 해당 시간 이용하여 파일에 기록하도록 변경 --- ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 260 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 242 insertions(+), 18 deletions(-) diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp index e18344f..4885de2 100644 --- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp +++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp @@ -166,6 +166,9 @@ { m_bUseAFMHomePosition = TRUE; m_nGlassCount = 0; + m_nStackZeroReviewCondition = 0; + m_nUploadResultFailCount = 0; + m_nStackUploadFailGlassCount = 0; CDitGlassRawClient* pDitGlassRaw = CDitGlassRawClient::GetInstance(); if(pDitGlassRaw->ConnectServer() == FALSE) { @@ -547,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); @@ -665,8 +674,14 @@ // m_pSP2P->ISP2P_GetWSIControl(1)->SendWsiAfmSafePosMove(); //} //Sleep(5000); - SendResultToSignalControl(PCControlSendData_ReviewResult_CPJT, SIGNAL_SEND_RESULT_SUCCESS); - SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_ReviewComplete_CPJT); + //if (GetProcessStatus() != ProcessReviewEnd_CPJT && GetProcessStatus() != ProcessReviewUnloding_CPJT) + if (GetReviewComplete() == FALSE) + { + SendResultToSignalControl(PCControlSendData_ReviewResult_CPJT, SIGNAL_SEND_RESULT_SUCCESS); + SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_ReviewComplete_CPJT); + SetReviewComplete(TRUE); + } + m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewStart] Send Review Success Signal!")); //LONGREUN //RecvSignalToSignalControl(PCControlRecvSignalIndex_Seq, 4); @@ -936,6 +951,9 @@ SetWsiType(-1); //wsi reflow SetLastPointCheck(FALSE); + SetReviewComplete(FALSE); + //SetUploadResultFailCount(0); + bFileFind = FALSE; /*< LYW 20211109 - #3662 Delete Start >*/ @@ -1058,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; @@ -1066,7 +1083,6 @@ strGlassIDTemp = pTransferData->strGlassID; strGlassStepIdTemp = pTransferData->strStepID; - strGlassIDTemp = pTransferData->strGlassID; strcpy(pDitRawClient->GetGlassData()->m_strGlassID, strGlassIDTemp); @@ -1091,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!")); @@ -1116,6 +1133,10 @@ } m_pSP2P->ISP2P_DisplayMessage(_T("[Glass Loading] Current Apply Recipe Name : %s"), strRecipefile); + + /*< LYW 20220610 - #4185 ADD Start >*/ + CheckGantryMode(); + /*< LYW 20220610 - #4185 ADD End >*/ // recipe data apply if(ApplyRecipeDataToGlassResult(pGlassResult)==FALSE) @@ -1304,7 +1325,8 @@ } //#3561 210908 LYW ADD End - Sleep(300); + //< SWK 20221226 - #4403 MOD > + Sleep(100); //original // if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_AlignStartAck_CPJT)) @@ -1426,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!")); @@ -1487,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) @@ -1692,6 +1717,8 @@ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] Send Review End Ack!")); } + SetUploadResultFailCount(0); + CGlassResult* pGlassResult = m_pSP2P->ISP2P_GetCurrentGlassResult(); if (pGlassResult == NULL) return; @@ -1737,7 +1764,8 @@ m_pDitGlassRaw->GetGlassData()->m_nReviewNum = m_pSP2P->ISP2P_GetReviewProcessor()->GetPlanReviewCount(); //SendDVDataToSignalControl(); - if (GetLastPointCheck() == FALSE) + //if (GetLastPointCheck() == FALSE) + if (GetReviewComplete() == FALSE) { //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD START if (GetSimulationMode() == FALSE) @@ -1745,6 +1773,7 @@ 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!")); + SetReviewComplete(TRUE); } //#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD END //original @@ -1783,6 +1812,24 @@ CDlgDefocusList::GetInstance()->SetDefocusData(strTime,pGlassResult->m_strGlassID,pGlassResult->m_nDeFocusCount); } + + if (CheckZeroReviewAlarm() == FALSE && m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nZeroReviewAlarm != 0) + { + STransferData* pTransferData = m_pSP2P->ISP2P_GetCurrentTransferData(); + if (pTransferData->strProdType != m_pSP2P->ISP2P_System_GetNetworkInfo()->m_strZeroReviewAlarmExcept) + { + m_nStackZeroReviewCondition++; + m_pSP2P->ISP2P_DisplayMessage(_T("Zero Review Condition ProdType = %s, ConditionStack = %d, AlarmExcept = %s, AlarmCondition = %d"), pTransferData->strProdType, m_nStackZeroReviewCondition, m_pSP2P->ISP2P_System_GetNetworkInfo()->m_strZeroReviewAlarmExcept, m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nZeroReviewAlarm); + if (m_nStackZeroReviewCondition >= m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nZeroReviewAlarm) + { + m_pSP2P->ISP2P_DisplayMessage(_T("Zero Review Alarm! %d ea Glass Is Zero Review!"), m_nStackZeroReviewCondition); + SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_Review_0Count_Alarm, 1000); + m_nStackZeroReviewCondition = 0; + } + } + else m_nStackZeroReviewCondition = 0; + } + else m_nStackZeroReviewCondition = 0; /*< LYW 20211109 - #3662 Delete Start >*/ // g_pLog->DisplayMessage(_T("History map Start")); @@ -3638,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); @@ -4285,7 +4334,9 @@ { int XAddr = pMotorControl->GetGantryCollisionXAddr(pModuleStatus->GetGantryIndex()); g_pLog->DisplayMessage(_T("[Collision Position Set Fail] %d Module, Addr: %d, PosX: %.3lfmm"), nModuleIdx, XAddr, dCollisionPosX); - return 0; + /*< LYW 20220610 - #4185 Delete Start >*/ + //return 0; + /*< LYW 20220610 - #4185 Delete End >*/ } } @@ -4583,7 +4634,9 @@ { int XAddr = pMotorControl->GetGantryCollisionXAddr(pModuleStatus->GetGantryIndex()); g_pLog->DisplayMessage(_T("[Collision Position Set Fail] %d Module, Addr: %d, PosX: %.3lfmm"), nModuleIdx, XAddr, dCollisionPosX); - return 0; + /*< LYW 20220610 - #4185 Delete Start >*/ + //return 0; + /*< LYW 20220610 - #4185 Delete End >*/ } } @@ -4836,7 +4889,9 @@ { int XAddr = pMotorControl->GetGantryCollisionXAddr(pModuleStatus->GetGantryIndex()); g_pLog->DisplayMessage(_T("[Collision Position Set Fail] %d Module, Addr: %d, PosX: %.3lfmm"), nModuleIdx, XAddr, dCollisionPosX); - return 0; + /*< LYW 20220610 - #4185 Delete Start >*/ + //return 0; + /*< LYW 20220610 - #4185 Delete End >*/ } } @@ -8237,6 +8292,147 @@ return; } + +BOOL CSequenceProcessor_CPJT::CheckZeroReviewAlarm() +{ + CGlassResult* pGlassResult = m_pSP2P->ISP2P_GetCurrentGlassResult(); + if (pGlassResult == NULL) return FALSE; + + int TotalCount = 0; + + //Defect + const VectorReviewResult *pVecReviewResult = pGlassResult->GetVectorReviewResult(); + if (pVecReviewResult != NULL) + { + for (constVectorReviewResultIt it = pVecReviewResult->begin(); it != pVecReviewResult->end(); it++) + { + const CReviewResult *pReviewResult = static_cast<const CReviewResult*>(&(*it)); + + TotalCount += pReviewResult->m_vecSReviewResult.size(); + + for (constVectorSReviewResultIt its = pReviewResult->m_vecSReviewResult.begin(); its != pReviewResult->m_vecSReviewResult.end(); its++) + { + if (its->nResultCode > ReviewResult_None) + { + return TRUE; + } + else + { + continue; + } + } + } + } + + //DefectWSI + const VectorReviewResult *pVecWsiResult = pGlassResult->GetVectorWsiResult(); + if (pVecWsiResult != NULL) + { + for (constVectorReviewResultIt it = pVecWsiResult->begin(); it != pVecWsiResult->end(); it++) + { + const CReviewResult *pWsiResult = static_cast<const CReviewResult*>(&(*it)); + + TotalCount += pWsiResult->m_vecSReviewResult.size(); + + for (constVectorSReviewResultIt its = pWsiResult->m_vecSReviewResult.begin(); its != pWsiResult->m_vecSReviewResult.end(); its++) + { + if (its->nResultCode > WsiResult_None) + { + return TRUE; + } + else + { + continue; + } + } + } + } + + //User Review + const VectorReviewResult *pVecUserReviewResult = pGlassResult->GetVectorUserResult(); + if (pVecUserReviewResult != NULL) + { + for (constVectorReviewResultIt it = pVecUserReviewResult->begin(); it != pVecUserReviewResult->end(); it++) + { + const CReviewResult *pUserReviewResult = static_cast<const CReviewResult*>(&(*it)); + + TotalCount += pUserReviewResult->m_vecSReviewResult.size(); + + for (constVectorSReviewResultIt its = pUserReviewResult->m_vecSReviewResult.begin(); its != pUserReviewResult->m_vecSReviewResult.end(); its++) + { + if (its->nResultCode > ReviewResult_None) + { + return TRUE; + } + else + { + continue; + } + } + } + } + + //User WSI + const VectorReviewResult *pVecUserWsiResult = pGlassResult->GetVectorUserWsiResult(); + if (pVecUserWsiResult != NULL) + { + for (constVectorReviewResultIt it = pVecUserWsiResult->begin(); it != pVecUserWsiResult->end(); it++) + { + const CReviewResult *pUserWsiResult = static_cast<const CReviewResult*>(&(*it)); + + TotalCount += pUserWsiResult->m_vecSReviewResult.size(); + + for (constVectorSReviewResultIt its = pUserWsiResult->m_vecSReviewResult.begin(); its != pUserWsiResult->m_vecSReviewResult.end(); its++) + { + if (its->nResultCode > WsiResult_None) + { + return TRUE; + } + else + { + continue; + } + } + } + } + + if (TotalCount == 0) return TRUE; + + return FALSE; +} + +void CSequenceProcessor_CPJT::sendUploadResult2SequenceProcessor(int UploadResult) +{ + int UploadResultFailCount = GetUploadResultFailCount(); + if (UploadResult == FALSE) + { + UploadResultFailCount++; + m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is False")); + if (UploadResultFailCount >= 3) + { + //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 + { + SetUploadResultFailCount(UploadResultFailCount); + } + } + else + { + m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is True")); + m_nStackUploadFailGlassCount = 0; + } +} + //#3358 KYH FDC ADD END DWORD CSequenceProcessor_CPJT::GetDiskUsage() @@ -9562,7 +9758,9 @@ { int XAddr = pMotorControl->GetGantryCollisionXAddr(pModuleStatus->GetGantryIndex()); g_pLog->DisplayMessage(_T("[Collision Position Set Fail] %d Module, Addr: %d, PosX: %.3lfmm"), nModuleIdx, XAddr, dCollisionPosX); - return 0; + /*< LYW 20220610 - #4185 Delete Start >*/ + //return 0; + /*< LYW 20220610 - #4185 Delete End >*/ } } @@ -9973,13 +10171,15 @@ int XAddr = pMotorControl->GetGantryCollisionXAddr(pModuleStatus->GetGantryIndex()); g_pLog->DisplayMessage(_T("[Review_CollisionPos] %d Module, Addr: %d, PosX: %.3lf mm"), nModuleIdx, XAddr, dCollisionPosX); - ///pGlassResult->SetCollisionXPos(nModuleIdx, dCollisionPosX); + //pGlassResult->SetCollisionXPos(nModuleIdx, dCollisionPosX); } else { int XAddr = pMotorControl->GetGantryCollisionXAddr(pModuleStatus->GetGantryIndex()); g_pLog->DisplayMessage(_T("[Collision Position Set Fail] %d Module, Addr: %d, PosX: %.3lfmm"), nModuleIdx, XAddr, dCollisionPosX); - return 0; + /*< LYW 20220610 - #4185 Delete Start >*/ + //return 0; + /*< LYW 20220610 - #4185 Delete End >*/ } // get result index int nStartIdx = pWsiMultiShotResult->GetStartSReviewResultIndex(); @@ -10478,6 +10678,30 @@ } } +/*< LYW 20220610 - #4185 ADD Start >*/ +void CSequenceProcessor_CPJT::CheckGantryMode() +{ + CSignalControl* pSignalControl = m_pSP2P->ISP2P_GetSignalControl(); + if (pSignalControl == NULL) m_pSP2P->ISP2P_DisplayMessage(_T("[CheckGantryMode] SignalControl is NULL")); + if (pSignalControl->IsConnected() == FALSE) m_pSP2P->ISP2P_DisplayMessage(_T("[CheckGantryMode] SignalControl is Not Connect")); + + int LeftGantryUse = 0; + int RightGantryUse = 0; + + pSignalControl->ReadData(_T("10003"), 1, 1, LeftGantryUse); + pSignalControl->ReadData(_T("10003"), 2, 1, RightGantryUse); + + if (LeftGantryUse == 1 && RightGantryUse == 0) + m_pSP2P->ISP2P_Recipe_GetRsRcpReviewInfo()->GetRcpSchedulingInfo()->SetSingleGantryPath(1); + else if (LeftGantryUse == 0 && RightGantryUse == 1) + m_pSP2P->ISP2P_Recipe_GetRsRcpReviewInfo()->GetRcpSchedulingInfo()->SetSingleGantryPath(2); + else + m_pSP2P->ISP2P_Recipe_GetRsRcpReviewInfo()->GetRcpSchedulingInfo()->SetSingleGantryPath(0); + + m_pSP2P->ISP2P_DisplayMessage(_T("[CheckGantryMode] GantryMode LeftBit = %d, RightBit = %d"), LeftGantryUse, RightGantryUse); +} +/*< LYW 20220610 - #4185 ADD End >*/ + BOOL CSequenceProcessor_CPJT::UpdateMemoryUserReflowPlanInfo(CDitGlassRawClient* pDitSharedGlassRaw) { CRsRcpReviewInfo* pRecipeinfo = m_pSP2P->ISP2P_Recipe_GetRsRcpReviewInfo(); -- Gitblit v1.9.3