Browse Source

update srd CHUCK_VACUUM

chenkui 14 hours ago
parent
commit
4740388dae

+ 1 - 23
Framework/Common/Routine/RoutineRunner.cs

@@ -1116,7 +1116,7 @@ namespace MECF.Framework.Common.Routine
 
         protected void Notify(string message)
         {
-            LOG.WriteLog(eEvent.EV_ROUTINE_NOTIFY, _module, _name, message);
+            LOG.WriteBackgroundLog(eEvent.EV_ROUTINE_NOTIFY, _module, _name, message);
         }
         protected void Alarm(string message,bool error=true)
         {
@@ -1131,26 +1131,4 @@ namespace MECF.Framework.Common.Routine
             }
         }
     }
-
-    static public class HOFs
-    {
-        public static Func<R> Apply<T1,  R>(this Func<T1,  R> func, T1 t1)
-            => () =>  func(t1);
-
-        public static Func<R> Apply<T1, T2, R>(this Func<T1, T2, R> func, T1 t1, T2 t2)
-            => () => func(t1, t2);
-
-        public static Func<R> Apply<T1, T2, T3, R>(this Func<T1, T2, T3, R> func, T1 t1, T2 t2, T3 t3)
-            => () => func(t1, t2, t3);
-
-        public static Func<bool> WrapAction(this Action action)
-            => () => { action(); return true; };
-        public static Func<bool> WrapAction<T1>(this Action<T1> action, T1 t1)
-            => () => { action(t1); return true; };
-        public static Func<bool> WrapAction<T1, T2>(this Action<T1, T2> action, T1 t1, T2 t2)
-            => () => { action(t1, t2); return true; };
-
-        public static Func<bool> WrapAction<T1, T2, T3>(this Action<T1, T2, T3> action, T1 t1, T2 t2, T3 t3)
-            => () => { action(t1, t2, t3); return true; };
-    }
 }

+ 3 - 3
PunkHPX8_RT/Devices/SRD/SrdCommonChuckVacuumRoutine.cs

@@ -63,7 +63,7 @@ namespace PunkHPX8_RT.Devices.SRD
         {
             if (_srdCommon.CommonData.ChuckVacuum == _chuckVacuum)
             {
-                if(!_chuckVacuum)
+                if(_chuckVacuum)
                 {
                     LOG.WriteLog(eEvent.INFO_SRD, Module, $"Chuck Vacuum is on, VacuumValue:{_srdCommon.CommonData.VacuumValue}, VacuumOn Limit:{_vacuumOnLimit}");
                     return _srdCommon.CommonData.VacuumValue < _vacuumOnLimit;
@@ -90,7 +90,7 @@ namespace PunkHPX8_RT.Devices.SRD
             _vacuumOnLimit = SC.GetValue<int>("SRD.ChuckVacuumOnLimit");
             if (_chuckVacuum)
             {
-                return Runner.Start(Module, "Chuck Vacuum Off");
+                return Runner.Start(Module, "Chuck Vacuum On");
             }
             else
             {
@@ -99,7 +99,7 @@ namespace PunkHPX8_RT.Devices.SRD
                     LOG.WriteLog(eEvent.ERR_SRD, Module, $"Lift up is on. Can't chuck vacuum");
                     return RState.Failed;
                 }
-                return Runner.Start(Module, "Chuck Vacuum On");
+                return Runner.Start(Module, "Chuck Vacuum Off");
             }
         }
     }

+ 1 - 1
PunkHPX8_RT/Devices/SRD/SrdCommonLiftUpRoutine.cs

