From 58a2c7fa01a617e6de69b85905bb645f08fac656 Mon Sep 17 00:00:00 2001
From: 천호석 <hosuk1418@naver.com>
Date: 화, 06 12월 2022 13:51:35 +0900
Subject: [PATCH]  Auto & Manual 상태 일 때 power meter 측정 위치 및 가공 위치에서만 Laser on 할 수 있도록 Interlock 추가

---
 SHARP_CLAS_UI/500.Equipment/700.Unit/000.Loader/LoaderLiftIn.cs |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 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 129b481..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;
                     }
@@ -1757,6 +1784,7 @@
                             if (IsStayPosition)
                             {
                                 equipment.LoaderInTrayCount = 0;
+                                _trayCount = 0;
 
                                 if (equipment.loader.ConveyorIn.IsLiftInSensor || equipment.loader.ConveyorIn.IsLiftInCompleteSensor)
                                 {

--
Gitblit v1.9.3