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/700.Unit/000.Loader/LoaderLiftIn.cs | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/SHARP_CLAS_UI/500.Equipment/700.Unit/000.Loader/LoaderLiftIn.cs b/SHARP_CLAS_UI/500.Equipment/700.Unit/000.Loader/LoaderLiftIn.cs index 6e45a83..b038b69 100644 --- a/SHARP_CLAS_UI/500.Equipment/700.Unit/000.Loader/LoaderLiftIn.cs +++ b/SHARP_CLAS_UI/500.Equipment/700.Unit/000.Loader/LoaderLiftIn.cs @@ -399,6 +399,18 @@ { Alarm_Manager.Instance.Occurred(En_Alarm_List.AL_0120_LD_TRAT_IN_LIFT_Z_POWER_OFF); } + else if (IsLiftInSensor1 || IsLiftInSensor2) + { + Interlock_Manager.Add_Interlock_Msg("Loader Lift In", "Home can't run, Lift in sensor detected."); + } + else if (IsLiftLimitSensor1 || IsLiftLimitSensor2) + { + Interlock_Manager.Add_Interlock_Msg("Loader Lift In", "Home can't run, Lift limit sensor detected."); + } + else if (Clamper.ClampSol) + { + Interlock_Manager.Add_Interlock_Msg("Loader Lift In", "Home can't run, Clamp is clamped "); + } else { _homeStep = LiftHomeSteps.S1100_CONVEYOR_HOME_CHECK; @@ -455,7 +467,22 @@ } else { - _homeStep = LiftHomeSteps.S1300_MOVE_STAY_POSITION; + if (equipment.loader.ConveyorIn.IsLiftInSensor || equipment.loader.ConveyorIn.IsLiftInCompleteSensor) + { + if (equipment.loader.ConveyorIn.IsLiftInSensor) + { + Alarm_Manager.Instance.Occurred(En_Alarm_List.AL_0552_LD_TRAY_IN_CONVEYOR_LIFT_IN_SENSOR_CHECK); + } + + if (equipment.loader.ConveyorIn.IsLiftInCompleteSensor) + { + Alarm_Manager.Instance.Occurred(En_Alarm_List.AL_0553_LD_TRAY_IN_CONVEYOR_LIFT_IN_COMPLETE_SENSOR_CHECK); + } + } + else + { + _homeStep = LiftHomeSteps.S1300_MOVE_STAY_POSITION; + } } break; } -- Gitblit v1.9.3