Merge remote-tracking branch 'origin/develop' into feature/#3417_CF_AOI_Rev...

LYW

2021-06-09 754fa0614469b76fcd789a4f50f9bee59aa09e9b

Merge remote-tracking branch 'origin/develop' into feature/#3417_CF_AOI_Review_전설비_Log_Process개선

 DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp

@@ -207,6 +207,8 @@

    strcpy(pData->GetGlassData()->m_strPath, LOCAL_AOIRAWBIN_PATH);

    pData->GetGlassData()->m_tmReviewLoading = m_tmReviewStart;

    return TRUE;
}

@@ -216,6 +218,7 @@
    m_bReviewEndCheck = TRUE;
    m_tmReviewEnd = m_tmReviewStart = CTime::GetCurrentTime();
    m_tmFileCreateTime = CTime::GetCurrentTime();
    pData->GetGlassData()->m_tmReviewEnd = m_tmReviewEnd;
    
    //여기에서 라인별로 파일명, 혹은 Path 위치 결정하면됨. AOIServer 혹은 ReviewServer에서 안해도됨 [김태현2019/9/4]
    pData->GetGlassData()->m_strFileName;
@@ -767,10 +770,17 @@
    {
        SPRINTRAW(16, "*");
    }
    else
    else if(strlen(pGlassData->m_strRecipeName) <= 16)
    {
        SPRINTRAW(16, "%s", pGlassData->m_strRecipeName);
    }
    else if (strlen(pGlassData->m_strRecipeName) > 16)
    {
        CString temp = pGlassData->m_strRecipeName;  // 레시피 17자리 넘어가면 DCOLL 발생으로 예외처리 [ 21-06-02 KJG ]
        temp = temp.Left(16);		
        SPRINTRAW(16, "%s", temp.GetBuffer(0));
    }

    // 52    12    SHRINK        // Server or Frame Shrink 동작 여부
    if (strlen(pGlassData->m_strShrinked) == 0)
    {

 ReviewSystem/M_AutoDiagnosisManager/DiagnosisProcessor.cpp

@@ -116,7 +116,7 @@

    Sleep(2000);

    //0412 kyh 자가진단 Judge판정
    //#3407 KYH 자가진단 Judge 판정 및 알람 발생 기능 ADD START
    for (int i = 0; i < 2; i++)
    {
        int nSelModuleIndex = i;
@@ -141,7 +141,6 @@

        CString strMessage = _T("");

        //0412 kyh Judge 값에 따른 알람 발생
        double dDate = (90 - pProcessResult->GetGantryDegree());
        if (abs(dDate) >= abs(pSettingInfo->GetJudgeData_Degree())) // 0412 kyh 직각도에서 나온 Dgree 값이 설정한 Judge 값보다 크거나 같을경우
        {
@@ -158,6 +157,7 @@
            m_pDP2P->IDP2P_DisplayMessage(0, strMessage);
        }
    }
    //#3407 KYH 자가진단 Judge 판정 및 알람 발생 기능 ADD END

    //컴플릿트 신호 보내기
    m_pDP2P->IDP2P_DiagnosisSendCompleteSig();

 ReviewSystem/ReviewSystem/ReviewInterface.cpp

@@ -3679,6 +3679,7 @@
    //return pAFMControl->MoveToHomePosition(nHomePosition);
}

//#3407 KYH 자가진단 Judge 판정 및 알람 발생 기능 ADD START
BOOL CReviewInterface::IDP2P_DiagnosisSendJudgeAlarm() // 0412 자가진단 JudgeAlarm 추가
{

@@ -3686,6 +3687,7 @@

    //return pAFMControl->MoveToHomePosition(nHomePosition);
}
//#3407 KYH 자가진단 Judge 판정 및 알람 발생 기능 ADD END

BOOL CReviewInterface::IDP2P_SetDlgFlatness(int nIndex)
{

 ReviewSystem/ReviewSystem/ReviewInterface.h

@@ -218,7 +218,10 @@
    virtual BOOL IDP2P_GetAFMZPosition(int nModuleIdx, double& dValue);
    virtual BOOL IDP2P_AFMHomePosition(int nModuleIndex);
    virtual BOOL IDP2P_DiagnosisSendCompleteSig();

    //#3407 KYH 자가진단 Judge 판정 및 알람 발생 기능 ADD START
    virtual BOOL IDP2P_DiagnosisSendJudgeAlarm(); //0412 자가진단 코드추가
    //#3407 KYH 자가진단 Judge 판정 및 알람 발생 기능 ADD END

    // wsi
    virtual void IDP2P_SetWsiManualMeasure(int nModuleIdx,double dPosX, double dPosY);

 ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp

@@ -7987,8 +7987,6 @@
    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);