From ea996431950e6ecff451bd40d1228f51d077475c Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 28 4월 2022 09:22:18 +0900
Subject: [PATCH] Ongoing100 #4086 CF AOI Review FDC SW Version 추가 요청
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 0a45de0..e18344f 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -8055,6 +8055,8 @@
int nFDCFTPUploaderSWVersion = 20200101;
int nFDCSyncSWVersion = 20200101;
int nFDCReviewSWVersion = 20200101;
+ int nFDCWSISWVersion00 = 20200101;
+ int nFDCWSISWVersion01 = 20200101;
/*< LYW 20220415 - #4086 ADD End >*/
//foucs
@@ -8069,6 +8071,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 +8222,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 +9286,7 @@
AFM_SetAFMTracking(FALSE);
SetWsiType(0);
- WSIAllReadySignal(0);
+ WSIAllReadySignal(1);
// send wsi start
if(!WSIUserAllStartSignal())
@@ -9512,7 +9517,8 @@
VectorDouble vectorCollisionPosX;
vectorCollisionPosX.clear();
-
+ //WSI
+ pMotorControl->GantrySetTwoGantrySyncModeSend(1);
// WSI result count
for (int nModuleIdx=0; nModuleIdx<Module_GetModuleStatusCount(); nModuleIdx++)
@@ -9601,6 +9607,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