From c08b701c90c8998b241c82638d5c488e03238214 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 23 9월 2021 17:39:47 +0900
Subject: [PATCH] Ongoing100 #3517 CF AOI Review 자가진단 기능 개선
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 44d4659..fd16d92 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -547,6 +547,8 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail Data!"));
}
+ AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence 蹂�寃�
+
SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));
@@ -1256,10 +1258,6 @@
{
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] AlignStart!"));
-
- AlignCamera_CameraControl(CameraControlLive); // 210805 Align Camera Sequence 占쏙옙占쏙옙
- Sleep(300);
-
//#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD START
if (GetSimulationMode() == FALSE)
{
@@ -1267,6 +1265,30 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Start Ack!"));
}
//#3584 210817 LYW CF AOI Review �떆裕щ젅�씠�뀡 湲곕뒫 �젙�긽�솕 MOD END
+
+ //#3561 210908 LYW ADD Start
+ int nAlignReconnectRetryMaxCount = 3;
+ for (int i = 0; i < nAlignReconnectRetryMaxCount; i++)
+ {
+ if (AlignCamera_CameraControl(CameraControlLive) == FALSE)
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[AlignStart] AlignConnect Fail! Reconect Start! ReconnectRetry count = %d"), nAlignReconnectRetryMaxCount + 1);
+ system("netsh interface set interface name = \"Align #1\" admin = disable&& netsh interface set interface name = \"Align #1\" admin = enable&& netsh interface set interface name = \"Align #2\" admin = disable&& netsh interface set interface name = \"Align #2\" admin = enable");
+ Sleep(10000);
+ m_pSP2P->ISP2P_InitAlignCamera();
+ }
+
+ else
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[AlignStart] AlignConnect Success! "));
+ break;
+ }
+
+ }
+ //#3561 210908 LYW ADD End
+
+ Sleep(300);
+
//original
// if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_AlignStartAck_CPJT))
// m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Start Ack!"));
@@ -8800,12 +8822,11 @@
break;
case PCControlRecv_Autodiagnosis:
{
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_START
+ /*< LYW 20210719 : #3517 ADD Start >*/
CSignalControl* pSignalControl = m_pSP2P->ISP2P_GetSignalControl();
CString strDiagnosisMode;
pSignalControl->ReadData(_T("11160"), 2, strDiagnosisMode);
int nDiagnosisMode = atoi(strDiagnosisMode);
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
m_pSP2P->ISP2P_DisplayMessage(_T("[PCControl_Signal] Diagno start => %d, DiagnosisMode => %d"), bSignalOn, nDiagnosisMode);
if (bSignalOn) {
@@ -8815,7 +8836,7 @@
m_pSP2P->ISP2P_GetDiagnosisManager()->RecvSignalToSignalControl(0, nDiagnosisMode);
}
- //#3514_LYW_CF AOI Review 占쌘곤옙占쏙옙占쏙옙 占쏙옙占� 占쏙옙占쏙옙_END
+ /*< LYW 20210719 : #3517 ADD End >*/
else
bResult = SendSignalOffToSignalControl(PCControlSendSignalIndex_DiagnoAck, 0);
--
Gitblit v1.9.3