From 4687895283b9424cc0290b83e53d1088afb0b318 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 25 5월 2022 13:58:09 +0900
Subject: [PATCH] Ongoing90 #4161 CF AOI Review Offset ConfigFile BackUp 기능 추가
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 0a45de0..8d8d1e5 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -665,8 +665,12 @@
// 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)
+ {
+ 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);
@@ -8055,6 +8059,8 @@
int nFDCFTPUploaderSWVersion = 20200101;
int nFDCSyncSWVersion = 20200101;
int nFDCReviewSWVersion = 20200101;
+ int nFDCWSISWVersion00 = 20200101;
+ int nFDCWSISWVersion01 = 20200101;
/*< LYW 20220415 - #4086 ADD End >*/
//foucs
@@ -8069,6 +8075,8 @@
nFDCFTPUploaderSWVersion = m_pSP2P->ISP2P_GetFTPUploaderSWVersion();
nFDCSyncSWVersion = m_pSP2P->ISP2P_GetSyncSWVersion();
nFDCReviewSWVersion = m_pSP2P->ISP2P_GetReviewSWVersion();
+ nFDCWSISWVersion00 = m_pSP2P->ISP2P_GetWSISWVersion(0);
+ nFDCWSISWVersion01 = m_pSP2P->ISP2P_GetWSISWVersion(1);
/*< LYW 20220415 - #4086 ADD End >*/
}
/*< LYW 20211109 - #3662 MOD End >*/
@@ -8218,7 +8226,8 @@
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("16140"), sizeof(nFDCWSISWVersion00), (short*)&nFDCWSISWVersion00);
+ pSignalControl->WritePacketData(_T("16144"), sizeof(nFDCWSISWVersion01), (short*)&nFDCWSISWVersion01);
/*< LYW 20220415 - #4086 ADD End >*/
// pSignalControl->WritePacketData(_T("16124"), sizeof(nRev_PC_HDD_CHECK), (short*)&nRev_PC_HDD_CHECK);
@@ -9281,7 +9290,7 @@
AFM_SetAFMTracking(FALSE);
SetWsiType(0);
- WSIAllReadySignal(0);
+ WSIAllReadySignal(1);
// send wsi start
if(!WSIUserAllStartSignal())
@@ -9512,7 +9521,8 @@
VectorDouble vectorCollisionPosX;
vectorCollisionPosX.clear();
-
+ //WSI
+ pMotorControl->GantrySetTwoGantrySyncModeSend(1);
// WSI result count
for (int nModuleIdx=0; nModuleIdx<Module_GetModuleStatusCount(); nModuleIdx++)
@@ -9601,6 +9611,15 @@
}
}
+ 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)
{
g_pLog->DisplayMessage(_T("[GantryAutoGo] Motor IS Not Ready "));
--
Gitblit v1.9.3