Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

Merge branch 'Sic8ToSic6' into feature/测温重构 

# Conflicts:
#	SicRT/Instances/ToolLoader.cs
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
This commit is contained in:
Han Qiang Qiang 2023-12-15 15:54:46 +08:00
parent 093a2b9d91 468ea8aa74
commit 71f13ea50c
12 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SicRT/Config/System.sccfg
View File

@ -74,7 +74,7 @@
<config default="1" name="OperationResetTime" visible="false" description="Operation Reset Time" max="10000" min="0" paramter="" tag="" unit="s" type="Double" />
<config default="2" name="OperationTimeout" visible="false" description="Operation Timeout" max="10000" min="1" paramter="" tag="" unit="s" type="Integer" />
<config default="960" name="AtmPressureBase" description="Atm Pressure Base" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="305" name="VacuumPressureBase" description="Vacuum Pressure Base" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="305" name="VacuumPressureBase" description="Vacuum Pressure Base" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" visible="false" />
<config default="false" name="IsAtmIdleRoutine" visible="true" description="是否以Recipe的形式运行ATM Idle" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="false" name="IsVacIdleRoutine" visible="true" description="是否以Recipe的形式运行VAC Idle" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="false" name="IsProcessIdleRoutine" visible="true" description="是否Recipe的形式运行Process Idle" max="" min="" paramter="" tag="" unit="" type="Bool" />
@ -1584,7 +1584,7 @@
<config default="127.0.0.1:102" name="SiemensIP" description="Siemens IP Address，Default IP：192.168.1.102:102" max="" min="" paramter="" tag="" unit="" type="String" />
<config default="S1500" name="SiemensType" visible="false" 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" />
<config default="220" name="VacuumPressureBase" description="判断真空的时候，压力值需要小于该值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="220" name="VacuumPressureBase" description="判断真空的时候，压力值需要小于该值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" visible="false"/>
<config default="1100" name="VentMaxPressure" description="腔体到达此压力自动关闭Vent阀门" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="5" name="MaxPressureDiffOpenSlitValve" description="闸板阀允许打开的最大压力差" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="5" name="TMPressureBigThanPM" description="闸板阀打开前TM的压力需要高于PM的数值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
@ -1661,7 +1661,7 @@
<config default="1000" name="SleepTime" visible="false" description="PID Sleep Time" max="3000" min="1" paramter="" tag="" unit="ms" type="Integer" />
<config default="50" name="SuccessCount" visible="false" description="Success Count" max="3000" min="1" paramter="" tag="" unit="" type="Integer" />
<config default="10" name="BalanceMaxDiffPressure" description="Max Difference Pressure For current and Target Module" max="100" min="-100" paramter="" tag="" unit="" type="Double" />
<config default="300" name="BalancePressure" description="Balance Pressure" max="1000" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="300" name="BalancePressure" description="Balance Pressure" max="1000" min="0" paramter="" tag="" unit="mbar" type="Double" visible="false"/>
<config default="300" name="VentTimeout" description="Vent Timeout" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
<config default="300" name="WaitPressureAboveSetPointTimeout" description="Wait Pressure AboveSetPointTimeout" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
</configs>
@ -1737,7 +1737,7 @@
<config default="true" name="IsVerifyDoorEnabled" visible="false" description="TM是否set atm door" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="120" name="PostTransferTimeout" description="Post transfer time out" max="1000" min="0" paramter="" tag="" unit="s" type="Integer" />
<config default="960" name="AtmPressureBase" description="判断大气压的时候，压力值需要大于该值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="302" name="VacuumPressureBase" description="判断真空的时候，压力值需要小于该值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="302" name="VacuumPressureBase" description="判断真空的时候，压力值需要小于该值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" visible="false"/>
<config default="1100" name="VentMaxPressure" description="腔体到达此压力自动关闭Vent阀门" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="0.5" name="ForelinePressureBase" visible="false" description="抽气的时候，Foreline压力值需要小于该值" max="1200" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="true" name="RunPumpRoutineEventBelowBasePressure" visible="false" description="即使在低压，仍然继续抽" max="" min="" paramter="" tag="" unit="" type="Bool" />
@ -1809,7 +1809,7 @@
<config default="true" name="IsVerifyDoorEnabled" description="TM是否set atm door" max="0" min="0" paramter="" tag="" unit="" visible="false" type="Bool" />
<config default="120" name="PostTransferTimeout" description="post transfer time out" max="1000" min="1" paramter="" tag="" unit="s" type="Integer" />
<config default="960" name="AtmPressureBase" description="判断大气压的时候，压力值需要大于该值" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="305" name="VacuumPressureBase" description="判断真空的时候，压力值需要小于该值" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="305" name="VacuumPressureBase" description="判断真空的时候，压力值需要小于该值" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" visible="false"/>
<config default="1100" name="VentMaxPressure" description="腔体到达此压力自动关闭Vent阀门" max="1500" min="800" paramter="" tag="" unit="mbar" type="Double" />
<config default="0.5" name="ForelinePressureBase" visible="false" description="抽气的时候，Foreline压力值需要小于该值" max="1100" min="0" paramter="" tag="" unit="mbar" type="Double" />
<config default="true" name="RunPumpRoutineEventBelowBasePressure" visible="false" description="即使在低压，仍然继续抽" max="0" min="0" paramter="" tag="" unit="" type="Bool" />

