diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index 760ee80..c13f184 100644
--- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -407,7 +407,7 @@
-
+
+ -->
-
-
-
+
diff --git a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml
index b2aba22..476b14d 100644
--- a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml
+++ b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml
@@ -224,8 +224,12 @@
-
-
+
+
+
+
+
+
diff --git a/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs b/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs
index f4809ef..81f2bad 100644
--- a/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs
+++ b/App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs
@@ -126,7 +126,7 @@ namespace SicModules.PMs.Routines
}
if (_pm1Module._pmInterLock != null && !_pm1Module._pmInterLock.DoLidOpenRoutineSucceed && _Open) // 不限制close do-172
{
- EV.PostWarningLog(Module, "DO-172 DO_PurgeRoutineSucceed must be on!");
+ EV.PostWarningLog(Module, "DO-172 DO_PurgeRoutineSuscessed must be on!");
return Result.FAIL;
}
if (PmDevice.PSU2.AllHeatEnable)
diff --git a/App/SicRT/Properties/AssemblyInfo.cs b/App/SicRT/Properties/AssemblyInfo.cs
index 4ecb3f3..0e825e1 100644
--- a/App/SicRT/Properties/AssemblyInfo.cs
+++ b/App/SicRT/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
-[assembly: AssemblyVersion("1.1.0.60812")]
+[assembly: AssemblyVersion("1.1.0.60814")]
[assembly: AssemblyInformationalVersion("MoS2（无EFEM）")]
diff --git a/App/SicSimulator/Config/IODefinePlatform.xml b/App/SicSimulator/Config/IODefinePlatform.xml
index a949660..d07b84b 100644
--- a/App/SicSimulator/Config/IODefinePlatform.xml
+++ b/App/SicSimulator/Config/IODefinePlatform.xml
@@ -224,8 +224,12 @@
-
-
+
+
+
+
+
+
@@ -310,7 +314,6 @@
-
diff --git a/App/SicUI/Models/PMs/PMMotionViewModel.cs b/App/SicUI/Models/PMs/PMMotionViewModel.cs
index 55f7e85..2a9ca66 100644
--- a/App/SicUI/Models/PMs/PMMotionViewModel.cs
+++ b/App/SicUI/Models/PMs/PMMotionViewModel.cs
@@ -566,21 +566,26 @@ namespace SicUI.Models.PMs
public Visibility HeatEnableTips { get; set; }
private bool CheckHeatConditionOK(out double minuts)
{
+ //minuts = 0;
+ //int lidopenAfterHeatDisbaleMinuts = (int)QueryDataClient.Instance.Service.GetConfig("PM.LidEnableOpenAfterHeatDisbaleTime");
+ //string dateTimeStr = QueryDataClient.Instance.Service.GetConfig($"PM.{SystemName}.OpenLidCountDownTime").ToString();
+ //DateTime dtStartTime =DateTime.Now;
+ //if (DateTime.TryParse(dateTimeStr, out dtStartTime))
+ //{
+ // minuts = lidopenAfterHeatDisbaleMinuts - (DateTime.Now - dtStartTime).TotalMinutes;
+ // if (dtStartTime.AddMinutes(lidopenAfterHeatDisbaleMinuts) < DateTime.Now)
+ // {
+ // HeatEnableTips = Visibility.Collapsed;
+ // return true;
+ // }
+ //}
+ //HeatEnableTips = Visibility.Visible;
+ //return false;
+
+
+
minuts = 0;
- int lidopenAfterHeatDisbaleMinuts = (int)QueryDataClient.Instance.Service.GetConfig("PM.LidEnableOpenAfterHeatDisbaleTime");
- string dateTimeStr = QueryDataClient.Instance.Service.GetConfig($"PM.{SystemName}.OpenLidCountDownTime").ToString();
- DateTime dtStartTime =DateTime.Now;
- if (DateTime.TryParse(dateTimeStr, out dtStartTime))
- {
- minuts = lidopenAfterHeatDisbaleMinuts - (DateTime.Now - dtStartTime).TotalMinutes;
- if (dtStartTime.AddMinutes(lidopenAfterHeatDisbaleMinuts) < DateTime.Now)
- {
- HeatEnableTips = Visibility.Collapsed;
- return true;
- }
- }
- HeatEnableTips = Visibility.Visible;
- return false;
+ return true;
}
}
}
diff --git a/App/SicUI/Properties/AssemblyInfo.cs b/App/SicUI/Properties/AssemblyInfo.cs
index d88a9b6..928bcf1 100644
--- a/App/SicUI/Properties/AssemblyInfo.cs
+++ b/App/SicUI/Properties/AssemblyInfo.cs
@@ -55,6 +55,6 @@ using System.Windows;
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.0.60812")]
+[assembly: AssemblyVersion("1.1.0.60814")]
[assembly: AssemblyInformationalVersion("MoS2（无EFEM）")]
diff --git a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs
index 14e759a..03039f5 100644
--- a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs
+++ b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs
@@ -376,20 +376,20 @@ namespace Aitex.Core.RT.Device.Devices
//{
// if (_aiTempCtrl1.Value > 100)
// {
- // EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue}，Reason：Interlock triggered, AI-193({Module}.AI_PSUTC) > 100");
+ // EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue}，Reason：Interlock triggered, AI-193({Module}.AI_PSUTC) > 100");
// return false;
// }
//}
if (!_doLidOpenRoutineSucceed.Check(eValue, out reason))
{
- EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue}，Reason：" + reason);
+ EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue}，Reason：" + reason);
return false;
}
//if (!_doPreprocessRunning.SetValue(eValue, out reason))
if (!_doLidOpenRoutineSucceed.SetValue(eValue, out reason))
{
- EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue}，Reason：" + reason);
+ EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue}，Reason：" + reason);
return false;
}