Ver código fonte

解决安装包会覆盖config等文件夹的问题

lixiang 2 anos atrás
pai
commit
c2cfe61019

+ 5 - 0
Venus/Venus_MainPages/ViewModels/ButterflyValveViewModel.cs

@@ -72,6 +72,11 @@ namespace Venus_MainPages.ViewModels
             timer.Tick += timer_Tick;
             timer.Start();
         }
+
+        ~ButterflyValveViewModel()
+        {
+
+        }
         #region 命令方法
         private void OnSet()
         {

+ 60 - 37
Venus/Venus_MainPages/ViewModels/OverViewModel.cs

@@ -9,6 +9,7 @@ using System.Windows;
 using System.Windows.Threading;
 using Venus_Core;
 using Venus_MainPages.Views;
+using System.Linq;
 
 namespace Venus_MainPages.ViewModels
 {
@@ -19,13 +20,13 @@ namespace Venus_MainPages.ViewModels
         private bool m_PVN22ValveIsOpen;
         private bool m_N2ValveIsOpen;
         private bool m_PV11ValveIsOpen;
-        private bool m_PV12ValveIsOpen;        
+        private bool m_PV12ValveIsOpen;
         private bool m_PV21ValveIsOpen;
-        private bool m_PV22ValveIsOpen;       
+        private bool m_PV22ValveIsOpen;
         private bool m_PV31ValveIsOpen;
-        private bool m_PV32ValveIsOpen;        
+        private bool m_PV32ValveIsOpen;
         private bool m_PV41ValveIsOpen;
-        private bool m_PV42ValveIsOpen;        
+        private bool m_PV42ValveIsOpen;
         private bool m_MFC1ValveIsOpen;
         private bool m_MFC2ValveIsOpen;
         private bool m_MFC3ValveIsOpen;
@@ -55,6 +56,9 @@ namespace Venus_MainPages.ViewModels
         private double m_MfcGas7Setpoint;
         private double m_MfcGas8Setpoint;
 
+        private float m_SRFFwdPowerSetpoint;
+        private float m_BRFFwdPowerSetpoint;
+
 
         //ValveTurboPumpPumping
         //m_RtDataKeys.Add($"{ModuleName}.PVHe1Valve.IsOpen");
@@ -62,9 +66,9 @@ namespace Venus_MainPages.ViewModels
 
 
 
-        private AITPumpData m_MainPumpData=new AITPumpData ();
+        private AITPumpData m_MainPumpData = new AITPumpData();
 
-        private bool m_PumpIsOpen; 
+        private bool m_PumpIsOpen;
         private bool m_TurboIsOpen;
         private bool m_IsATM;
         private bool m_IsVAC;
@@ -333,6 +337,16 @@ namespace Venus_MainPages.ViewModels
             set { SetProperty(ref m_title, value); }
         }
 
+        public float SRFFwdPowerSetpoint
+        {
+            get { return m_SRFFwdPowerSetpoint; }
+            set { SetProperty(ref m_SRFFwdPowerSetpoint, value); }
+        }
+        public float BRFFwdPowerSetpoint
+        {
+            get { return m_BRFFwdPowerSetpoint; }
+            set { SetProperty(ref m_BRFFwdPowerSetpoint, value); }
+        }
         #endregion
 
         #region 命令
@@ -407,9 +421,9 @@ namespace Venus_MainPages.ViewModels
         public OverViewModel()
         {
             //RTData.init();
-            m_RtConfigKeys =new List<string>();
+            m_RtConfigKeys = new List<string>();
             m_RtDataKeys = new List<string>();
-            
+
             m_IsATM = true;
 
             ModuleName = "PMA";
@@ -426,14 +440,16 @@ namespace Venus_MainPages.ViewModels
             Title = "PMA";
 
         }
-       
+
+      
+
         #endregion
 
         #region 命令方法
 
         private void OnPMInit()
         {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.Home");            
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.Home");
         }
         private void OnGas()
         {
@@ -441,7 +457,7 @@ namespace Venus_MainPages.ViewModels
             string[] mfcSetPoint = new string[8];
             for (int index = 0; index < mfc.Length; index++)
             {
-                mfc[index] = RtDataValues[$"{ModuleName}.MfcGas{index+1}.SetPoint"];              
+                mfc[index] = RtDataValues[$"{ModuleName}.MfcGas{index + 1}.SetPoint"];
             }
             //if (((Math.Abs((double)mfc[0] - (double)_oldmfc[0]) < 0.01) && (Math.Abs((double)mfc[1] - (double)_oldmfc[1]) < 0.01) && (Math.Abs((double)mfc[2] - (double)_oldmfc[2])) < 0.01)
             //   || ((Math.Abs((double)mfc[0]) <= 0.01 && Math.Abs((double)mfc[1]) <= 0.01 && Math.Abs((double)mfc[2]) <= 0.01)))
@@ -529,8 +545,8 @@ namespace Venus_MainPages.ViewModels
 
         private void OnOpenPump()
         {
-            
-            if (RtDataValues[$"{ModuleName}.FsmState"].ToString()== "LaunchingPump")
+
+            if (RtDataValues[$"{ModuleName}.FsmState"].ToString() == "LaunchingPump")
             {
                 InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{RtOperation.Abort}");
                 return;
@@ -565,17 +581,17 @@ namespace Venus_MainPages.ViewModels
 
         private void OnPinUpDown(object upDown)
         {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetLiftPin",Convert.ToBoolean( upDown));
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetLiftPin", Convert.ToBoolean(upDown));
         }
 
         private void OnSetSRf()
-        { 
+        {
 
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetSRf",!SRFIsOn);
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetSRf", BRFFwdPowerSetpoint, 100, 100);
         }
         private void OnSetBRf()
-        { 
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetBRf",!BRFIsOn);
+        {
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetBRf", BRFFwdPowerSetpoint, 100, 100);
         }
 
         private void OnPMAbort()
@@ -584,18 +600,19 @@ namespace Venus_MainPages.ViewModels
         }
         private void OnOpenButterflyValveView()
         {
+            var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window; 
             ButterflyValveView butterflyValveMessageBox = new ButterflyValveView();
-            //butterflyValveMessageBox.IsPositionMode = true;
             butterflyValveMessageBox.WindowStartupLocation = WindowStartupLocation.Manual;
             butterflyValveMessageBox.Left = 800;
             butterflyValveMessageBox.Top = 500;
-            butterflyValveMessageBox.ShowDialog();
+            butterflyValveMessageBox.Show();
+            butterflyValveMessageBox.Owner = _mainWindow;
         }
 
         private void OnGasSetPoint()
         {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas1.SetPoint",MfcGas1Setpoint);
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas2.SetPoint", MfcGas2Setpoint); 
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas1.SetPoint", MfcGas1Setpoint);
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas2.SetPoint", MfcGas2Setpoint);
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas3.SetPoint", MfcGas3Setpoint);
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas4.SetPoint", MfcGas4Setpoint);
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas5.SetPoint", MfcGas5Setpoint);
@@ -611,10 +628,10 @@ namespace Venus_MainPages.ViewModels
             RtConfigValues = QueryDataClient.Instance.Service.PollConfig(m_RtConfigKeys);
             RtDataValues = QueryDataClient.Instance.Service.PollData(m_RtDataKeys);
 
-            
+
             PVN21ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVN21.IsOpen"];
             GasFinalValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveGasFinal.IsOpen"];
-            PV11ValveIsOpen= (bool)RtDataValues[$"{ModuleName}.ValvePV11.IsOpen"];
+            PV11ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV11.IsOpen"];
             PV12ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV12.IsOpen"];
             PV21ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV21.IsOpen"];
             PV22ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV22.IsOpen"];
@@ -622,43 +639,43 @@ namespace Venus_MainPages.ViewModels
             PV32ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV32.IsOpen"];
             PV41ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV41.IsOpen"];
             PV42ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV42.IsOpen"];
-            MFC1ValveIsOpen=  (bool)RtDataValues[$"{ModuleName}.ValveMfc1.IsOpen"]; 
+            MFC1ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc1.IsOpen"];
             MFC2ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc2.IsOpen"];
-            MFC3ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc3.IsOpen"]; 
+            MFC3ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc3.IsOpen"];
             MFC4ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc4.IsOpen"];
-            MFC5ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc5.IsOpen"]; 
-            MFC6ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc6.IsOpen"]; 
-            MFC7ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc7.IsOpen"]; 
+            MFC5ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc5.IsOpen"];
+            MFC6ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc6.IsOpen"];
+            MFC7ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc7.IsOpen"];
             MFC8ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc8.IsOpen"];
-            N2ValveIsOpen= (bool)RtDataValues[$"{ModuleName}.ValveN2.IsOpen"];
+            N2ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveN2.IsOpen"];
             SoftPumpValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveSoftPump.IsOpen"];
-            FastPumpValveIsOpen= (bool)RtDataValues[$"{ModuleName}.ValveFastPump.IsOpen"];
+            FastPumpValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveFastPump.IsOpen"];
             PVHe1ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVHe1.IsOpen"];
             PVHe2ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVHe2.IsOpen"];
-            PVN21ValveIsOpen= (bool)RtDataValues[$"{ModuleName}.ValvePVN21.IsOpen"];
+            PVN21ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVN21.IsOpen"];
             PVN22ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVN22.IsOpen"];
 
 
             TurboPumpPumpingValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveTurboPumpPumping.IsOpen"];
-            TurboPumpPurgeValveIsOpen= (bool)RtDataValues[$"{ModuleName}.ValveTurboPumpPurge.IsOpen"];
+            TurboPumpPurgeValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveTurboPumpPurge.IsOpen"];
 
 
             PumpIsOpen = (bool)RtDataValues[$"{ModuleName}.PumpIsRunning"];
-            TurboIsOpen= (bool)RtDataValues[$"{ModuleName}.TurboPumpIsRunning"];
+            TurboIsOpen = (bool)RtDataValues[$"{ModuleName}.TurboPumpIsRunning"];
 
             BRFIsOn = (bool)RtDataValues[$"{ModuleName}.BRfIsOn"];
             SRFIsOn = (bool)RtDataValues[$"{ModuleName}.SRfIsOn"];
 
             if (IsPositionMode == true)
             {
-                int value= (int)RtDataValues[$"{ModuleName}.GetPVPosition"];
+                int value = (int)RtDataValues[$"{ModuleName}.GetPVPosition"];
                 if (value >= 100)
                 {
                     PositionValue = 360;
                 }
                 else
-                { 
-                PositionValue = (int)(((int)RtDataValues[$"{ModuleName}.GetPVPosition"])*3.6);
+                {
+                    PositionValue = (int)(((int)RtDataValues[$"{ModuleName}.GetPVPosition"]) * 3.6);
                 }
             }
             else
@@ -757,12 +774,18 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.IsLidClosed");
 
             m_RtDataKeys.Add($"{ModuleName}.SRfIsOn");
+            m_RtDataKeys.Add($"{ModuleName}.SRfReflectPower");
             m_RtDataKeys.Add($"{ModuleName}.BRfIsOn");
+            m_RtDataKeys.Add($"{ModuleName}.BRfReflectPower");
+
 
             m_RtDataKeys.Add($"{ModuleName}.TurboPumpRotationalSpeed");
 
             m_RtDataKeys.Add($"{ModuleName}.GetPVPosition");
 
+            m_RtDataKeys.Add($"{ModuleName}.ChillerTem");
+
+
 
 
 

+ 14 - 13
Venus/Venus_MainPages/Views/OverView.xaml

@@ -446,7 +446,7 @@
         <TextBlock Text="ATM" Canvas.Left="1300" Canvas.Top="120"/>
         <TextBlock Text="VAC" Canvas.Left="1272" Canvas.Top="240"/>
         <ctrls:Pipe2     Canvas.Left="1242" Canvas.Top="195" HorizontalAlignment="Left" VerticalAlignment="Top" RotateTransformValue="-90" />
-       
+
 
 
         <!--与chamber底部连接的管道-->
@@ -594,7 +594,7 @@
         <ctrls:TextboxWithLabel  Canvas.Top="464" Canvas.Left="1290" LabelValue="Position" TextBoxValue="{Binding RtDataValues[PMA.GetPVPosition],StringFormat='F0'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="511" Canvas.Left="1320" LabelValue="Flow(sccm)" TextBoxValue="{Binding RtDataValues[PMA.MfcN2.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="556" Canvas.Left="932" LabelValue="Pressure(Torr)" TextBoxValue="{Binding RtDataValues[PMA.ESCHePressure],StringFormat='F1'}" TextBoxColor="#D7E4BD">
-            
+
         </ctrls:TextboxWithLabel>
         <Border    BorderBrush="Gray"  BorderThickness="0"  Width="40" Height="6" Canvas.Top="581" Canvas.Left="1008">
             <Border.Background>
@@ -668,22 +668,22 @@
             <TextBlock Grid.Row="7" Text="BRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
             <TextBlock Grid.Row="8" Text="DC Bias(V)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
 
-            <TextBox Grid.Row="0" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBox Grid.Row="0" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFFwdPowerSetpoint}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBlock Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.SRfReflectPower],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
             <TextBox Grid.Row="2" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
             <TextBox Grid.Row="3" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox Grid.Row="4" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox Grid.Row="5" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBox Grid.Row="4" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFFwdPowerSetpoint}"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <!--<TextBox Grid.Row="5" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />-->
             <TextBox Grid.Row="6" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
             <TextBox Grid.Row="7" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
             <TextBox Grid.Row="8" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
 
-            <TextBlock Grid.Row="0" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="1" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="0" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.SRfForwardPowerFeedBack],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+
             <TextBlock Grid.Row="2" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
             <TextBlock Grid.Row="3" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="4" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="5" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="4" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.BRfForwardPowerFeedBack],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="5" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.BRfReflectPower],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
             <TextBlock Grid.Row="6" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
             <TextBlock Grid.Row="7" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
             <TextBlock Grid.Row="8" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
@@ -717,8 +717,8 @@
             <TextBox Grid.Row="4" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />
 
             <TextBlock Grid.Row="0" Grid.Column="2" Text="" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-       
-            <TextBlock Grid.Row="3" Grid.Column="2" Text="" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+
+            <TextBlock Grid.Row="3" Grid.Column="2" Text="{Binding RtDataValues[PMA.ChillerTem],StringFormat='F1'}" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
             <TextBlock Grid.Row="4" Grid.Column="2" Text="" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
         </Grid>
 
@@ -753,7 +753,7 @@
         <TextBlock FontSize="13" Text="{Binding RtConfigValues[PMA.MfcGas7.GasName]}" Canvas.Left="10" Canvas.Top="562" Block.TextAlignment="Right" Width="50"/>
         <TextBlock FontSize="13" Text="{Binding RtConfigValues[PMA.MfcGas8.GasName]}" Canvas.Left="10" Canvas.Top="618" Block.TextAlignment="Right" Width="50"/>
 
-       
+
 
         <!--Chamber-->
         <ctrls:Chamber Canvas.Left="1030" Canvas.Top="224" 
@@ -988,3 +988,4 @@
         </Grid>
     </Canvas>
 </UserControl>
+ 

+ 8 - 2
Venus/Venus_RT/Devices/JetPM.cs

@@ -425,14 +425,20 @@ namespace Venus_RT.Devices
             DATA.Subscribe($"{Name}.IsSlitDoorClosed", () => IsSlitDoorClosed);
             DATA.Subscribe($"{Name}.IsLidClosed", () => IsLidClosed);
             DATA.Subscribe($"{Name}.SRfIsOn", () => _Generator.IsPowerOn);
-            DATA.Subscribe($"{Name}.BRfIsOn", () => _GeneratorBias.IsPowerOn);
+            DATA.Subscribe($"{Name}.BRfIsOn", () =>
+            {
+                return _GeneratorBias == null ? false : _GeneratorBias.IsPowerOn;
+            }
+            );
             DATA.Subscribe($"{Name}.TurboPumpRotationalSpeed", () => _TurboPump.RotationalSpeed);
             DATA.Subscribe($"{Name}.PendulumValve.Position", () => _pendulumValve.Position);
             DATA.Subscribe($"{Name}.PendulumValve.Pressure", () => _pendulumValve.Pressure);
 
 
             DATA.Subscribe($"{Name}.GetPVPosition", () => GetPVPosition());
-            
+
+            DATA.Subscribe($"{Name}.ChillerTem", () => CoolantInletTempFB);
+
             //DATA.Subscribe($"{Name}.TurboPumpIsRunning", () => _);
 
             OP.Subscribe($"{Module}.SetLiftPin", (cmd, args) => {

+ 3 - 2
Venus/Venus_Setup/Venus_RT.iss

@@ -33,8 +33,9 @@ Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
 
 
 [Files]
-Source: "..\Venus_RT\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "..\Venus_RT\bin\Release\Config\*"; DestDir: "{app}"; Flags: onlyifdoesntexist
+Source: "..\Venus_RT\bin\Release\*";Excludes:"Config,Recipes,Logs"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
+Source: "..\Venus_RT\bin\Release\Config\*"; DestDir: "{app}\Config"; Flags: onlyifdoesntexist
+
 
 [Icons]
 Name: "{userdesktop}\{#MyAppName}";Filename: "{app}\{#MyAppName}.exe"; WorkingDir: "{app}"

+ 3 - 1
Venus/Venus_Setup/Venus_UI.iss

@@ -32,8 +32,10 @@ UsePreviousAppDir=no
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "..\Venus_UI\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+//Source: "..\Venus_UI\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: "..\Venus_UI\bin\Release\*";Excludes:"Config"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
+Source: "..\Venus_UI\bin\Release\Config\*"; DestDir: "{app}\Config"; Flags: onlyifdoesntexist
 
 [Icons]
 Name: "{userdesktop}\{#MyAppName}";Filename: "{app}\{#MyAppName}.exe"; WorkingDir: "{app}"