diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index 4c57b96..9cecb52 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -211,7 +211,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml index 8b0453d..6e84f46 100644 --- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml @@ -29,7 +29,7 @@ - + @@ -47,6 +47,8 @@ + + @@ -462,6 +464,8 @@ + + @@ -471,6 +475,7 @@ + @@ -482,8 +487,8 @@ - - + + diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index 8b0453d..6e84f46 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -29,7 +29,7 @@ - + @@ -47,6 +47,8 @@ + + @@ -462,6 +464,8 @@ + + @@ -471,6 +475,7 @@ + @@ -482,8 +487,8 @@ - - + + diff --git a/App/SicRT/Properties/AssemblyInfo.cs b/App/SicRT/Properties/AssemblyInfo.cs index 6d1e8b0..fd23697 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.60731")] +[assembly: AssemblyVersion("1.1.0.60810")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")] diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index 8b0453d..aab4f5c 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -29,7 +29,7 @@ - + @@ -47,6 +47,8 @@ + + @@ -462,6 +464,8 @@ + + @@ -471,6 +475,7 @@ + @@ -482,8 +487,8 @@ - - + + diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs index 1905b69..d68c4f9 100644 --- a/App/SicSimulator/Instances/SimulatorSystem.cs +++ b/App/SicSimulator/Instances/SimulatorSystem.cs @@ -154,6 +154,8 @@ namespace SicSimulator.Instances IO.DI[$"{mod}.DI_ElectrodeWFlowSW"].Value = true; IO.DI[$"{mod}.DI_TMPump1FlowSW"].Value = true; IO.DI[$"{mod}.DI_Foreline1FlowSW"].Value = true; + IO.DI[$"{mod}.DI_Spare2FlowSW"].Value = true; + IO.DI[$"{mod}.DI_Spare1FlowSW"].Value = true; IO.DI[$"{mod}.DI_TransformerFlowSW"].Value = true; IO.DI[$"{mod}.DI_GBH2DetectorSW"].Value = true; IO.DI[$"{mod}.DI_ArInletPressSW"].Value = true; @@ -306,15 +308,15 @@ namespace SicSimulator.Instances IO.AI[$"{mod}.AI_ChamTopFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_ChamMiddleFlow1Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_ChamBottomFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; - //IO.AI[$"{mod}.AI_Foreline2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; + IO.AI[$"{mod}.AI_Foreline2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_PowerRod1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_PowerRod2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; - //IO.AI[$"{mod}.AI_Foreline1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; + IO.AI[$"{mod}.AI_Foreline1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_ElectrodeWFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_TMPump1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_TransformerFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; - //IO.AI[$"{mod}.AI_Spare1Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; - //IO.AI[$"{mod}.AI_Spare2Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; + IO.AI[$"{mod}.AI_Spare1Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; + IO.AI[$"{mod}.AI_Spare2Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; //IO.AI[$"{mod}.AI_SpareFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; #endregion Water Flow diff --git a/App/SicUI/Properties/AssemblyInfo.cs b/App/SicUI/Properties/AssemblyInfo.cs index 6695643..f3088b4 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.60731")] +[assembly: AssemblyVersion("1.1.0.60810")] [assembly: AssemblyInformationalVersion("MoS2(无EFEM)")]