diff --git a/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs b/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs index 3caec422..0c77bbf5 100644 --- a/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs @@ -47,6 +47,8 @@ namespace SicModules.TMs.Routines.Base protected bool IsTrayLoad => _ioLoadRotation.IsMoveDone; + protected bool IsLoadRotationHome => _ioLoadRotation.IsServeHomeDone; + protected IoLift4 UnLoadLift { get { return _unLoadLift; } diff --git a/Modules/Mainframe/TMs/Routines/TMRobotPickRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotPickRoutine.cs index aa894ebd..6d0003e0 100644 --- a/Modules/Mainframe/TMs/Routines/TMRobotPickRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotPickRoutine.cs @@ -202,13 +202,13 @@ namespace SicModules.TMs.Routines if (LLTrayClaw.IsClamp) { - EV.PostWarningLog(Module, $"Can not place, Load is clamp!"); + EV.PostWarningLog(Module, $"Can not pick, Load is clamp!"); return Result.FAIL; } if (!IsTrayLoad) { - EV.PostWarningLog(Module, $"Can not place, tray is not at load angle !"); + EV.PostWarningLog(Module, $"Can not pick,Load tray is not at load angle !"); return Result.FAIL; } } @@ -216,7 +216,7 @@ namespace SicModules.TMs.Routines { if (!UnLoadLift.IsDown) { - EV.PostWarningLog(Module, $"Can not place, UnLoad Lift must in down Position!"); + EV.PostWarningLog(Module, $"Can not pick, UnLoad Lift must in down Position!"); return Result.FAIL; } } @@ -293,7 +293,7 @@ namespace SicModules.TMs.Routines SetRobotExtendToDO((int)RoutineStep.SetRobortExtendToDo, _target, 2); CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _pickTimeout); - if (_target == ModuleName.Load || _target == ModuleName.LoadLock)//放Load前打开夹爪 + if (_target == ModuleName.Load || _target == ModuleName.LoadLock)//取Load前打开夹爪 { ExecuteRoutine((int)RoutineStep.TrayUnClamp1, _trayUnClamp); //夹爪打开 } diff --git a/Modules/Mainframe/TMs/Routines/TMRobotPlaceRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotPlaceRoutine.cs index 9817900f..f2955f45 100644 --- a/Modules/Mainframe/TMs/Routines/TMRobotPlaceRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotPlaceRoutine.cs @@ -191,14 +191,23 @@ namespace SicModules.TMs.Routines // } //} - //Place之前先,根据Sensor检测是否有盘 if (!SC.GetValue("System.IsSimulatorMode")) { - if ((_target ==ModuleName.LoadLock || _target == ModuleName.Load) && SensorLLTrayPresence.Value) + if ((_target ==ModuleName.LoadLock || _target == ModuleName.Load) ) { - EV.PostWarningLog(Module, $"Can not place, LLTrayPresence sensor has tray"); - return Result.FAIL; + if (SensorLLTrayPresence.Value) + { + EV.PostWarningLog(Module, $"Can not place, LLTrayPresence sensor has tray"); + return Result.FAIL; + } + + + if (!IsLoadRotationHome) + { + EV.PostWarningLog(Module, $"Can not place,Load rotation is not at home !"); + return Result.FAIL; + } } //if (_target == ModuleName.UnLoad && SensorUnloadWaferPresence.Value) //{ @@ -271,7 +280,7 @@ namespace SicModules.TMs.Routines CheckRobotReady((int)RoutineStep.CheckRobotReady, RobotDevice, _placeTimeout); - if (_target == ModuleName.Load || _target == ModuleName.LoadLock)//放Load前打开夹爪 + if (_target == ModuleName.Load || _target == ModuleName.LoadLock)//放Load前操作 { ExecuteRoutine((int)RoutineStep.TrayUnClamp1, _trayUnClamp); //夹爪打开 } diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg index 843544ca..75b7709b 100644 --- a/SicRT/Config/System.sccfg +++ b/SicRT/Config/System.sccfg @@ -1102,20 +1102,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs index 89378ae4..f9a6a2ea 100644 --- a/SicRT/Properties/AssemblyInfo.cs +++ b/SicRT/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.0.1.40726")] +[assembly: AssemblyVersion("1.0.1.40729")] [assembly: AssemblyInformationalVersion("Sic多片机(无EFEM)")] \ No newline at end of file diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index 5a96f646..5c536497 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -54,5 +54,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.1.40726")] +[assembly: AssemblyVersion("1.0.1.40729")] [assembly: AssemblyInformationalVersion("Sic多片机(无EFEM)")] diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index 2fa18f62..761bd29a 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index 17e0a1a0..4df1da90 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index ea34818a..00ec1c48 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index 59172e76..697c0dd8 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index 9c802949..c0b4b986 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index d48f2fc8..9c31b13b 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Core.dll b/ThirdParty/MECF.Framework/Sicentury.Core.dll index f013ca88..ded28be6 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Core.dll and b/ThirdParty/MECF.Framework/Sicentury.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Localization.dll b/ThirdParty/MECF.Framework/Sicentury.Localization.dll index dc66e9c9..751503e8 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Localization.dll and b/ThirdParty/MECF.Framework/Sicentury.Localization.dll differ diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll index 01c503c7..ab65a756 100644 Binary files a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