Sic-Software
/
Sic03
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from svn.

This commit is contained in:
SL 2023-06-25 10:33:49 +08:00
parent 7789e069fc
commit 304bdb8331
8 changed files with 90 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
FrameworkLocal/UIClient/CenterViews/Configs/SystemConfig/SystemConfigViewModel.cs
View File

@ -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)
{

4
Modules/SicPM/Devices/IoPSU.cs
View File

@ -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}");
}
}

4
Modules/SicPM/Devices/IoSCR.cs
View File

@ -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}");
}
}
}

2
Modules/SicPM/PMModule.cs
View File

@ -1249,6 +1249,8 @@ namespace SicPM
private bool FsmStartProcessAbort(object[] param)
{
AbortRoutine();
Result ret = StartRoutine(_pmProcessAbort);
if (ret == Result.FAIL || ret == Result.DONE)

2
SicRT/Config/System.sccfg
View File

@ -1313,6 +1313,8 @@
</configs>
<configs name="TM">
<config default="300" name="ProcessPressure" description="传盘压力基准" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="20" name="VacuumPressureBaseOffset" description="传盘压力Offset" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="192.168.1.102:102" name="SiemensIP" description="Siemens IP Address" max="" min="" paramter="" tag="" unit="" type="String" />
<config default="S1500" name="SiemensType" description="Siemens Type" max="" min="" paramter="" tag="" unit="" type="String" />
<config default="960" name="AtmPressureBase" description="判断大气压的时候，压力值需要大于该值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />

4
SicRT/Properties/AssemblyInfo.cs
View File

@ -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")]

9
SicRT/ReleaseNotes.md
View File

@ -1,4 +1,13 @@
# Sic 系统更新历史记录
## Version 1.2.6.25
**2023-06-19**
- Bug修复
-
- 新特性
- 1.增加系统配置参数一键传盘压力设置功能
## Version 1.2.6.24
**2023-04-27**

4
SicUI/Properties/AssemblyInfo.cs
View File

@ -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")]