From 3ce48f6dbeb537e252edb0d62c88a28796e36674 Mon Sep 17 00:00:00 2001
From: SWK <sungwk82@diteam.co.kr>
Date: 월, 26 12월 2022 15:04:42 +0900
Subject: [PATCH] ongoing60 #4403 CF AOI Review TACT 지연 개선 1. 신호 출력 방식 재개선 - 유지 시간이 없는 신호는 바로 출력 진행하도록 변경 2. 불필요 Delay 제거 및 시퀀스 변경 - 얼라인 측정 종료 처리 간 제어 신호 먼저 출력 후 카메라 Stop으로 변경 - 물류 정보 읽기 처리 후 1000ms Delay 삭제 - 얼라인 측정 시작(카메라 Live Start) 후 Delay 300ms -> 100ms(이미지 들어오는 시간 확보 필요) - ReadRawFile 처리 시작 전 500ms Delay 삭제 - Path Scheduling 완료 후 Review Ready 신호 출력 전 1000ms Delay 삭제 3. 버그 수정 - 이미지 저장 경로 생성 간 예외 처리 부분 버그 수정 4. 로그 시간 출력 불합리 개선 - 로그 시간이 파일 출력 시점으로 작성되어 로그 스래드 지연 시 시간이 맞지 않는 불합리 있음 - 로그 시간은 로그 발생 시점에 시간 저장, 해당 시간 이용하여 파일에 기록하도록 변경
---
FTPUploader/FTPUploader/FTPUploaderDlg.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/FTPUploader/FTPUploader/FTPUploaderDlg.cpp b/FTPUploader/FTPUploader/FTPUploaderDlg.cpp
index 2395dbf..6e4f440 100644
--- a/FTPUploader/FTPUploader/FTPUploaderDlg.cpp
+++ b/FTPUploader/FTPUploader/FTPUploaderDlg.cpp
@@ -63,6 +63,7 @@
, m_strHomePath2(_T("/"))
, m_nPort2(21)
, m_bPassiveMode(FALSE)
+ , m_bCheckBDIStackDown(FALSE)
{
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
@@ -107,6 +108,7 @@
DDX_Text(pDX, IDC_EDIT_TIMEOUT3, m_nTimeOut3);
DDX_Text(pDX, IDC_EDIT_HOMEPATH3, m_strHomePath3);
DDX_Control(pDX, IDC_CHECK_WSI, m_chkWSI);
+ DDX_Check(pDX, IDC_CHECK_BDI_STACK_DOWNLOAD, m_bCheckBDIStackDown);
}
BEGIN_MESSAGE_MAP(CFTPUploaderDlg, CDialog)
@@ -131,6 +133,9 @@
ON_COMMAND(ID_FILE_CLOSE, &CFTPUploaderDlg::OnFileClose)
ON_BN_CLICKED(IDC_BUTTON_DOWNLOAD_LIST, &CFTPUploaderDlg::OnBnClickedButtonDownloadList)
ON_BN_CLICKED(IDC_BUTTON_UPLOAD_LIST, &CFTPUploaderDlg::OnBnClickedButtonUploadList)
+ ON_BN_CLICKED(IDC_CHECK_BDI_STACK_DOWNLOAD, &CFTPUploaderDlg::OnBnClickedCheckBdiStackDownload)
+ ON_BN_CLICKED(IDC_CHECK_WSI, &CFTPUploaderDlg::OnBnClickedCheckWsi)
+ ON_BN_CLICKED(IDC_CHECK_PASSIVE_MODE, &CFTPUploaderDlg::OnBnClickedCheckPassiveMode)
END_MESSAGE_MAP()
@@ -195,7 +200,7 @@
if (m_pFTPThreadPool_Down)
{
m_pFTPThreadPool_Down->SetIFTP2P(this);
- m_pFTPThreadPool_Down->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2, strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk);
+ m_pFTPThreadPool_Down->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2, strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk, m_bCheckBDIStackDown);
m_pFTPThreadPool_Down->StartThread();
}
@@ -204,7 +209,7 @@
if (m_pFTPThreadPool_Up)
{
m_pFTPThreadPool_Up->SetIFTP2P(this);
- m_pFTPThreadPool_Up->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2, strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk);
+ m_pFTPThreadPool_Up->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2, strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk, m_bCheckBDIStackDown);
m_pFTPThreadPool_Up->StartThread();
}
@@ -629,8 +634,8 @@
m_bWSIChk = m_chkWSI.GetCheck();
- m_pFTPThreadPool_Down->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2, strIP3, m_strID3, m_strPW3, m_nPort3, m_nTimeOut3, m_strHomePath3, m_bPassiveMode, m_bWSIChk);
- m_pFTPThreadPool_Up->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2,strIP3, m_strID3, m_strPW3, m_nPort3, m_nTimeOut3, m_strHomePath3, m_bPassiveMode, m_bWSIChk);
+ m_pFTPThreadPool_Down->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2, strIP3, m_strID3, m_strPW3, m_nPort3, m_nTimeOut3, m_strHomePath3, m_bPassiveMode, m_bWSIChk, m_bCheckBDIStackDown);
+ m_pFTPThreadPool_Up->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2,strIP3, m_strID3, m_strPW3, m_nPort3, m_nTimeOut3, m_strHomePath3, m_bPassiveMode, m_bWSIChk, m_bCheckBDIStackDown);
CString strTestFile = _T("");
CString strSubFolder = _T("LotHistory");
@@ -988,6 +993,15 @@
m_bWSIChk = _tstoi( (CString)(CStringA)strRegBuf );
+ //BDI Stack Down
+ memset(strRegBuf,0,sizeof(char)*255);
+ if(ReadString(SHCU,KEY_FTP,_T("BDI_STACK_DOWN"),(LPBYTE)strRegBuf,255) == FALSE)
+ {
+ strcpy_s(strRegBuf,sizeof(char)*255,"1");
+ }
+
+ m_bCheckBDIStackDown = _tstoi( (CString)(CStringA)strRegBuf );
+
UpdateData(FALSE);
return TRUE;
}
@@ -1123,6 +1137,10 @@
sprintf_s(strRegBuf, sizeof(char)*255, "%d",m_bWSIChk);
WriteString(SHCU,KEY_FTP,_T("WSI_USE"),strRegBuf);
+ // BDI Stack DownLoad
+ sprintf_s(strRegBuf, sizeof(char)*255, "%d",(int)m_bCheckBDIStackDown);
+ WriteString(SHCU,KEY_FTP,_T("BDI_STACK_DOWN"),strRegBuf);;
+
m_ctlIPAddress.GetAddress(chIP[0],chIP[1],chIP[2],chIP[3]);
CString strIP = _T("");
@@ -1138,8 +1156,8 @@
CString strIP3 = _T("");
strIP3.Format(_T("%d.%d.%d.%d"),chIP[0],chIP[1],chIP[2],chIP[3]);
- m_pFTPThreadPool_Down->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2,strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk);
- m_pFTPThreadPool_Up->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2,strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk);
+ m_pFTPThreadPool_Down->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2,strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk, m_bCheckBDIStackDown);
+ m_pFTPThreadPool_Up->SetConnectionInfo(strIP,m_strID,m_strPW,m_nPort,m_nTimeOut,m_strHomePath,strIP2,m_strID2,m_strPW2,m_nPort2,m_nTimeOut2,m_strHomePath2,strIP3,m_strID3,m_strPW3,m_nPort3,m_nTimeOut3,m_strHomePath3, m_bPassiveMode, m_bWSIChk, m_bCheckBDIStackDown);
if(m_nConfigMode == CM_File)
{
@@ -1489,4 +1507,21 @@
// TODO: 여기에 특수화된 코드를 추가 및/또는 기본 클래스를 호출합니다.
return __super::DestroyWindow();
-}
\ No newline at end of file
+}
+
+void CFTPUploaderDlg::OnBnClickedCheckBdiStackDownload()
+{
+ // TODO: 여기에 컨트롤 알림 처리기 코드를 추가합니다.
+}
+
+
+void CFTPUploaderDlg::OnBnClickedCheckWsi()
+{
+ // TODO: 여기에 컨트롤 알림 처리기 코드를 추가합니다.
+}
+
+
+void CFTPUploaderDlg::OnBnClickedCheckPassiveMode()
+{
+ // TODO: 여기에 컨트롤 알림 처리기 코드를 추가합니다.
+}
--
Gitblit v1.9.3