From 706896efd6b2ec43ce3cdd948aca85ef36f93ed7 Mon Sep 17 00:00:00 2001
From: 천호석 <hosuk1418@naver.com>
Date: 화, 06 12월 2022 13:50:57 +0900
Subject: [PATCH] Auto power 측정 중 Laser On 상태에서 power meter 측정 위치가 아닐 시 Laser off후 sequence step 초기화.
---
SHARP_CLAS_UI/500.Equipment/700.Unit/200.Process/Ablation.cs | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/SHARP_CLAS_UI/500.Equipment/700.Unit/200.Process/Ablation.cs b/SHARP_CLAS_UI/500.Equipment/700.Unit/200.Process/Ablation.cs
index 1887d96..8ff9474 100644
--- a/SHARP_CLAS_UI/500.Equipment/700.Unit/200.Process/Ablation.cs
+++ b/SHARP_CLAS_UI/500.Equipment/700.Unit/200.Process/Ablation.cs
@@ -1442,10 +1442,20 @@
}
case AblationSteps.S5320_LASER_ON:
{
- if (equipment.scanner.Set_Laser_On())
+ if (equipment.process.ablation.MotorX.MotionComplete && equipment.process.ablation.MotorZ.MotionComplete)
{
- auto_power_view.Add_Info($"Laser On.");
- Step = AblationSteps.S5330_LASER_ON_CHECK;
+ if (equipment.process.ablation.Get_Is_Position_X_Power_Meter() && equipment.process.ablation.Get_Is_Position_Z_Power_Meter())
+ {
+ if (equipment.scanner.Set_Laser_On())
+ {
+ auto_power_view.Add_Info($"Laser On.");
+ Step = AblationSteps.S5330_LASER_ON_CHECK;
+ }
+ }
+ else
+ {
+ Step = AblationSteps.S0000_WAIT;
+ }
}
break;
}
@@ -1587,9 +1597,20 @@
}
case AblationSteps.S5420_LASER_ON:
{
- if (equipment.scanner.Set_Laser_On())
+ if (equipment.process.ablation.MotorX.MotionComplete && equipment.process.ablation.MotorZ.MotionComplete)
{
- Step = AblationSteps.S5430_LASER_ON_CHECK;
+ if (equipment.process.ablation.Get_Is_Position_X_Power_Meter() && equipment.process.ablation.Get_Is_Position_Z_Power_Meter())
+ {
+ if (equipment.scanner.Set_Laser_On())
+ {
+ auto_power_view.Add_Info($"Laser On.");
+ Step = AblationSteps.S5430_LASER_ON_CHECK;
+ }
+ }
+ else
+ {
+ Step = AblationSteps.S0000_WAIT;
+ }
}
break;
}
--
Gitblit v1.9.3