Browse Source

fix bug in SE PM SetSlitDoor && add deal with SE PM Home

zhouhr 1 year ago
parent
commit
24f1f52056

+ 10 - 10
Venus/Venus_RT/Devices/JetVenusSEPM.cs

@@ -846,15 +846,15 @@ namespace Venus_RT.Devices
         {
             SetLiftPin(MovementPosition.Down, out _);
             //转交TM
-            //if (!_PM_SlitDoor_Closed.Value)
-            //{
-            //    SetSlitDoor(true, out _);
-            //}
-            //else
-            //{
-            //    SetSlitDoor(false, out _);
-            //}
-            //
+            if (!IsSlitDoorClosed)
+            {
+                SetSlitDoor(true, out _);
+            }
+            else
+            {
+                SetSlitDoor(false, out _);
+            }
+            
             //SetSlitDoor(false, out _);
             OpenValve(ValveType.PVN22, true);
         }
@@ -980,7 +980,7 @@ namespace Venus_RT.Devices
         public override bool SetSlitDoor(bool open, out string reason)
         {
             reason = string.Empty;
-            OP.DoOperation($"{Module}.SetSlitDoor",Module,open);
+            OP.DoOperation($"{ModuleName.SETM}.SetSlitDoor",Module,open);
             return true;
         }
 

+ 1 - 1
Venus/Venus_RT/Modules/PMs/PMHomeRoutine.cs

@@ -44,7 +44,7 @@ namespace Venus_RT.Modules.PMs
 
         private bool IsHomed()
         {
-            if (_chamber.ChamberType == JetChamber.Venus || _chamber.ChamberType == JetChamber.Kepler2300)
+            if (_chamber.ChamberType == JetChamber.Venus || _chamber.ChamberType == JetChamber.Kepler2300 || _chamber.ChamberType == JetChamber.VenusSE)
             {
                 return _chamber.IsSlitDoorClosed && _chamber.LiftPinPosition == Venus_Core.MovementPosition.Down && _chamber.PVN22ValveIsOpen;
 

+ 2 - 2
Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -188,14 +188,14 @@ namespace Venus_Simulator.Instances
                     IO.DI[$"{mod}.DI_ESC_Coolant_Flow_SW"].Value = true;
                     IO.DI[$"{mod}.DI_Water_Leak_Sensor"].Value = true;
 
+                    IO.DI[$"{mod}.DI_CDA_Pressure_Switch"].Value = true;
                     IO.DI[$"{mod}.DI_Lift_Pin_Up_POS"].Value = false;
                     IO.DI[$"{mod}.DI_Lift_Pin_Down_POS"].Value = true;
                     //IO.DI[$"{mod}.DI_RF_Generator_Interlock"].Value = true;
                     //IO.DI[$"{mod}.DI_Source_RF_Fan"].Value = true;
 
                     IO.DI[$"{mod}.DI_RF_HV_Interlock_OK"].Value = true;
-                    IO.DI[$"{mod}.DI_Turbo_Pump_Interlock"].Value = false;
-                    IO.DI[$"{mod}.DI_CDA_Pressure_Switch"].Value = false;
+                    IO.DI[$"{mod}.DI_Turbo_Pump_Interlock"].Value = true;
                     IO.DI[$"{mod}.DI_Coolant_Inlet_TC_Broken_Alarm"].Value = false;
 
                     IO.DI[$"{mod}.DI_Coolant_Outlet_TC_Broken_Alarm"].Value = false;