14
SicRT/Instances/ToolLoader.cs
View File

@ -1,6 +1,5 @@
using SicRT.Equipments.Systems;
using MECF.Framework.UI.Client.TrayThickness.HistoryData;
using Aitex.Core.Util;
using MECF.Framework.Common.Aitex.Core.Common.DeviceData;
namespace SicRT.Instances
@ -44,11 +43,14 @@ namespace SicRT.Instances
Singleton<DeviceManager>.Instance.DisableAsyncInitialize = true;
Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + "pm\\pm1\\DeviceModelPM1.xml", "Sic",
ModuleName.PM1, "PM1", false);
Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + "tm\\DeviceModelSystem.xml", "Sic", ModuleName.System, "TM", true);
Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + "pm\\pm1\\DeviceModelPM1.xml", "Sic",ModuleName.PM1, "PM1", false);
Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + "pm\\pm2\\DeviceModelPM2.xml", "Sic",ModuleName.PM2, "PM2", endCallInit: false);
Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + "Common\\Common.xml", "Sic", ModuleName.System, "System", false);
Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + "pm\\pm2\\DeviceModelPM2.xml", "Sic",
ModuleName.PM2, "PM2", false);
Singleton<DeviceManager>.Instance.Initialize(PathManager.GetCfgDir() + "tm\\DeviceModelSystem.xml", "Sic",
ModuleName.System, "TM", true);
RtSystemManager.Instance.AddCustomBackend("SC", new BackendSCConfigView());
@ -70,7 +72,7 @@ namespace SicRT.Instances
if (Singleton<EquipmentManager>.Instance.Modules[ModuleName.PM2].IsInstalled)
IoManager.Instance.Initialize($"{PathManager.GetCfgDir()}pm\\pm2\\interlockPM2.xml");
//! DataCollectionManager必须在最后初始化，否则在其之后注册的DATA数据均会被忽略
Singleton<DataCollectionManager>.Instance.Initialize();

2
SicRT/Properties/AssemblyInfo.cs
View File

@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.1.3.9")]
[assembly: AssemblyVersion("1.1.4.10")]
[assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]

24
SicRT/ReleaseNotes.md
View File

@ -3,18 +3,15 @@
Auto-GE 自动通用版（适用有EFEM设备）
----
## Version 1.1.5.11
**2023-12-11**
## Version 1.1.4.10
**2023-12-15**
- Bug修复
- PM2修改三色灯配置
- PM未安装时，对应的PLC不初始化
- InterlockManager中Monitor扫描忽略翻转时，键值对集合中不包含对象时，continue当前循环
- 新特性
- 添加ProcessHistory查询工能
- 添加ProcessHistory历史记录查询
## Version 1.1.5.10
## Version 1.1.4.9
**2023-12-11**
- Bug修复
@ -25,17 +22,6 @@ Auto-GE 自动通用版（适用有EFEM设备）
- 在SC UnLoad中配置SeparationLog报警等级
## Version 1.1.5.9
**2023-12-14**
- Bug修复
- PM未安装时对应的PLC不初始化
- 所有弹窗提示Recipe是否保存时，均存在PM1和PM2不同步，问题已修改
- 测试SaveAs保存时，如果旧的Recipe选择不保存时会多次提示保存，问题已修改
- 测试SaveAs保存时，如果旧的Recipe选择不保存时，同步Recipe中PM1和PM2后在保存
- 新特性
- 测温部分重写，上层配置通道对应的硬件，底层设置好硬件必须的配置
## Version 1.1.4.8
**2023-12-08**

8
SicUI/Models/Maintenances/TM/TMViewModel.cs
View File

@ -940,9 +940,11 @@ namespace SicUI.Client.Models.Platform.TM
if (!bret.HasValue || !bret.Value)
return;
InvokeClient.Instance.Service.DoOperation("System.SetConfig", $"{module}.Purge.CyclePurgeCount", dialog.CycleCountValue);
InvokeClient.Instance.Service.DoOperation("System.SetConfig", $"{module}.Purge.PumpBasePressure", dialog.PumpPressureValue);
InvokeClient.Instance.Service.DoOperation("System.SetConfig", $"{module}.Purge.VentBasePressure", dialog.VentPressureValue);
//手动Purge不能修改System配置参数
//InvokeClient.Instance.Service.DoOperation("System.SetConfig", $"{module}.Purge.CyclePurgeCount", dialog.CycleCountValue);
//InvokeClient.Instance.Service.DoOperation("System.SetConfig", $"{module}.Purge.PumpBasePressure", dialog.PumpPressureValue);
//InvokeClient.Instance.Service.DoOperation("System.SetConfig", $"{module}.Purge.VentBasePressure", dialog.VentPressureValue);
TMProvider.Instance.Purge(module);
}

2
SicUI/Properties/AssemblyInfo.cs
View File

@ -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.1.5.11")]
[assembly: AssemblyVersion("1.1.4.10")]
[assembly: AssemblyInformationalVersion("自动通用版（有EFEM）")]

BIN
ThirdParty/MECF.Framework/MECF.Framework.Common.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll vendored
View File

Binary file not shown.