Browse Source

0.0.0.4节点,以0.0.0.4版本作为HF机台可用版本

jiangjy 1 month ago
parent
commit
50f12731f2

+ 2 - 2
Furnace/FurnaceGasPanelUI/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 
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.2")]
-[assembly: AssemblyFileVersion("0.0.0.2")]
+[assembly: AssemblyVersion("0.0.0.4")]
+[assembly: AssemblyFileVersion("0.0.0.4")]

+ 51 - 8
Furnace/FurnaceRT/Equipments/PMs/PMAux.cs

@@ -18,6 +18,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq;
+using System.Security.Cryptography;
 namespace FurnaceRT.Equipments.PMs
 namespace FurnaceRT.Equipments.PMs
 {
 {
     public partial class PMModule
     public partial class PMModule
@@ -484,10 +485,18 @@ namespace FurnaceRT.Equipments.PMs
                     IsHTR2Enable = SC.GetValue<bool>("PM1.IsHTR2Enable");
                     IsHTR2Enable = SC.GetValue<bool>("PM1.IsHTR2Enable");
                 if (IsHTR3Enable != SC.GetValue<bool>("PM1.IsHTR3Enable"))
                 if (IsHTR3Enable != SC.GetValue<bool>("PM1.IsHTR3Enable"))
                     IsHTR3Enable = SC.GetValue<bool>("PM1.IsHTR3Enable");
                     IsHTR3Enable = SC.GetValue<bool>("PM1.IsHTR3Enable");
+                if (IsDEPOOn != SC.GetValue<bool>("PM1.IsDEPOOn"))
+                    IsDEPOOn = SC.GetValue<bool>("PM1.IsDEPOOn");
+                //配方1 Prod 模式
+                //Htr 1 on + Htr 2 on + Htr3 on + Dep on. (F2 cln Off & HF cln Off)
 
 
+                //配方2 F2 Cln 模式
+                //Htr 1 on + htr 2 off + htr 3 off + F2 Cln On(Dep off &HF cln Off)
 
 
+                //配方3 HF Cln 模式(此台设备暂无HF 配置)
+                //Htr 1 on + htr 2 on + htr 3 off + HF Cln On(Dep off &F2 cln Off)
 
 
-                if (IsHTR1Enable && IsF2ClnOn)
+                if (IsHTR1Enable && !IsHTR2Enable && !IsHTR3Enable && IsF2ClnOn)
                 {
                 {
                     var config2Name = SC.ContainsItem("Minics.Config2") ? SC.GetStringValue("Minics.Config2") : "";
                     var config2Name = SC.ContainsItem("Minics.Config2") ? SC.GetStringValue("Minics.Config2") : "";
                     if (_currentTableName != config2Name)
                     if (_currentTableName != config2Name)
@@ -495,10 +504,11 @@ namespace FurnaceRT.Equipments.PMs
                         Singleton<MinicsManager>.Instance.SelectMinicsConfig(config2Name);
                         Singleton<MinicsManager>.Instance.SelectMinicsConfig(config2Name);
                         _currentTableName = config2Name;
                         _currentTableName = config2Name;
                         LOG.Write($"minics table switch to config2 {config2Name}");
                         LOG.Write($"minics table switch to config2 {config2Name}");
+                        return;
                     }
                     }
 
 
                 }
                 }
-                else if (IsHTR1Enable && IsHTR2Enable && IsHFClnOn)
+                else if (IsHTR1Enable && IsHTR2Enable && !IsHTR3Enable && IsHFClnOn)
                 {
                 {
                     var config3Name = SC.ContainsItem("Minics.Config3") ? SC.GetStringValue("Minics.Config3") : "";
                     var config3Name = SC.ContainsItem("Minics.Config3") ? SC.GetStringValue("Minics.Config3") : "";
                     if (_currentTableName != config3Name)
                     if (_currentTableName != config3Name)
@@ -506,11 +516,12 @@ namespace FurnaceRT.Equipments.PMs
                         Singleton<MinicsManager>.Instance.SelectMinicsConfig(config3Name);
                         Singleton<MinicsManager>.Instance.SelectMinicsConfig(config3Name);
                         _currentTableName = config3Name;
                         _currentTableName = config3Name;
                         LOG.Write($"minics table switch to config3 {config3Name}");
                         LOG.Write($"minics table switch to config3 {config3Name}");
+                        return;
                     }
                     }
 
 
 
 
                 }
                 }
