From 0b5386e7314cc125c0808deec2d948281f397c0f Mon Sep 17 00:00:00 2001
From: 천호석 <hosuk1418@naver.com>
Date: 화, 01 11월 2022 16:46:12 +0900
Subject: [PATCH] 검사 개조, Measurement 후 Width 검사 불합리 제거.
---
SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Client_AOI.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Client_AOI.cs b/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Client_AOI.cs
index 4dc7cad..f628700 100644
--- a/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Client_AOI.cs
+++ b/SHARP_CLAS_UI/500.Equipment/400.Module/000.Vision/Client_AOI.cs
@@ -354,6 +354,12 @@
sm.Set_Bit(Vision_Address.Measurement_Grab_Ready_Ack, true);
sm.Set_Bit(Vision_Address.Measurement_Grab_Ready_Result, grab_ready_Ack.result == 0 ? false : true);
}
+ else if (grab_ready_Ack.SeqType == (int)En_SeqType.MeasurementWidth)
+ {
+ WriteClientLog($"[Recv]MeasurementWidth Grab Ready, Result : {grab_ready_Ack.result}");
+ sm.Set_Bit(Vision_Address.Measurement_Grab_Ready_Ack, true);
+ sm.Set_Bit(Vision_Address.Measurement_Grab_Ready_Result, grab_ready_Ack.result == 0 ? false : true);
+ }
break;
}
@@ -388,6 +394,12 @@
sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Left_Ack, true);
sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Left_Result, grab_start_Ack.result == 0 ? false : true);
}
+ else if (grab_start_Ack.SeqType == (int)En_SeqType.MeasurementWidth)
+ {
+ WriteClientLog($"[Recv]MeasurementWidth Left Grab Start, Result : {grab_start_Ack.result}");
+ sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Left_Ack, true);
+ sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Left_Result, grab_start_Ack.result == 0 ? false : true);
+ }
}
else if (grab_start_Ack.ModuleIdx == (int)En_Module_Idx.Right)
{
@@ -412,6 +424,12 @@
else if (grab_start_Ack.SeqType == (int)En_SeqType.Measurement)
{
WriteClientLog($"[Recv]Measurement Right Grab Start, Result : {grab_start_Ack.result}");
+ sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Right_Ack, true);
+ sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Right_Result, grab_start_Ack.result == 0 ? false : true);
+ }
+ else if (grab_start_Ack.SeqType == (int)En_SeqType.MeasurementWidth)
+ {
+ WriteClientLog($"[Recv]MeasurementWidth Right Grab Start, Result : {grab_start_Ack.result}");
sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Right_Ack, true);
sm.Set_Bit(Vision_Address.Measurement_Grab_Start_Right_Result, grab_start_Ack.result == 0 ? false : true);
}
@@ -623,12 +641,10 @@
if (measurement_result_Ack.moduleIdx == (int)En_Module_Idx.Left)
{
- WriteClientLog($"[Recv]Width Measurement Left Result, Result : {measurement_result_Ack.measurement_result}, Mark1Width : {measurement_result_Ack.Mark1Width}, Mark2Width : {measurement_result_Ack.Mark2Width}, Mark3Width : {measurement_result_Ack.Mark3Width}, Mark4Width : {measurement_result_Ack.Mark4Width}");
+ WriteClientLog($"[Recv]Width Measurement Left Result, Result : {measurement_result_Ack.measurement_result}, Mark1Width : {measurement_result_Ack.Mark1Width}, Mark2Width : {measurement_result_Ack.Mark2Width}");
sm.Set_Value(Vision_Address.Measurement_Left_Result, measurement_result_Ack.measurement_result);
sm.Set_Value(Vision_Address.Measurement_Left_Mark_1_Point_1, measurement_result_Ack.Mark1Width);
sm.Set_Value(Vision_Address.Measurement_Left_Mark_2_Point_1, measurement_result_Ack.Mark2Width);
- sm.Set_Value(Vision_Address.Measurement_Left_Mark_3_Point_1, measurement_result_Ack.Mark3Width);
- sm.Set_Value(Vision_Address.Measurement_Left_Mark_4_Point_1, measurement_result_Ack.Mark4Width);
sm.Set_Bit(Vision_Address.Measurement_Left_Ack, true);
}
break;
@@ -639,12 +655,10 @@
vision_control.Recv_WidthMeasurement_Result(Recvdata, out measurement_result_Ack);
if (measurement_result_Ack.moduleIdx == (int)En_Module_Idx.Right)
{
- WriteClientLog($"[Recv]Width Measurement Right Result, Result : {measurement_result_Ack.measurement_result}, Mark1Width : {measurement_result_Ack.Mark1Width}, Mark2Width : {measurement_result_Ack.Mark2Width}, Mark3Width : {measurement_result_Ack.Mark3Width}, Mark4Width : {measurement_result_Ack.Mark4Width}");
+ WriteClientLog($"[Recv]Width Measurement Right Result, Result : {measurement_result_Ack.measurement_result}, Mark1Width : {measurement_result_Ack.Mark1Width}, Mark2Width : {measurement_result_Ack.Mark2Width}");
sm.Set_Value(Vision_Address.Measurement_Right_Result, measurement_result_Ack.measurement_result);
sm.Set_Value(Vision_Address.Measurement_Right_Mark_1_Point_1, measurement_result_Ack.Mark1Width);
sm.Set_Value(Vision_Address.Measurement_Right_Mark_2_Point_1, measurement_result_Ack.Mark2Width);
- sm.Set_Value(Vision_Address.Measurement_Right_Mark_3_Point_1, measurement_result_Ack.Mark3Width);
- sm.Set_Value(Vision_Address.Measurement_Right_Mark_4_Point_1, measurement_result_Ack.Mark4Width);
sm.Set_Bit(Vision_Address.Measurement_Right_Ack, true);
}
break;
--
Gitblit v1.9.3