From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop
---
ReviewSystem/ReviewSystem/ReviewInterface.h | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewInterface.h b/ReviewSystem/ReviewSystem/ReviewInterface.h
index 20ace29..f79ac20 100644
--- a/ReviewSystem/ReviewSystem/ReviewInterface.h
+++ b/ReviewSystem/ReviewSystem/ReviewInterface.h
@@ -47,6 +47,7 @@
#include "DlgReviewPopUp.h"
#include "DlgReviewHistoryTool.h"
#include "DlgHardwareSettingMode.h"
+#include "DlgMotorOffSetTool.h" //< KEJ 20230621 - #4528 ADD >
#include "CHTotalPitchMeasure/TotalPitchMeasure.h"
#include "CHResultFileManager/StringRaw.h"
@@ -57,6 +58,8 @@
#include "DlgDefocusList.h"
#include "M_AutoDiagnosisManager/DiagnosisManager.h"
#include "DlgSelfDiagnosis.h"
+
+#include "FTPUploadParam.h"
typedef std::vector<CMotorCalibrator> VectorMotorCalibrator;
typedef std::vector<CMotorCalibrator>::iterator VectorMotorCalibratorIt;
@@ -109,7 +112,8 @@
public IDiagnosisProcessor2Parent,
public IDialogReviewOffSet2Parent,
public IDialogReviewHistory2Parent,
- public IDialogHardwareSettingMode2Parent
+ public IDialogHardwareSettingMode2Parent,
+ public IDialogMotorOffSet2Parent
{
public:
CReviewInterface(void);
@@ -138,6 +142,7 @@
virtual void IMC2P_GantrySoftWareTrigger(int nIndex, int nGantryIdx, int nTrigger);
virtual void IMC2P_WsiGantrySoftWareTrigger(int nIndex, int nGantryIdx, int nTrigger);
virtual void IMC2P_UpdateWsiMotionEnd(int nIndex, int nGantryIdx);
+ virtual void IMC2P_SendMotorAliveErrorAlram();
virtual BOOL IMC2P_GetUseWsi();
// WSI Controller 2 parent
@@ -149,6 +154,9 @@
virtual void IWC2P_SetWSIAliveCheck();
virtual BOOL IWC2P_GetMeasureInfo(int nModuleIndex, int nPointIndex, short& nLoc, short& nOptic, short& nGray, CString& strCellID);
virtual int IWC2P_GetCurrentStatus(int nModuleIndex, CString& strGlassID, CString& strRecipeID, int& nType);
+ /*< LYW 20220421 - #4086 ADD Start >*/
+ virtual void IWC2P_SetWSIVersion(int nModuleIndex, int nVersion);
+ /*< LYW 20220421 - #4086 ADD End >*/
virtual void IWC2P_SetConnectedStatus(int nModuleIndex, int nConnectStatus);
virtual void IWC2P_RecvMeasureMessage(int nModuleIndex, int nMessageType, int nMessageResult);
virtual void IWC2P_SetMeasureResult(int nModuleIndex, const SWsiResult& measureResut);
@@ -293,7 +301,10 @@
virtual BOOL IDRO2P_GetMotorPos(int nModule,double &dXpos, double &dYpos);
// GetOffSetValue
virtual BOOL GetOffSetValue(int nModule, int nCam, int nScan, double dGlassXPos, double &dXpos, double &dYpos);
-
+ /* < KEJ 20230621 - #4528 ADD Start > */
+ virtual BOOL IDMO2P_GetMotorPos(int nModule, double &dXpos, double &dYpos);
+ virtual BOOL CalcMotorOffSetValue(int nModule, double &dXpos, double &dYpos);
+ /* < KEJ 20230621 - #4528 ADD End > */
virtual BOOL IDRO2P_SetGlassMode(BOOL bMode, int nCamidx, int nScanidx, double nXpos, double nYpos);
virtual BOOL IDRO2P_SetOffsetPram(int nCamIdx, int nScanIdx, BOOL bUse = 0);
@@ -387,6 +398,13 @@
virtual void ISP2P_SetReview00ImageContrast(int n_Value);
virtual void ISP2P_SetReview01ImageContrast(int n_Value);
/*< LYW 20211109 - #3662 ADD End >*/
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ virtual int ISP2P_GetReviewSWVersion();
+ virtual int ISP2P_GetSyncSWVersion();
+ virtual int ISP2P_GetGRMSWVersion();
+ virtual int ISP2P_GetFTPUploaderSWVersion();
+ virtual int ISP2P_GetWSISWVersion(int nModuleIndex);
+ /*< LYW 20220415 - #4086 ADD End >*/
// History result
virtual CGlassResult* ISP2P_GetNewHistoryResult(int& nHistoryResultCount); // new glass result
@@ -523,6 +541,7 @@
virtual void IDL2P_OpenHWSettingTool();
virtual BOOL IDL2P_IsManualProcessMode();
/*< LYW 20211112 - #3708 ADD End >*/
+ virtual void IDL2P_OpenMotorOffSetTool(); //< KEJ 20230621 - #4528 ADD >
// dialog HardwareSettingMode 2 Parent
// review camera
@@ -666,7 +685,16 @@
// setter internal
double GetFreeSpaceOfDrive() const;
- void SetProgramVersion();
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ static void threadSet3rdPartyProgramVersion(void* pArg);
+ void SetReviewProgramVersion();
+ /*< LYW 20220426 - #4086 ADD Start >*/
+ void Start3rdPartyProgram();
+ int StartWindowIDProgram(CString WindowID, CString ProgramPath);
+ void Terminate3rdPartyProgram();
+ void TerminateWindowIDProgram(CString WindowID);
+ /*< LYW 20220426 - #4086 ADD End >*/
+ /*< LYW 20220415 - #4086 ADD End >*/
void ApplySystemSettingValue();
void SetDefaultValue();
@@ -853,6 +881,15 @@
CString m_strProgramVersion; // program version
CProcessTimer m_ProcessTimer; // process timer
SThetaMotorInfo m_sThetaMotorInfo; // theta motor info
+
+ /*< LYW 20220415 - #4086 ADD Start >*/
+ long m_nFDCGRMSWVersion;
+ long m_nFDCFTPUploaderSWVersion;
+ long m_nFDCSyncSWVersion;
+ long m_nFDCReviewSWVersion;
+ long m_nFDCWSISWVersion00;
+ long m_nFDCWSISWVersion01;
+ /*< LYW 20220415 - #4086 ADD End >*/
// multi variable
VectorModuleStatus m_vecModuleStatus; // Review Module Status Vector
--
Gitblit v1.9.3