add AutoPump before StartJob && AutoUnLoad after JobDone && VCELoad Without PumpDown

Venus/Venus_RT/Config/System_VenusDE.sccfg

@@ -24,6 +24,8 @@
 		<config default="false" name="EnableDeviceLog" nameView="" description="" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="false" name="IsEnableEthercat" nameView="Is Enable Ethercat" description="是否开启凌华Ethercat" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		<config default="90" name="LogsSaveDays" description="Log文件保留天数" max="365" min="10" paramter="" tag="" unit="" type="Integer" />
+		<config default="false" name="IsAutoUnload" nameView="" description="" max="" min="" paramter="" tag="" unit="" type="Bool" />
+		<config default="false" name="IsPumpBeforeJob" nameView="" description="" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="VenusSE" name="Name" nameView="Name" description="Name" tag="" unit="" type="String" />
 
 		<configs name="SetUp" nameView="Set Up" visible="false">

Venus/Venus_RT/Config/System_VenusSE.sccfg

@@ -24,6 +24,8 @@
 		<config default="false" name="EnableDeviceLog" nameView="" description="" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="false" name="IsEnableEthercat" nameView="Is Enable Ethercat" description="是否开启凌华Ethercat" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		<config default="90" name="LogsSaveDays" description="Log文件保留天数" max="365" min="10" paramter="" tag="" unit="" type="Integer" />
+		<config default="false" name="IsAutoUnload" nameView="" description="" max="" min="" paramter="" tag="" unit="" type="Bool" />
+		<config default="false" name="IsPumpBeforeJob" nameView="" description="" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="VenusSE" name="Name" nameView="Name" description="Name" tag="" unit="" type="String" />
 
 		<configs name="SetUp" nameView="Set Up" visible="false">

Venus/Venus_RT/Modules/TM/VenusEntity/SEMFPickRoutine.cs

