Ongoing90 #4086 CF AOI Review FDC SW Version 추가 요청

LYW

2022-04-15 8ede40e3f7cfe1772ef7db2b1d74e905639cf343

 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,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))
@@ -1685,15 +1706,27 @@
      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();
//       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) 
   {
@@ -1719,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);
@@ -1754,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++)
@@ -3630,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 "));
}
@@ -4670,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!!"));
@@ -7631,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;
@@ -7720,6 +7771,9 @@
   pSignalControl->WritePacketData(_T("16136"), sizeof(nReviewVersion), (short*)&nReviewVersion);
   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;
@@ -7996,31 +8050,52 @@
   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;
   /*< LYW 20220415 - #4086 ADD End >*/

   //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;
      nRev_Cam1_Image_Contrast = m_pSP2P->ISP2P_GetReview00ImageContrast() * 1000;
      nRev_Cam2_Image_Contrast = m_pSP2P->ISP2P_GetReview01ImageContrast() * 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;
      }
      /*< 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();
      /*< LYW 20220415 - #4086 ADD End >*/
   }
   /*< 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;
//       }
//    }



@@ -8138,13 +8213,21 @@
   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("16136"), sizeof(nReviewVersion), (short*)&nReviewVersion);
   pSignalControl->WritePacketData(_T("16140"), sizeof(nWSI00Version), (short*)&nWSI00Version);
   pSignalControl->WritePacketData(_T("16144"), sizeof(nWSI01Version), (short*)&nWSI01Version);
   /*< LYW 20220415 - #4086 ADD End >*/

//    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;
@@ -8646,8 +8729,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!"));