From 58a2c7fa01a617e6de69b85905bb645f08fac656 Mon Sep 17 00:00:00 2001
From: 천호석 <hosuk1418@naver.com>
Date: 화, 06 12월 2022 13:51:35 +0900
Subject: [PATCH] Auto & Manual 상태 일 때 power meter 측정 위치 및 가공 위치에서만 Laser on 할 수 있도록 Interlock 추가
---
SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Vision_Control.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Vision_Control.cs b/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Vision_Control.cs
index d948f7d..48d1ebe 100644
--- a/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Vision_Control.cs
+++ b/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Vision_Control.cs
@@ -482,6 +482,8 @@
byte[] MeasureResult = new byte[4]; //0 : Fail, 1 : Success
byte[] Mark1Width = new byte[8]; //Mark1�쓽 �꼻�씠
byte[] Mark2Width = new byte[8]; //Mark2�쓽 �꼻�씠
+ byte[] Mark3Width = new byte[8]; //Mark1�쓽 �꼻�씠
+ byte[] Mark4Width = new byte[8]; //Mark2�쓽 �꼻�씠
int copylength = 0;
Array.Copy(Recvdata, size, size.Length);
@@ -498,14 +500,20 @@
copylength += Mark1Width.Length;
Array.Copy(Recvdata, copylength, Mark2Width, 0, Mark2Width.Length);
copylength += Mark2Width.Length;
+ Array.Copy(Recvdata, copylength, Mark3Width, 0, Mark3Width.Length);
+ copylength += Mark3Width.Length;
+ Array.Copy(Recvdata, copylength, Mark4Width, 0, Mark4Width.Length);
+ copylength += Mark4Width.Length;
int Result_MsgIndex = BitConverter.ToInt32(MsgIndex, 0);
int Result_ModuleIdx = BitConverter.ToInt32(ModuleIdx, 0);
int Result_MeasureResult = BitConverter.ToInt32(MeasureResult, 0);
double Result_Mark1Width = BitConverter.ToDouble(Mark1Width, 0);
double Result_Mark2Width = BitConverter.ToDouble(Mark2Width, 0);
+ double Result_Mark3Width = BitConverter.ToDouble(Mark3Width, 0);
+ double Result_Mark4Width = BitConverter.ToDouble(Mark4Width, 0);
- Ack = new WidthMeasurementResultAck(Result_MsgIndex, Result_ModuleIdx, Result_MeasureResult, Result_Mark1Width, Result_Mark2Width);
+ Ack = new WidthMeasurementResultAck(Result_MsgIndex, Result_ModuleIdx, Result_MeasureResult, Result_Mark1Width, Result_Mark2Width, Result_Mark3Width, Result_Mark4Width);
}
public void Recv_Fine_Align_Result(byte[] Recvdata, out FineAlignResultAck Ack)
--
Gitblit v1.9.3