@@ -77,7 +77,7 @@ namespace PunkHPX8_RT.Devices.SRD
             _srdCommon = DEVICE.GetDevice<SrdCommonDevice>($"{Module}.Common");
             if (_liftUp)
             {               
-                if (!_srdCommon.CommonData.ChuckVacuum)
+                if (_srdCommon.CommonData.ChuckVacuum)
                 {
                     LOG.WriteLog(eEvent.ERR_SRD, Module, $"Chuck vacuum is on. Can't lift up");
                     return RState.Failed;

+ 1 - 1
PunkHPX8_RT/Modules/EFEM/EfemPickRoutine.cs

@@ -165,7 +165,7 @@ namespace PunkHPX8_RT.Modules.EFEM
                     NotifyError(eEvent.ERR_EFEM_ROBOT,  $"{_targetModule} door closed, can not pick",-1);
                     return false;
                 }
-                if (!_srdModule.IsSrdChuckVacuum)
+                if (_srdModule.IsSrdChuckVacuum)
                 {
                     NotifyError(eEvent.ERR_EFEM_ROBOT,  $"{_targetModule} Vacuum on, can not pick",-1);
                     return false;

+ 2 - 2
PunkHPX8_RT/Modules/RouteManager.cs

@@ -660,7 +660,7 @@ namespace PunkHPX8_RT.Modules
             if (ModuleHelper.IsInstalled(ModuleName.SRD1))
             {
                 SrdCommonDevice srdCommonDevice = DEVICE.GetDevice<SrdCommonDevice>($"{ModuleName.SRD1}.Common");
-                if (!srdCommonDevice.CommonData.ChuckVacuum)
+                if (srdCommonDevice.CommonData.ChuckVacuum)
                 {
                     LOG.WriteLog(eEvent.ERR_AXIS, ModuleName.SRD1.ToString(), "Vacuum is on");
                     return false;
@@ -670,7 +670,7 @@ namespace PunkHPX8_RT.Modules
             if (ModuleHelper.IsInstalled(ModuleName.SRD2))
             {
                 SrdCommonDevice srdCommonDevice = DEVICE.GetDevice<SrdCommonDevice>($"{ModuleName.SRD2}.Common");
-                if (!srdCommonDevice.CommonData.ChuckVacuum)
+                if (srdCommonDevice.CommonData.ChuckVacuum)
                 {
                     LOG.WriteLog(eEvent.ERR_AXIS, ModuleName.SRD2.ToString(), "Vacuum is on");
                     return false;

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

@@ -464,7 +464,7 @@ namespace PunkHPX8_RT.Modules.SRD
                     PostMsg(RunWaferMsg.Error);
                     return false;
                 }
-                return _srdCommon.Status == RState.End && !_srdCommon.CommonData.ChuckVacuum;
+                return _srdCommon.Status == RState.End && _srdCommon.CommonData.ChuckVacuum;
             }
             else
             {

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

@@ -202,7 +202,7 @@ namespace PunkHPX8_RT.Modules.SRD
                 return false;
             }
             //检查SRD真空是否开启
-            if (!_srdEntity.IsSrdChuckVacuum)
+            if (_srdEntity.IsSrdChuckVacuum)
             {
                 LOG.Write(eEvent.ERR_SRD, Module, $"{Module} Vacuum on, can't do AWC Cycle");
                 return false;

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

@@ -83,7 +83,7 @@ namespace PunkHPX8_RT.Modules.SRD
                 LOG.WriteLog(eEvent.ERR_SRD, Module, $"Wafer is present");
                 return false;
             }
-            if (!srdCommon.CommonData.ChuckVacuum)
+            if (srdCommon.CommonData.ChuckVacuum)
             {
                 LOG.WriteLog(eEvent.ERR_SRD, Module, $"Chuck Vacuum is on");
                 return false;

+ 2 - 2
PunkHPX8_RT/Modules/SRD/SRDLoaderRoutine.cs

@@ -119,7 +119,7 @@ namespace PunkHPX8_RT.Modules.SRD
                 return false;
             }
             //Check Vacuum off
-            if (!_srdCommon.CommonData.ChuckVacuum)
+            if (_srdCommon.CommonData.ChuckVacuum)
             {
                 NotifyError(eEvent.ERR_SRD, "Chuck Vacuum is on", 0);
                 return false;
@@ -322,7 +322,7 @@ namespace PunkHPX8_RT.Modules.SRD
         /// <returns></returns>
         private bool CheckChuckVacuumOnEndStatus()
         {
-            return _srdCommon.Status == RState.End && !_srdCommon.CommonData.ChuckVacuum;
+            return _srdCommon.Status == RState.End && _srdCommon.CommonData.ChuckVacuum;
         }
         /// <summary>
         /// 检验ChuckVacuumOn结束状态

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

@@ -258,7 +258,7 @@ namespace PunkHPX8_RT.Modules.SRD
             {
                 return false;
             }
-            return _srdCommon.Status == RState.End && !_srdCommon.CommonData.ChuckVacuum;
+            return _srdCommon.Status == RState.End && _srdCommon.CommonData.ChuckVacuum;
         }
 
         #region SRD RunWaferRecipeRoutine

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

@@ -451,7 +451,7 @@ namespace PunkHPX8_RT.Modules.SRD
                 NotifyError(eEvent.ERR_SRD, "Rotation axis is not homed", 0);
                 return false;
             }
-            if (!_srdCommonDevice.CommonData.ChuckVacuum)
+            if (_srdCommonDevice.CommonData.ChuckVacuum)
             {
                 NotifyError(eEvent.ERR_SRD, "Vacuum is not released", 0);
                 return false;

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

@@ -207,7 +207,7 @@ namespace PunkHPX8_RT.Modules.SRD
             }
             //Check Vacuum
             int vacuumOnLimit = SC.GetValue<int>("SRD.ChuckVacuumOnLimit");
-            if (!_srdCommon.CommonData.ChuckVacuum)
+            if (_srdCommon.CommonData.ChuckVacuum)
             {
                 if (_srdCommon.CommonData.VacuumValue >= vacuumOnLimit)
                 {

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

@@ -348,7 +348,7 @@ namespace PunkHPX8_RT.Modules.SRD
         {
             if (_srdCommon.IsWaferPresence)
             {
-                return _srdCommon.Status == RState.End && !_srdCommon.CommonData.ChuckVacuum;
+                return _srdCommon.Status == RState.End && _srdCommon.CommonData.ChuckVacuum;
             }
             else
             {

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

@@ -163,7 +163,7 @@ namespace PunkHPX8_RT.Modules.SRD
             }
             //Check Vacuum
             int vacuumOnLimit = SC.GetValue<int>("SRD.ChuckVacuumOnLimit");
-            if (!_srdCommon.CommonData.ChuckVacuum)
+            if (_srdCommon.CommonData.ChuckVacuum)
             {
                 if(_srdCommon.CommonData.VacuumValue >= vacuumOnLimit)
                 {

+ 1 - 1
PunkHPX8_Themes/UserControls/SRDSideControl.xaml

@@ -79,7 +79,7 @@
         </Grid>
         <Grid Grid.Row="3" Grid.Column="1">
             <Ellipse Grid.Column="1" Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Center" Stroke="Silver"
-                     Fill="{Binding CommonData.ChuckVacuum, Converter={StaticResource boolToColor2}, ElementName=self}"/>
+                     Fill="{Binding CommonData.ChuckVacuum, Converter={StaticResource boolToColor}, ElementName=self}"/>
         </Grid>
         <Grid Grid.Row="3" Grid.Column="2">
             <Button Style="{StaticResource SysBtnStyle}" Margin="10,0,0,0" Grid.Column="1" Height="25" Width="100" HorizontalAlignment="Center" Content="On" Click="ChuckVacuumOn_Click"></Button>