From c220de6f70051797e9d8b371830d06def9dc9cbd Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 30 6월 2022 11:02:23 +0900
Subject: [PATCH] 검사기 RawMessenger 동기화
---
DitGlassRawMessenger/Extern/DitGlassRawStruct.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/DitGlassRawMessenger/Extern/DitGlassRawStruct.h b/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
index e5f7a55..58cf38c 100644
--- a/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
+++ b/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
@@ -9,6 +9,7 @@
#define RAWMESSENGER_MAXCAMNUM 30
#define RAWMESSENGER_MAXSCANNUM 20
#define RAWMESSENGER_MAXHLINUM 8
+#define RAW_CODE_MAX 10
#define MAX_ZONE_NUM 16
@@ -61,6 +62,11 @@
int m_nGlassSizeWidth;
int m_nGlassSizeHeight;
+ /* <KYH 211129 : #3796 ADD Start> */
+ int m_nDefectNumJudgeND;
+ /* <KYH 211129 : #3796 ADD End> */
+ //DUMY DATA
+ int Dumy_int[9];
//설비정보
char m_strLine[32];
@@ -111,6 +117,9 @@
int m_nDefectNumTypeMD;
int m_nDefectNumTypeCD;
int m_nDefectNumTypeMC;
+ /* <LJC 20220422 : #3957 ADD Start> */
+ int m_nDefectCode[RAW_CODE_MAX];
+ /* <LJC 20220422 : #3957 ADD End> */
int m_nDefectNumJudgeOKWhite;
int m_nDefectNumJudgeOKBlack;
@@ -120,7 +129,9 @@
int m_nDefectNumJudgeRV;
int m_nDefectNumJudgeTR;
int m_nDefectNumJudgePR;
-
+ /*< LHS 20211029 - #3783 MOD Start >*/
+ int m_nDefectNumJudgeLine;
+ /*< LHS 20211029 - #3783 MOD End >*/
int m_nDefectNumStackTD;
int m_nDefectNumStackSD;
int m_nDefectNumStackPD;
@@ -175,7 +186,7 @@
char m_strFlowHistory[2];
char m_strCount1[2];
char m_strCount2[2];
-
+ char m_StrMergeList[10][12];
//Mura Data 0412 nwh
char m_strMaxAvgGray[12];
char m_strMaxPortion[12];
@@ -195,15 +206,26 @@
int m_nStackNum;
BOOL m_bStackRead;
+ /*< KJG 20211024 - #3487 ADD Start >*/
int m_nRawMergeNum;
BOOL m_bRawMergeRead;
+ /*< KJG 20211024 - #3487 ADD End >*/
//210203 CJH - CutOff 대상 결함 수
int m_nCutOffDefectNum;
//210323 CJH - Server/Frame Shrink 정보 추가
char m_strShrinked[6];
//210326 CJH - RAW 입력 Defect 수량 상한 사용여부
BOOL m_bRawCutoff;
+ //210907 KJG - EdgeCrack 검사 사용 유무
+ BOOL m_bEdgeCrackUse;
+ BOOL m_bRawMergeUse;
+ /* < KJG 20220225 - #3850 ADD Start >*/
+ char m_strRawMergeStepID[32];
+ /* < KJG 20220225 - #3850 ADD End >*/
+ /* < KMH 20220614 : #3957 ADD Start > */
+ char m_strRawDefectCode[RAW_CODE_MAX][5]; // 4글자만 표기
+ /* < KMH 20220614 : #3957 ADD End > */
};
struct _grmBlockData
{
@@ -257,6 +279,14 @@
int m_nDefectNumTypeMD;
int m_nDefectNumTypeCD;
int m_nDefectNumTypeMC;
+ /* <KYH 211129 : #3796 ADD Start> */
+ int m_nDefectNumJudgeND;
+ /* <KYH 211129 : #3796 ADD End> */
+ /* <LJC 20220422 : #3957 ADD Start> */
+ int m_nDefectCode[RAW_CODE_MAX];
+ /* <LJC 20220422 : #3957 ADD End> */
+ //DUMY DATA
+ int Dumy_int[9];
//Mura Data nwh 0404
char m_strProImage[32];
@@ -308,7 +338,9 @@
int m_nDefectNumJudgeRV;
int m_nDefectNumJudgeTR;
int m_nDefectNumJudgePR;
-
+ /*< LHS 20211029 - #3783 MOD Start >*/
+ int m_nDefectNumJudgeLine;
+ /*< LHS 20211029 - #3783 MOD End >*/
int m_nReflowResult[8]; // 0: Reflow X 1: Reflow OK 2: Reflow NG
// Filtering된 Stack별 수
@@ -451,6 +483,7 @@
int m_nUMCellY; // 셀 원점 기준 y 좌표
short m_nModelIdx; // 몇 번째 모델인가?
short m_nCellIdx; // 몇번째 셀인가?
+ char m_strCellName[32]; // 셀 이름 /* < KMH 20220609 : #4183 ADD > */
short m_nCellGate; // 셀별 Gate라인(얼라인 보정 전)
short m_nCellData; // 셀별 Data라인(얼라인 보정 전)
short m_nCellGateAlign; // 셀별 Gate라인(얼라인 보정 후)
@@ -512,7 +545,10 @@
int m_nAlignRectTop;
int m_nAlignRectBottom;
int m_nAlignRectRight;
-
+ /*< LHS 20211029 - #3783 MOD Start >*/
+ char m_strLNDefectCode[12];
+ short/*LineDefectType*/ m_LineDefectType;
+ /*< LHS 20211029 - #3783 MOD End >*/
_grmDefectReviewData m_ReviewDefect;
};
@@ -565,7 +601,9 @@
int m_nCellMaxDataNum;
int m_nDefectMaxDataNum;
int m_nStackMaxDataNum;
+ /*< KJG 20211024 - #3487 ADD Start >*/
int m_nRawMergeMaxDataNum;
+ /*< KJG 20211024 - #3487 ADD End >*/
//Char 기준 자료가 있는 시작 위치 [김태현 2018/11/12]
int m_nGlassDataPoint;
@@ -573,14 +611,18 @@
int m_nCellDataPoint;
int m_nDefectDataPoint;
int m_nStackDataPoint;
+ /*< KJG 20211024 - #3487 ADD Start >*/
int m_nRawMergeDataPoint;
+ /*< KJG 20211024 - #3487 ADD End >*/
int m_nSizeOfGlassData;
int m_nSizeOfBlockData;
int m_nSizeOfCellData;
int m_nSizeOfDefectData;
int m_nSizeOfStackData;
+ /*< KJG 20211024 - #3487 ADD Start >*/
int m_nSizeOfRawMergeData;
+ /*< KJG 20211024 - #3487 ADD End >*/
};
struct _grmDitGlassRawInfo : public _grmDitMemInfo, public _grmDitCommand
{
--
Gitblit v1.9.3