Browse Source

update vertical wait matcher

chenkui 1 week ago
parent
commit
2847543692

+ 1 - 1
PunkHPX8_RT/Modules/PlatingCell/PlatingCellVerticalInitializeRoutine.cs

@@ -84,7 +84,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
                     LOG.WriteLog(eEvent.ERR_PLATINGCELL, Module, "Vertical is not Home,Home vertical first");
                     return false;
                 }
-                return _verticalAxis.PositionStation("Load", true);
+                return _verticalAxis.PositionStation("Load");
 
             }
             else

+ 1 - 1
PunkHPX8_RT/Modules/PlatingCell/PlatingCellVerticalPositionRoutine.cs

@@ -113,6 +113,7 @@ namespace PunkHPX8_RT.Modules.PlatingCell
             }
             else
             {
+                //dummy reclaim/rinse/dry与生产片一致
                 if (secondCurrentStep.StartsWith("Reclaim") || secondCurrentStep.StartsWith("Rinse") || secondCurrentStep.StartsWith("Dry"))
                 {
                     return firstCurrentStep==secondCurrentStep;
@@ -122,7 +123,6 @@ namespace PunkHPX8_RT.Modules.PlatingCell
                     return true;
                 }
             }
-            return true;
         }
         /// <summary>
         /// vertical 运动到位置

+ 1 - 1
PunkHPX8_RT/Modules/SRD/SRDHomeRoutine.cs

@@ -66,7 +66,7 @@ namespace PunkHPX8_RT.Modules.Transporter
                 .WaitWithStopCondition(HomeAllStep.CheckDoorClosed, () => CommonFunction.CheckRoutineEndState(_doorCloseRoutine), () => CommonFunction.CheckRoutineStopState(_doorCloseRoutine))                
                 .Run(HomeAllStep.HomeSRDRotation, RotationAxisHome,_delay_1ms)
                 .WaitWithStopCondition(HomeAllStep.CheckRotationHome, () => { return _rotationAxis.IsHomed && _rotationAxis.Status == RState.End; }, () => { return _rotationAxis.Status == RState.Failed; })               
-                .Run(HomeAllStep.RotationHome, () => { return _rotationAxis.PositionStation("Home",true); }, NullFun, 100)
+                .Run(HomeAllStep.RotationHome, () => { return _rotationAxis.PositionStation("Home",0,true); }, NullFun, 100)
                 .WaitWithStopCondition(HomeAllStep.RotationHomeWait, () => { return _rotationAxis.Status == RState.End; }, () => { return _rotationAxis.Status == RState.Failed; })
                 .Run(HomeAllStep.LiftUpOn, LiftUpOn, CheckLiftUpOnEndStatus, CheckLiftUpOnStopStatus)
                 //.Run(HomeAllStep.FlippersOut100, () => { return FlippersOut(100); }, CheckFlippersOutEndStatus, CheckFlippersOutStopStatus)

+ 4 - 0
PunkHPX8_RT/Schedulers/PlatingCell/SchedulerPlatingCell.cs

@@ -128,6 +128,10 @@ namespace PunkHPX8_RT.Schedulers.Srd
                 reason = $"{matcher} has no matcher";
                 return false;
             }
+            if (!matcherEntity.IsAuto)
+            {
+                return true;
+            }
             if (WaferManager.Instance.CheckNoWafer(matcher, 0))
             {
                 reason = $"{matcher} has no wafer";