Browse Source

PMhomeRoutine add VenusDE chambertype

hecl 1 year ago
parent
commit
df4447c2d2

+ 3 - 0
Venus/Venus_RT/Config/DBModel.sql

@@ -156,6 +156,9 @@ begin
 			and table_name = 'process_data' and column_name = 'recipe_type') 
             then
             ALTER TABLE "process_data" ADD COLUMN "recipe_type" TEXT;
+			ALTER TABLE "process_data"
+			OWNER TO postgres;
+			GRANT SELECT ON TABLE "process_data" TO postgres;
     end if ;
 
 	 ------------------------------------------------------------------------------------------------

+ 5 - 5
Venus/Venus_RT/Devices/JetVenusDEPM.cs

@@ -71,7 +71,7 @@ namespace Venus_RT.Devices
         private readonly IoValve _PVHe1Valve;
         private readonly IoValve _PVHe2Valve;
         private readonly IoValve _GasFinalValve;
-        private readonly IoValve _SoftPumpValve;
+        //private readonly IoValve _SoftPumpValve;
         private readonly IoValve _FastPumpValve;
         private readonly IoValve _TurboPumpPumpingValve;
         private readonly IoValve _TurboPumpPurgeValve;
@@ -171,7 +171,7 @@ namespace Venus_RT.Devices
             _PVHe1Valve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValvePVHe1}");
             _PVHe2Valve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValvePVHe2}");
             _GasFinalValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveGasFinal}");
-            _SoftPumpValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveSoftPump}");
+            //_SoftPumpValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveSoftPump}");
             _FastPumpValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveFastPump}");
             _TurboPumpPumpingValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveTurboPumpPumping}");
             _TurboPumpPurgeValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveTurboPumpPurge}");
@@ -324,7 +324,7 @@ namespace Venus_RT.Devices
                 { ValveType.PVHe3, _PVHe3Valve },
                 { ValveType.PVHe2, _PVHe2Valve },
                 { ValveType.GasFinal,  _GasFinalValve},
-                { ValveType.SoftPump,  _SoftPumpValve},
+                //{ ValveType.SoftPump,  _SoftPumpValve},
                 { ValveType.FastPump,  _FastPumpValve},
                 { ValveType.TurboPumpPumping,  _TurboPumpPumpingValve},
                 { ValveType.TurboPumpPurge,  _TurboPumpPurgeValve},
@@ -378,7 +378,7 @@ namespace Venus_RT.Devices
 
         public override bool IsFastPumpOpened => _FastPumpValve.Status;
 
-        public override bool IsSoftPumpOpened => _SoftPumpValve.Status;
+        public override bool IsSoftPumpOpened { get;  }//_SoftPumpValve.Status
 
         public override bool IsMfc1ValveOpened => _Mfc1Valve.Status;
 
@@ -715,7 +715,7 @@ namespace Venus_RT.Devices
             _PVHe1Valve.TurnValve(false, out _);
             _PVHe2Valve.TurnValve(false, out _);
             _GasFinalValve.TurnValve(false, out _);
-            _SoftPumpValve.TurnValve(false, out _);
+            //_SoftPumpValve.TurnValve(false, out _);
             _FastPumpValve.TurnValve(false, out _);
             _TurboPumpPumpingValve.TurnValve(false, out _);
             _TurboPumpPurgeValve.TurnValve(false, out _);

+ 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 || _chamber.ChamberType == JetChamber.VenusSE)
+            if (_chamber.ChamberType == JetChamber.Venus || _chamber.ChamberType == JetChamber.Kepler2300 || _chamber.ChamberType == JetChamber.VenusSE || _chamber.ChamberType == JetChamber.VenusDE)
             {
                 return _chamber.IsSlitDoorClosed && _chamber.LiftPinPosition == Venus_Core.MovementPosition.Down && _chamber.PVN22ValveIsOpen;