@@ -175,7 +175,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
         {
             //if (ModuleHelper.IsAligner(_targetModule) && Singleton<RouteManager>.Instance.IsAutoRunning)
             //{
-            //    Runner.Wait(PickStep.seWaitModuleReady, CheckModuleReady, _delay_60s)
+            //    Runner.Wait(PickStep.seWaitModuleReady, CheckModuleReady, 10 * 60 * 1000)
             //          .Run(PickStep.sePrepareModule, PrepareModule, CheckModuleReady)
             //          .LoopStart(PickStep.sePALoopStart, "PA Loop Pick", 2, QueryOffset, Aligner1IsIdle, _pickingTimeout)
             //          .LoopRunIf(PickStep.sePALoopPick,  _vpa.IsOverRange, Picking, WaitPickDone, _pickingTimeout)
@@ -187,7 +187,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
             //}
             //else
             {
-                Runner.Wait(PickStep.seWaitModuleReady, CheckModuleReady, _delay_60s)
+                Runner.Wait(PickStep.seWaitModuleReady, CheckModuleReady, 10 * 60 * 1000)
                       .Run(PickStep.sePrepareModule, PrepareModule, CheckModuleReady)
                       .RunIf(PickStep.seDoorOpen, ModuleHelper.IsLoadPort(_targetModule), VCEDoorOpen, CheckVCEDoorOpen)
                       .RunIf(PickStep.sePAQuery, ModuleHelper.IsAligner(_targetModule), QueryOffset, Aligner1IsIdle, _pickingTimeout)

Venus/Venus_RT/Modules/TM/VenusEntity/SEMFSwapRoutine.cs

@@ -106,7 +106,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
 
         public RState Monitor()
         {
-            Runner.Wait(SwapStep.WaitModuleReady,               () => _vceModule.IsIdle,            _delay_60s)
+            Runner.Wait(SwapStep.WaitModuleReady,               () => _vceModule.IsIdle,            10*60*1000)
                 .RunIf(SwapStep.SEDoorOpen,                     ModuleHelper.IsLoadPort(_targetModule), VCEDoorOpen,        CheckVCEDoorOpen)
                 .LoopStart(SwapStep.VCEGoto,                    loopName(),                         _actionList.Count,      VCEGoto,         VCEGoReady)
                 .LoopRun(SwapStep.CheckStatus,                  CheckStatus,                        CheckSlotOk,            _delay_10s)

Venus/Venus_RT/Modules/VCE/LoadRoutine.cs

@@ -38,6 +38,7 @@ namespace Venus_RT.Modules.VCE
         int _timeout;
         SEMFPumpRoutine pumpRoutine;
         bool _isATMMode = false;
+        bool _NeedPump = true; //判定是否需要pump以及打开内门
 
         public LoadRoutine(ModuleName module, VCEModuleBase vce) : base(module)
         {
@@ -55,12 +56,14 @@ namespace Venus_RT.Modules.VCE
 
             pumpRoutine = new SEMFPumpRoutine(_tm, module);
             _isATMMode = SC.GetValue<bool>("System.IsATMMode");
+            _NeedPump = !SC.GetValue<bool>("System.IsPumpBeforeJob");
         }
 
         public RState Start(params object[] objs)
         {
 
             _timeout = SC.GetValue<int>($"{Module}.MotionTimeout") *1000;
+
             //if vce inner door not close cannot do it as it will pump
 
             if (!Singleton<RouteManager>.Instance.seTM.IsVCESlitDoorClosed(Module))
@@ -75,11 +78,11 @@ namespace Venus_RT.Modules.VCE
         public RState Monitor()
         {
             Runner.Run(LoadStep.CloseOutDoor,       CloseOutDoor,       CheckVceIdle,        _timeout)
-                  .Run(LoadStep.GotoLP,             _vce.GotoLP,        CheckVceIdle,       _timeout)
-                  .Run(LoadStep.VcePumpDown,        VCEPumpDown,           CheckPumpOver)
+                  .Run(LoadStep.GotoLP,             _vce.GotoLP,        CheckVceIdle,        _timeout)
+                  .RunIf(LoadStep.VcePumpDown,      _NeedPump,          VCEPumpDown,         CheckPumpOver)
                   .Run(LoadStep.Mapping,            Mapping,            CheckVceIdle,        25 *1000)
                   .Run(LoadStep.ReadMap,            ReadMap,            CheckVceIdle,        _timeout)
-                  .Run(LoadStep.OpenInnerDoor,      OpenInnerDoor,      CheckInnerDoorOpen)
+                  .RunIf(LoadStep.OpenInnerDoor,    _NeedPump,          OpenInnerDoor,       CheckInnerDoorOpen)
                   .End(LoadStep.NotifyOver,         NullFun,            100);
             return Runner.Status;
         }

Venus/Venus_RT/Modules/VCE/LoadWithSMIFRoutine.cs

@@ -43,6 +43,7 @@ namespace Venus_RT.Modules.VCE
         private int _VceMotionTimeout;
         private int _SMIFMotionTimeout;
         private SEMFPumpRoutine pumpRoutine;
+        private bool _NeedPump = true;
 
         public LoadWithSMIFRoutine(ModuleName module, VCEModuleBase vce, ISMIF smif) : base(module)
         {
@@ -59,6 +60,7 @@ namespace Venus_RT.Modules.VCE
                     break;
             }
             pumpRoutine = new SEMFPumpRoutine(_tm, module);
+            _NeedPump = !SC.GetValue<bool>("System.IsPumpBeforeJob");
         }
 
 
@@ -90,10 +92,10 @@ namespace Venus_RT.Modules.VCE
                 .Run(LoadWithSMIFStep.VceOuterDoorOpen, VceOuterDoorOpen,   CheckVceOuterDoorOpenDone,      _VceMotionTimeout)
                 .Run(LoadWithSMIFStep.SMIFLoad,         SMIFLoad,           CheckSMIFLoadDone,              _SMIFMotionTimeout)
                 .Run(LoadWithSMIFStep.CloseOutDoor,     CloseOutDoor,       CheckVceIdle,                   _VceMotionTimeout)
+                .RunIf(LoadWithSMIFStep.VcePumpDown,    _NeedPump,          PumpDown,                       CheckPumpOver,                  2*60*1000)
                 .Run(LoadWithSMIFStep.Mapping,          Mapping,            CheckVceIdle,                   _VceMotionTimeout)
                 .Run(LoadWithSMIFStep.ReadMap,          ReadMap,            CheckVceIdle,                   _VceMotionTimeout)
-                .Run(LoadWithSMIFStep.VcePumpDown,      PumpDown,           CheckPumpOver,                  2*60*1000)
-                .Run(LoadWithSMIFStep.OpenInnerDoor,    OpenInnerDoor,      CheckInnerDoorOpen,             _VceMotionTimeout)
+                .RunIf(LoadWithSMIFStep.OpenInnerDoor,  _NeedPump,          OpenInnerDoor,                  CheckInnerDoorOpen,             _VceMotionTimeout)
                 .End(LoadWithSMIFStep.NotifyOver,       NullFun,                                            100);
             return Runner.Status;
         }

Venus/Venus_RT/Modules/VenusDispatcher.cs

@@ -26,6 +26,7 @@ using Venus_RT.Scheduler;
 using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robot;
 using Venus_RT.Modules.TM.VenusEntity;
 using System.Threading.Tasks;
+using Venus_RT.Modules.VCE;
 
 namespace Venus_RT.Modules
 {
@@ -782,6 +783,8 @@ namespace Venus_RT.Modules
         private int _cycledWafer = 0;
         private float _throughput = 0.0f;
 
+        private bool _IsPumpBeforeSequence = false; //是否需要自动pump
+        private bool _VceAutoUnLoad = false; //是否需要job完自动unload
 
         private int _tmRobotSingleArmOption = 0;
         private Dictionary<ModuleName, int> _lpCycleWafer = new Dictionary<ModuleName, int>() { { ModuleName.LP1, 0 },{ ModuleName.LP2, 0 }, { ModuleName.LP3, 0 } };
@@ -829,6 +832,9 @@ namespace Venus_RT.Modules
 
 
             DATA.Subscribe("Scheduler.CurrentRecipeList", () => _lstProcessJobs);
+
+            _IsPumpBeforeSequence = SC.GetValue<bool>("System.IsPumpBeforeJob");
+            _VceAutoUnLoad        = SC.GetValue<bool>("System.IsAutoUnload");
         }
 
         #region public interface
@@ -1245,6 +1251,12 @@ namespace Venus_RT.Modules
             }
 
             _cycleState = RState.Running;
+
+            if (_IsPumpBeforeSequence)
+            {
+                Singleton<RouteManager>.Instance.GetVCE(VCE2LP.QueryLP2VCE(ModuleHelper.Converter(cj.Module))).PostMsg(VceMSG.Pump);
+            }
+
             return true;
         }
         public RState Monitor()
@@ -2299,7 +2311,11 @@ namespace Venus_RT.Modules
                 _dbCallback.LotFinished(cj);
 
                 if (_lpCycleCount[lp] >= cj.CycleNumber - 1 || !_isCycleMode)
+                {
                     (Singleton<TransferModule>.Instance.GetScheduler(lp) as SchedulerLoadPort).NoteJobComplete();
+                    if(_VceAutoUnLoad)
+                        Singleton<RouteManager>.Instance.GetVCE(VCE2LP.QueryLP2VCE(ModuleHelper.Converter(cj.Module))).PostMsg(VceMSG.SafeUnload);
+                }
 
                 _lpCycleCount[lp]++;
                 lpCycleWafer = _lpCycleCount[lp] * cj.LotWafers.Count;