From 217577e6cb9262757f709de89d97582a1fe1e5e5 Mon Sep 17 00:00:00 2001 From: 천호석 <hosuk1418@naver.com> Date: 금, 16 12월 2022 08:37:38 +0900 Subject: [PATCH] 1. Laser on Interlock에 Power meter 위치 추가 2. Auto power 측정중 pause시 자동 종료 추가. --- SHARP_CLAS_UI/500.Equipment/400.Module/200.Scanner/Scanner.cs | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/SHARP_CLAS_UI/500.Equipment/400.Module/200.Scanner/Scanner.cs b/SHARP_CLAS_UI/500.Equipment/400.Module/200.Scanner/Scanner.cs index fe58a8b..14f048f 100644 --- a/SHARP_CLAS_UI/500.Equipment/400.Module/200.Scanner/Scanner.cs +++ b/SHARP_CLAS_UI/500.Equipment/400.Module/200.Scanner/Scanner.cs @@ -187,6 +187,7 @@ isInPosition |= (scannerA2Position - 10 <= scannerPosition && scannerPosition <= scannerA2Position + 10) && (stageA2Position - 10 <= stageAPosition && stageAPosition <= stageA2Position + 10); isInPosition |= (scannerB1Position - 10 <= scannerPosition && scannerPosition <= scannerB1Position + 10) && (stageB1Position - 10 <= stageBPosition && stageBPosition <= stageB1Position + 10); isInPosition |= (scannerB2Position - 10 <= scannerPosition && scannerPosition <= scannerB2Position + 10) && (stageB2Position - 10 <= stageBPosition && stageBPosition <= stageB2Position + 10); + isInPosition |= _equip.process.ablation.Get_Is_Position_X_Power_Meter() && _equip.process.ablation.Get_Is_Position_Z_Power_Meter(); } else { -- Gitblit v1.9.3