-                else if (IsHTR1Enable)
+                else if (IsHTR1Enable && IsHTR2Enable && IsHTR3Enable && IsDEPOOn)
                 {
                 {
 
 
                     var config1Name = SC.ContainsItem("Minics.Config1") ? SC.GetStringValue("Minics.Config1") : "";
                     var config1Name = SC.ContainsItem("Minics.Config1") ? SC.GetStringValue("Minics.Config1") : "";
@@ -520,13 +531,45 @@ namespace FurnaceRT.Equipments.PMs
                         Singleton<MinicsManager>.Instance.SelectMinicsConfig(config1Name);
                         Singleton<MinicsManager>.Instance.SelectMinicsConfig(config1Name);
                         _currentTableName = config1Name;
                         _currentTableName = config1Name;
                         LOG.Write($"minics table switch to config1 {config1Name}");
                         LOG.Write($"minics table switch to config1 {config1Name}");
+                        return;
                     }
                     }
-
-
                 }
                 }
-
-
-
+                //else if (!IsHTR1Enable) {
+
+                //    var config1Name = SC.ContainsItem("Minics.Config1") ? SC.GetStringValue("Minics.Config1") : "";
+
+                //    if (_currentTableName != config1Name)
+                //    {
+                //        Singleton<MinicsManager>.Instance.SelectMinicsConfig(config1Name);
+                //        _currentTableName = config1Name;
+                //        LOG.Write($"minics table switch to config1 {config1Name}");
+                //    }
+                //}
+
+                //else if (!IsHTR2Enable)
+                //{
+
+                //    var config1Name = SC.ContainsItem("Minics.Config1") ? SC.GetStringValue("Minics.Config1") : "";
+
+                //    if (_currentTableName != config1Name)
+                //    {
+                //        Singleton<MinicsManager>.Instance.SelectMinicsConfig(config1Name);
+                //        _currentTableName = config1Name;
+                //        LOG.Write($"minics table switch to config1 {config1Name}");
+                //    }
+                //}
+                //else if (!IsHTR3Enable)
+                //{
+
+                //    var config1Name = SC.ContainsItem("Minics.Config1") ? SC.GetStringValue("Minics.Config1") : "";
+
+                //    if (_currentTableName != config1Name)
+                //    {
+                //        Singleton<MinicsManager>.Instance.SelectMinicsConfig(config1Name);
+                //        _currentTableName = config1Name;
+                //        LOG.Write($"minics table switch to config1 {config1Name}");
+                //    }
+                //}
 
 
 
 
                 return;
                 return;

+ 2 - 2
Furnace/FurnaceRT/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.2")]
-[assembly: AssemblyFileVersion("0.0.0.2")]
+[assembly: AssemblyVersion("0.0.0.4")]
+[assembly: AssemblyFileVersion("0.0.0.4")]

File diff suppressed because it is too large
+ 12 - 1519
Furnace/FurnaceRT/ReleaseNotes.txt


+ 2 - 2
Furnace/FurnaceSetup/Furnace_Setup/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.1")]
-[assembly: AssemblyFileVersion("0.0.0.1")]
+[assembly: AssemblyVersion("0.0.0.4")]
+[assembly: AssemblyFileVersion("0.0.0.4")]

+ 2 - 2
Furnace/FurnaceSimulator/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.1")]
-[assembly: AssemblyFileVersion("0.0.0.1")]
+[assembly: AssemblyVersion("0.0.0.4")]
+[assembly: AssemblyFileVersion("0.0.0.4")]

+ 2 - 2
Furnace/FurnaceUI/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 
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.0.2")]
-[assembly: AssemblyFileVersion("0.0.0.2")]
+[assembly: AssemblyVersion("0.0.0.4")]
+[assembly: AssemblyFileVersion("0.0.0.4")]