diff --git a/FrameworkLocal/UIClient/CenterViews/Configs/SystemConfig/SystemConfigViewModel.cs b/FrameworkLocal/UIClient/CenterViews/Configs/SystemConfig/SystemConfigViewModel.cs index aa8287d..a310d7e 100644 --- a/FrameworkLocal/UIClient/CenterViews/Configs/SystemConfig/SystemConfigViewModel.cs +++ b/FrameworkLocal/UIClient/CenterViews/Configs/SystemConfig/SystemConfigViewModel.cs @@ -6,6 +6,7 @@ using OpenSEMI.ClientBase; using OpenSEMI.ClientBase.Command; using System.Globalization; +using MECF.Framework.Common.DataCenter; namespace MECF.Framework.UI.Client.CenterViews.Configs.SystemConfig { @@ -366,6 +367,15 @@ namespace MECF.Framework.UI.Client.CenterViews.Configs.SystemConfig string key = String.Format("{0}{1}{2}", _CurrentNodeName, ".", item.Name); InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", key, value); + if (key == "TM.ProcessPressure") + { + SetTansferPressure1(value); + } + else if (key == "TM.VacuumPressureBaseOffset") + { + SetTansferPressure2(value); + } + item.TextSaved = true; Reload(); @@ -405,6 +415,65 @@ namespace MECF.Framework.UI.Client.CenterViews.Configs.SystemConfig } } + //设置传盘压力相关参数 + private void SetTansferPressure1(string value) + { + double.TryParse(value, out double dbValue); + + double offset = (double)QueryDataClient.Instance.Service.GetConfig("TM.VacuumPressureBaseOffset"); + + double basePressure = offset + dbValue; + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "TM.PressureBalance.BalancePressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "TM.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "TM.Purge.VentBasePressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "PM.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "PM.PM1.ProcessIdle.FinalPressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "PM.PM1.PreProcess.ChamberPressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "LoadLock.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "LoadLock.Purge.VentBasePressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "UnLoad.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "UnLoad.Purge.VentBasePressure", dbValue); + } + + private void SetTansferPressure2(string value) + { + double.TryParse(value, out double offset); + + double dbValue = (double)QueryDataClient.Instance.Service.GetConfig("TM.ProcessPressure"); + + double basePressure = offset + dbValue; + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "TM.PressureBalance.BalancePressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "TM.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "TM.Purge.VentBasePressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "PM.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "PM.PM1.ProcessIdle.FinalPressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "PM.PM1.PreProcess.ChamberPressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "LoadLock.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "LoadLock.Purge.VentBasePressure", dbValue); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "UnLoad.VacuumPressureBase", basePressure); + + InvokeClient.Instance.Service.DoOperation($"{SystemName}.SetConfig", "UnLoad.Purge.VentBasePressure", dbValue); + } + private void RecipePasswordReset(string sKey, string sValue) { diff --git a/Modules/SicPM/Devices/IoPSU.cs b/Modules/SicPM/Devices/IoPSU.cs index c7dcaa8..c8a6513 100644 --- a/Modules/SicPM/Devices/IoPSU.cs +++ b/Modules/SicPM/Devices/IoPSU.cs @@ -340,7 +340,7 @@ namespace SicPM.Devices if (Resistance > dbResistancetorMax && _timerResistance.IsIdle()) { - _timerResistance.Start(3000); + _timerResistance.Start(6000); } if (Resistance <= dbResistancetorMax) @@ -351,7 +351,7 @@ namespace SicPM.Devices _trigResistance.CLK = _timerResistance.IsTimeout(); if (_trigResistance.Q) { - EV.PostAlarmLog(Module, $"{Name} Resistance is out of range.Current Resistance is {Resistance}"); + EV.PostWarningLog(Module, $"{Name} Resistance is out of range.Current Resistance is {Resistance}"); } } diff --git a/Modules/SicPM/Devices/IoSCR.cs b/Modules/SicPM/Devices/IoSCR.cs index ebf4b1b..0574695 100644 --- a/Modules/SicPM/Devices/IoSCR.cs +++ b/Modules/SicPM/Devices/IoSCR.cs @@ -196,7 +196,7 @@ namespace SicPM.Devices if (Resistance > dbResistancetorMax && _timerResistance.IsIdle()) { - _timerResistance.Start(3000); + _timerResistance.Start(6000); } if (Resistance <= dbResistancetorMax) @@ -207,7 +207,7 @@ namespace SicPM.Devices _trigResistance.CLK = _timerResistance.IsTimeout(); if (_trigResistance.Q) { - EV.PostAlarmLog(Module, $"{Name} Resistance is out of range.Current Resistance is {Resistance}"); + EV.PostWarningLog(Module, $"{Name} Resistance is out of range.Current Resistance is {Resistance}"); } } } diff --git a/Modules/SicPM/PMModule.cs b/Modules/SicPM/PMModule.cs index 20698d1..80e3611 100644 --- a/Modules/SicPM/PMModule.cs +++ b/Modules/SicPM/PMModule.cs @@ -1249,6 +1249,8 @@ namespace SicPM private bool FsmStartProcessAbort(object[] param) { + AbortRoutine(); + Result ret = StartRoutine(_pmProcessAbort); if (ret == Result.FAIL || ret == Result.DONE) diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg index f979b2a..5feda48 100644 --- a/SicRT/Config/System.sccfg +++ b/SicRT/Config/System.sccfg @@ -1313,6 +1313,8 @@ + + diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs index 8aee928..16271e6 100644 --- a/SicRT/Properties/AssemblyInfo.cs +++ b/SicRT/Properties/AssemblyInfo.cs @@ -51,6 +51,6 @@ using System.Windows; // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.2.7.24")] -[assembly: AssemblyFileVersion("1.2.7.24")] +[assembly: AssemblyVersion("1.2.7.25")] +[assembly: AssemblyFileVersion("1.2.7.25")] diff --git a/SicRT/ReleaseNotes.md b/SicRT/ReleaseNotes.md index d4df706..ee21fef 100644 --- a/SicRT/ReleaseNotes.md +++ b/SicRT/ReleaseNotes.md @@ -1,4 +1,13 @@ # Sic 系统更新历史记录 +## Version 1.2.6.25 + +**2023-06-19** + +- Bug修复 + - + - 新特性 + - 1.增加系统配置参数一键传盘压力设置功能 + ## Version 1.2.6.24 **2023-04-27** diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index 2a158e7..23a5cf3 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -54,7 +54,7 @@ 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.2.7.24")] -[assembly: AssemblyFileVersion("1.2.7.24")] +[assembly: AssemblyVersion("1.2.7.25")] +[assembly: AssemblyFileVersion("1.2.7.25")]