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 | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 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 4258669..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
@@ -112,6 +112,22 @@
pauseDisableList.Add(AblationSteps.S5220_SCANNER_MOVE_WAIT);
+ pauseDisableList.Add(AblationSteps.S5320_LASER_ON);
+ pauseDisableList.Add(AblationSteps.S5330_LASER_ON_CHECK);
+ pauseDisableList.Add(AblationSteps.S5340_POWER_MEASUREMENT_START);
+ pauseDisableList.Add(AblationSteps.S5350_POWER_MEASUREMENT);
+ pauseDisableList.Add(AblationSteps.S5360_POWER_MEASUREMENT_END);
+ pauseDisableList.Add(AblationSteps.S5370_LASER_OFF);
+ pauseDisableList.Add(AblationSteps.S5380_LASER_OFF_CHECK);
+
+ pauseDisableList.Add(AblationSteps.S5420_LASER_ON);
+ pauseDisableList.Add(AblationSteps.S5430_LASER_ON_CHECK);
+ pauseDisableList.Add(AblationSteps.S5440_POWER_MEASUREMENT_START);
+ pauseDisableList.Add(AblationSteps.S5450_POWER_MEASUREMENT);
+ pauseDisableList.Add(AblationSteps.S5460_POWER_MEASUREMENT_END);
+ pauseDisableList.Add(AblationSteps.S5470_LASER_OFF);
+ pauseDisableList.Add(AblationSteps.S5480_LASER_OFF_CHECK);
+
MotorX.Check_Jog_Interlock = Jog_Interlock;
MotorX.Check_Move_Interlock = Move_Interlock;
MotorZ.Check_Jog_Interlock = Jog_Interlock;
@@ -240,7 +256,7 @@
if (equipment.equip_mode == En_Equipment_Mode.Pause)
{
- if (pauseDisableList.Contains(Step) == false)
+ if (pauseDisableList.Contains(Step) != false)
{
UnitMode = En_Equipment_Mode.Pause;
return;
@@ -1310,6 +1326,19 @@
private void Seq_Power_Measure()
{
+ //Laser 異쒖궗 �쐞移섏뿉�꽌 Power Meter�쐞移섍� �븘�땺 �븣 Laser off �썑 泥� Step�쑝濡� �씠�룞.
+ if((AblationSteps.S5320_LASER_ON <= Step && Step <= AblationSteps.S5360_POWER_MEASUREMENT_END) ||
+ (AblationSteps.S5420_LASER_ON <= Step && Step <= AblationSteps.S5460_POWER_MEASUREMENT_END))
+ {
+ if (equipment.process.ablation.Get_Is_Position_X_Power_Meter() == false || equipment.process.ablation.Get_Is_Position_Z_Power_Meter() == false)
+ {
+ if (equipment.scanner.Set_Laser_Off())
+ {
+ Step = AblationSteps.S0000_WAIT;
+ }
+ }
+ }
+
switch (Step)
{
case AblationSteps.S5000_AUTO_POWER_START:
@@ -1413,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;
}
@@ -1558,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