From 1fd49a571338b6c946bb05dcdf59ec1468df5c50 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 목, 22 12월 2022 12:31:43 +0900
Subject: [PATCH] ongoing50 #4403 CF AOI Reveiw TACT 지연 개선 1. 일정 시간 유지 신호 처리 시 동기화로 인한 불합리 개선 - 일정 시간 유지 필요 시 스래드풀 작업큐를 이용하여 루프처리 방식으로 변경 - 유지 신호 처리 중 출력 신호 발생 시 작업큐에 등록하여 유지 신호와 결합하여 출력 처리 2. FDC 보고 항목 중 SW 버전 체크 루프 불합리 개선 - 프로그램 시작 시 연동 프로그램 버전 체크 간 실행되지 않는 프로그램이 있는 경우 무한 루프 발생 - 무한 루프로 인한 CPU 점유 상승->루프 중간 Sleep추가 및 코드 간소화 3. 로그 메시지에 시간 ms단위 추가(황만수SM 작업 내역 병합)
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 247 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 234 insertions(+), 13 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index b5f9c71..d9e48c2 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)
{
@@ -665,8 +668,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 +945,9 @@
SetWsiType(-1); //wsi reflow
SetLastPointCheck(FALSE);
+ SetReviewComplete(FALSE);
+ //SetUploadResultFailCount(0);
+
bFileFind = FALSE;
/*< LYW 20211109 - #3662 Delete Start >*/
@@ -1058,7 +1070,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 +1077,6 @@
strGlassIDTemp = pTransferData->strGlassID;
strGlassStepIdTemp = pTransferData->strStepID;
-
strGlassIDTemp = pTransferData->strGlassID;
strcpy(pDitRawClient->GetGlassData()->m_strGlassID, strGlassIDTemp);
@@ -1116,6 +1126,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)
@@ -1692,6 +1706,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 +1753,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 +1762,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 +1801,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"));
@@ -4285,7 +4321,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 +4621,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 +4876,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 +8279,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()
@@ -9286,7 +9469,7 @@
AFM_SetAFMTracking(FALSE);
SetWsiType(0);
- WSIAllReadySignal(0);
+ WSIAllReadySignal(1);
// send wsi start
if(!WSIUserAllStartSignal())
@@ -9517,7 +9700,8 @@
VectorDouble vectorCollisionPosX;
vectorCollisionPosX.clear();
-
+ //WSI
+ pMotorControl->GantrySetTwoGantrySyncModeSend(1);
// WSI result count
for (int nModuleIdx=0; nModuleIdx<Module_GetModuleStatusCount(); nModuleIdx++)
@@ -9561,7 +9745,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 >*/
}
}
@@ -9604,6 +9790,15 @@
vectorPosX.push_back(dDefectPosX);
vectorPosY.push_back(dDefectPosY);
}
+ }
+
+ 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)
@@ -9963,13 +10158,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();
@@ -10468,6 +10665,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