From 662be16e087b11027318938dc840445b5dbacc27 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 10 6월 2022 13:44:44 +0900
Subject: [PATCH] Ongoing90 #4185 CF AOI Review OneGantryMode 개선
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 8d8d1e5..736acff 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -1120,6 +1120,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)
@@ -4289,7 +4293,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 >*/
}
}
@@ -4587,7 +4593,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 >*/
}
}
@@ -4840,7 +4848,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 >*/
}
}
@@ -9566,7 +9576,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 >*/
}
}
@@ -9977,13 +9989,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();
@@ -10482,6 +10496,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