ソースを参照

1.Venus DE/SE Gasverification add missing pipes
2.Venus DE/SE VentRoutine add auto open/close PVN22

hecl 1 年間 前
コミット
f9d4a74265

+ 28 - 0
Venus/Venus_MainPages/ViewModels/MFCVerificationViewModel.cs

@@ -45,6 +45,10 @@ namespace Venus_MainPages.ViewModels
       
         private bool m_MFC7IsEnable;
         private bool m_MFC8IsEnable;
+        private bool m_MFC9IsEnable;
+        private bool m_MFC10IsEnable;
+        private bool m_MFC11IsEnable;
+        private bool m_MFC12IsEnable;
 
         private MFCVerificationView m_MFCVerificationView;
 
@@ -137,6 +141,26 @@ namespace Venus_MainPages.ViewModels
             get { return m_MFC8IsEnable; }
             set { SetProperty(ref m_MFC8IsEnable, value); }
         }
+        public bool MFC9IsEnable
+        {
+            get { return m_MFC9IsEnable; }
+            set { SetProperty(ref m_MFC9IsEnable, value); }
+        }
+        public bool MFC10IsEnable
+        {
+            get { return m_MFC10IsEnable; }
+            set { SetProperty(ref m_MFC10IsEnable, value); }
+        }
+        public bool MFC11IsEnable
+        {
+            get { return m_MFC11IsEnable; }
+            set { SetProperty(ref m_MFC11IsEnable, value); }
+        }
+        public bool MFC12IsEnable
+        {
+            get { return m_MFC12IsEnable; }
+            set { SetProperty(ref m_MFC12IsEnable, value); }
+        }
         #endregion
 
         #region 命令
@@ -235,6 +259,10 @@ namespace Venus_MainPages.ViewModels
             InitTable();
             MFC7IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas7.Enable");
             MFC8IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas8.Enable");
+            MFC9IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas9.Enable");
+            MFC10IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas10.Enable");
+            MFC11IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas11.Enable");
+            MFC12IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas12.Enable");
             m_MFCVerificationView = mFCVerificationView as MFCVerificationView;
             if ( m_MFCVerificationView == null ) { return; }
             if (MFC7IsEnable == false)

+ 4 - 0
Venus/Venus_MainPages/Views/MFCVerificationView.xaml

@@ -53,6 +53,10 @@
                 <ComboBoxItem>MFC6</ComboBoxItem>
                 <ComboBoxItem Visibility="{Binding MFC7IsEnable,Converter={StaticResource bool2VisibilityConverter}}">MFC7</ComboBoxItem>
                 <ComboBoxItem Visibility="{Binding MFC8IsEnable,Converter={StaticResource bool2VisibilityConverter}}">MFC8</ComboBoxItem>
+                <ComboBoxItem Visibility="{Binding MFC9IsEnable,Converter={StaticResource bool2VisibilityConverter}}">MFC9</ComboBoxItem>
+                <ComboBoxItem Visibility="{Binding MFC10IsEnable,Converter={StaticResource bool2VisibilityConverter}}">MFC10</ComboBoxItem>
+                <ComboBoxItem Visibility="{Binding MFC11IsEnable,Converter={StaticResource bool2VisibilityConverter}}">MFC11</ComboBoxItem>
+                <ComboBoxItem Visibility="{Binding MFC12IsEnable,Converter={StaticResource bool2VisibilityConverter}}">MFC12</ComboBoxItem>
             </ComboBox>
             <TextBlock Text="Gas Name" Width="120" Grid.Column="2" Background="#D0D8E8" Padding="25,6,0,0"/>
             <TextBlock Text="{Binding MFCData.DisplayName}"  Width="150" FontSize="14" FontFamily="Arial" Grid.Column="3" Background="White" Padding="55,6,0,0"/>

+ 131 - 129
Venus/Venus_MainPages/Views/OverVenusDEView.xaml

@@ -232,7 +232,7 @@
             </ctrls:FlowPipe>
 
             <TextBlock Canvas.Left="123" Canvas.Top="94"><Run Text="VN2"/><Run Language="zh-cn" Text="1"/></TextBlock>
-            <customControls:CommonValveControl Status="{Binding PVN22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="127" Canvas.Top="112" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVN21" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl Status="{Binding PVN22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="127" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVN21" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
 
@@ -1308,10 +1308,10 @@
 
             <Grid  Width="540" Height="550" Canvas.Left="700" Canvas.Top="150"  unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.LineThickness="1">
                 <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                    <RowDefinition/>
-                    <RowDefinition/>
+                    <!--<RowDefinition/>
+                    <RowDefinition/>-->
+                    <!--<RowDefinition/>
+                    <RowDefinition/>-->
                     <RowDefinition/>
                     <RowDefinition/>
                     <RowDefinition/>
@@ -1350,16 +1350,16 @@
 
 
 
-                <TextBlock Grid.Row="1"   Text="Top RF Forward Power"           Background="#D0D8E8"    Padding="10,5,0,0"/>
-                <TextBlock Grid.Row="2"   Text="Top RF Reflected Power"           Background="#E9EDF4"   Padding="10,5,0,0" />
-                <TextBlock Grid.Row="3"  Text="Bias RF Forward Power"           Background="#D0D8E8"    Padding="10,5,0,0" />
-                <TextBlock Grid.Row="4"   Text="Bias RF Reflected Power"           Background="#E9EDF4"    Padding="10,5,0,0" />
-                <TextBlock Grid.Row="5"   Text="Bias RF Match C1%"           Background="#D0D8E8"    Padding="10,5,0,0" />
-                <TextBlock Grid.Row="6"  Text="Bias RF Match C2%"           Background="#E9EDF4"   Padding="10,5,0,0" />
-                <TextBlock Grid.Row="7"   Text="Bias Voltage"           Background="#D0D8E8"    Padding="10,5,0,0" />
-                <TextBlock Grid.Row="8"   Text="Pressure"       Background="#E9EDF4"    Padding="10,5,0,0" />
-                <TextBlock Grid.Row="9"   Text="Pressure Control Valve Position"       Background="#D0D8E8"    Padding="10,5,0,0"/>
-                <TextBlock Grid.Row="10"          Background="#E9EDF4"    Padding="10,5,0,0" >
+                <!--<TextBlock Grid.Row="1"   Text="Top RF Forward Power"           Background="#D0D8E8"    Padding="10,5,0,0"/>
+                <TextBlock Grid.Row="2"   Text="Top RF Reflected Power"           Background="#E9EDF4"   Padding="10,5,0,0" />-->
+                <TextBlock Grid.Row="1"  Text="Bias RF Forward Power"           Background="#D0D8E8"    Padding="10,5,0,0" />
+                <TextBlock Grid.Row="2"   Text="Bias RF Reflected Power"           Background="#E9EDF4"    Padding="10,5,0,0" />
+                <TextBlock Grid.Row="3"   Text="Bias RF Match C1%"           Background="#D0D8E8"    Padding="10,5,0,0" />
+                <TextBlock Grid.Row="4"  Text="Bias RF Match C2%"           Background="#E9EDF4"   Padding="10,5,0,0" />
+                <TextBlock Grid.Row="5"   Text="Bias Voltage"           Background="#D0D8E8"    Padding="10,5,0,0" />
+                <TextBlock Grid.Row="6"   Text="Pressure"       Background="#E9EDF4"    Padding="10,5,0,0" />
+                <TextBlock Grid.Row="7"   Text="Pressure Control Valve Position"       Background="#D0D8E8"    Padding="10,5,0,0"/>
+                <TextBlock Grid.Row="8"          Background="#E9EDF4"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas1({0}:{1})">
                             <Binding Path="MFC1Data.DisplayName"></Binding>
@@ -1367,7 +1367,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="11"         Background="#D0D8E8"    Padding="10,5,0,0" >
+                <TextBlock Grid.Row="9"         Background="#D0D8E8"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas2({0}:{1})">
                             <Binding Path="MFC2Data.DisplayName"></Binding>
@@ -1375,7 +1375,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="12"        Background="#E9EDF4"    Padding="10,5,0,0" >
+                <TextBlock Grid.Row="10"        Background="#E9EDF4"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas3({0}:{1})">
                             <Binding Path="MFC3Data.DisplayName"></Binding>
@@ -1383,7 +1383,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="13"         Background="#D0D8E8"   Padding="10,5,0,0" >
+                <TextBlock Grid.Row="11"         Background="#D0D8E8"   Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas4({0}:{1})">
                             <Binding Path="MFC4Data.DisplayName"></Binding>
@@ -1391,7 +1391,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="14"         Background="#E9EDF4"    Padding="10,5,0,0">
+                <TextBlock Grid.Row="12"         Background="#E9EDF4"    Padding="10,5,0,0">
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas5({0}:{1})">
                             <Binding Path="MFC5Data.DisplayName"></Binding>
@@ -1399,7 +1399,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="15"          Background="#D0D8E8"   Padding="10,5,0,0">
+                <TextBlock Grid.Row="13"          Background="#D0D8E8"   Padding="10,5,0,0">
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas6({0}:{1})">
                             <Binding Path="MFC6Data.DisplayName"></Binding>
@@ -1407,7 +1407,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="16"         Background="#E9EDF4"  Padding="10,5,0,0">
+                <TextBlock Grid.Row="14"         Background="#E9EDF4"  Padding="10,5,0,0">
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas7({0}:{1})">
                             <Binding Path="MFC7Data.DisplayName"></Binding>
@@ -1415,7 +1415,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="17"        Background="#D0D8E8"    Padding="10,5,0,0" >
+                <TextBlock Grid.Row="15"        Background="#D0D8E8"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas8({0}:{1})">
                             <Binding Path="MFC8Data.DisplayName"></Binding>
@@ -1423,7 +1423,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="18"        Background="#E9EDF4"    Padding="10,5,0,0" >
+                <TextBlock Grid.Row="16"        Background="#E9EDF4"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas9({0}:{1})">
                             <Binding Path="MFC9Data.DisplayName"></Binding>
@@ -1431,7 +1431,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="19"        Background="#D0D8E8"    Padding="10,5,0,0" >
+                <TextBlock Grid.Row="17"        Background="#D0D8E8"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas10({0}:{1})">
                             <Binding Path="MFC10Data.DisplayName"></Binding>
@@ -1439,7 +1439,7 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="20"        Background="#E9EDF4"    Padding="10,5,0,0" >
+                <!--<TextBlock Grid.Row="18"        Background="#E9EDF4"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas11({0}:{1})">
                             <Binding Path="MFC11Data.DisplayName"></Binding>
@@ -1447,101 +1447,101 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="21"        Background="#D0D8E8"    Padding="10,5,0,0" >
+                <TextBlock Grid.Row="19"        Background="#D0D8E8"    Padding="10,5,0,0" >
                     <TextBlock.Text>
                         <MultiBinding StringFormat="{}Gas12({0}:{1})">
                             <Binding Path="MFC12Data.DisplayName"></Binding>
                             <Binding Path="MFC12Data.Scale"></Binding>
                         </MultiBinding>
                     </TextBlock.Text>
-                </TextBlock>
-                <TextBlock Grid.Row="22"   Text="ESC Clamp Voltage"          Background="#E9EDF4"  Padding="10,5,0,0"  />
-                <TextBlock Grid.Row="23"   Text="ESC Temperature"        Background="#D0D8E8"  Padding="10,5,0,0" />
-                <TextBlock Grid.Row="24"  Text="Helium Pressure"       Background="#E9EDF4"    Padding="10,5,0,0"/>
-                <TextBlock Grid.Row="25"   Text="Helium Flow"       Background="#D0D8E8"    Padding="10,5,0,0" />
-
-                <TextBlock Grid.Row="1" Grid.Column="1"  Text="{Binding SRFData.ForwardPower}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,5,0,0"/>
-                <TextBlock Grid.Row="2"  Grid.Column="1" Text="{Binding SRFData.ReflectPower}"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="3"  Grid.Column="1" Text="{Binding BRFData.ForwardPower}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="4"  Grid.Column="1" Text="{Binding BRFData.ReflectPower}"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="5"  Grid.Column="1" Text="{Binding BiasMatchC1,StringFormat='F1'}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="6"  Grid.Column="1" Text="{Binding BiasMatchC2,StringFormat='F1'}"           Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="7"  Grid.Column="1" Text="N/A"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="8"  Grid.Column="1" Text="{Binding ChamberPressureFeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="9"  Grid.Column="1" Text="{Binding PendulumValvePosition}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="10"  Grid.Column="1" Text="{Binding MFC1Data.FeedBack,StringFormat='F1'}"      Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="11"  Grid.Column="1" Text="{Binding MFC2Data.FeedBack,StringFormat='F1'}"      Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="12"  Grid.Column="1" Text="{Binding MFC3Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="13"  Grid.Column="1" Text="{Binding MFC4Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="14"  Grid.Column="1" Text="{Binding MFC5Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="15"  Grid.Column="1" Text="{Binding MFC6Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="16"  Grid.Column="1" Text="{Binding MFC7Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="17"  Grid.Column="1" Text="{Binding MFC8Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="18"  Grid.Column="1" Text="{Binding MFC9Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="19"  Grid.Column="1" Text="{Binding MFC10Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="20"  Grid.Column="1" Text="{Binding MFC11Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="21"  Grid.Column="1" Text="{Binding MFC12Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="22"  Grid.Column="1" Text="{Binding ESCHVData.OutputVoltage}"          Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center" />
-                <TextBlock Grid.Row="23"  Grid.Column="1" Text="{Binding ChillerTemperature,StringFormat='F1'}"        Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="24"  Grid.Column="1" Text="{Binding ESCHePressure,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="25"  Grid.Column="1" Text="{Binding MFCHeData.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-
-                <TextBlock Grid.Row="1" Grid.Column="2"  Text="{Binding CurrentRecipeStep.LstUnit[1].RFPower}"          Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,6,0,0"/>
+                </TextBlock>-->
+                <TextBlock Grid.Row="18"   Text="ESC Clamp Voltage"          Background="#E9EDF4"  Padding="10,5,0,0"  />
+                <TextBlock Grid.Row="19"   Text="ESC Temperature"        Background="#D0D8E8"  Padding="10,5,0,0" />
+                <TextBlock Grid.Row="20"  Text="Helium Pressure"       Background="#E9EDF4"    Padding="10,5,0,0"/>
+                <TextBlock Grid.Row="21"   Text="Helium Flow"       Background="#D0D8E8"    Padding="10,5,0,0" />
+
+                <!--<TextBlock Grid.Row="1" Grid.Column="1"  Text="{Binding SRFData.ForwardPower}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,5,0,0"/>
+                <TextBlock Grid.Row="2"  Grid.Column="1" Text="{Binding SRFData.ReflectPower}"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>-->
+                <TextBlock Grid.Row="1"  Grid.Column="1" Text="{Binding BRFData.ForwardPower}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="2"  Grid.Column="1" Text="{Binding BRFData.ReflectPower}"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="3"  Grid.Column="1" Text="{Binding BiasMatchC1,StringFormat='F1'}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="4"  Grid.Column="1" Text="{Binding BiasMatchC2,StringFormat='F1'}"           Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="5"  Grid.Column="1" Text="N/A"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="6"  Grid.Column="1" Text="{Binding ChamberPressureFeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="7"  Grid.Column="1" Text="{Binding PendulumValvePosition}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="8"  Grid.Column="1" Text="{Binding MFC1Data.FeedBack,StringFormat='F1'}"      Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="9"  Grid.Column="1" Text="{Binding MFC2Data.FeedBack,StringFormat='F1'}"      Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="10"  Grid.Column="1" Text="{Binding MFC3Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="11"  Grid.Column="1" Text="{Binding MFC4Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="12"  Grid.Column="1" Text="{Binding MFC5Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="13"  Grid.Column="1" Text="{Binding MFC6Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="14"  Grid.Column="1" Text="{Binding MFC7Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="15"  Grid.Column="1" Text="{Binding MFC8Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="16"  Grid.Column="1" Text="{Binding MFC9Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="17"  Grid.Column="1" Text="{Binding MFC10Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <!--<TextBlock Grid.Row="18"  Grid.Column="1" Text="{Binding MFC11Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="19"  Grid.Column="1" Text="{Binding MFC12Data.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>-->
+                <TextBlock Grid.Row="18"  Grid.Column="1" Text="{Binding ESCHVData.OutputVoltage}"          Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center" />
+                <TextBlock Grid.Row="19"  Grid.Column="1" Text="{Binding ChillerTemperature,StringFormat='F1'}"        Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="20"  Grid.Column="1" Text="{Binding ESCHePressure,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="21"  Grid.Column="1" Text="{Binding MFCHeData.FeedBack,StringFormat='F1'}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+
+                <!--<TextBlock Grid.Row="1" Grid.Column="2"  Text="{Binding CurrentRecipeStep.LstUnit[1].RFPower}"          Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,6,0,0"/>
+                <TextBlock Grid.Row="2"  Grid.Column="2" Text="N/A"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>-->
+                <TextBlock Grid.Row="1"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[2].BiasRFPower}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="2"  Grid.Column="2" Text="N/A"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="3"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[2].BiasRFPower}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="4"  Grid.Column="2" Text="N/A"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="5"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[2].BiasTuneCapPreset}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="6"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[2].BiasLoadCapPreset}"           Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="7"  Grid.Column="2" Text="N/A"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="8"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[0].StartPressure}"      Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="9"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[0].ValvePositionPreset}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="10"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas1}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="11"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas2}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="12"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas3}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="13"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas4}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="14"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas5}"      Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="15"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas6}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="16"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas7}"       Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="17"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas8}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="18"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas9}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="19"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas10}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="20"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas11}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="21"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas12}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="22"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[4].ESCClampValtage}"          Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center" />
-                <TextBlock Grid.Row="23"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[4].Temperature}"        Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="24"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[4].BacksideHelum}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="25"  Grid.Column="2" Text=""       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-
-                <TextBlock Grid.Row="1" Grid.Column="3"  Text="W"           Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,6,0,0"/>
+                <TextBlock Grid.Row="3"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[2].BiasTuneCapPreset}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="4"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[2].BiasLoadCapPreset}"           Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="5"  Grid.Column="2" Text="N/A"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="6"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[0].StartPressure}"      Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="7"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[0].ValvePositionPreset}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="8"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas1}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="9"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas2}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="10"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas3}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="11"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas4}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="12"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas5}"      Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="13"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas6}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="14"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas7}"       Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="15"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas8}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="16"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas9}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="17"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas10}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <!--<TextBlock Grid.Row="18"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas11}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="19"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[3].Gas12}"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>-->
+                <TextBlock Grid.Row="18"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[4].ESCClampValtage}"          Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center" />
+                <TextBlock Grid.Row="19"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[4].Temperature}"        Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="20"  Grid.Column="2" Text="{Binding CurrentRecipeStep.LstUnit[4].BacksideHelum}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="21"  Grid.Column="2" Text=""       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+
+                <!--<TextBlock Grid.Row="1" Grid.Column="3"  Text="W"           Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,6,0,0"/>
+                <TextBlock Grid.Row="2"  Grid.Column="3" Text="W"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>-->
+                <TextBlock Grid.Row="1"  Grid.Column="3" Text="W"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="2"  Grid.Column="3" Text="W"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="3"  Grid.Column="3" Text="W"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="4"  Grid.Column="3" Text="W"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="5"  Grid.Column="3" Text="%"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="6"  Grid.Column="3" Text="%"           Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="7"  Grid.Column="3" Text="V"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="8"  Grid.Column="3" Text="mTorr"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="9"  Grid.Column="3" Text="Count"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="3"  Grid.Column="3" Text="%"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="4"  Grid.Column="3" Text="%"           Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="5"  Grid.Column="3" Text="V"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="6"  Grid.Column="3" Text="mTorr"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="7"  Grid.Column="3" Text="Count"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="8"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="9"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="10"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="11"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="12"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="13"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="14"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="14"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="15"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="16"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="16"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="17"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="18"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="19"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="20"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <!--<TextBlock Grid.Row="18"  Grid.Column="3" Text="sccm"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="19"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>-->
+                <TextBlock Grid.Row="18"  Grid.Column="3" Text="V"          Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center" />
+                <TextBlock Grid.Row="19"  Grid.Column="3" Text="°C"        Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
+                <TextBlock Grid.Row="20"  Grid.Column="3" Text="Torr"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="21"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="22"  Grid.Column="3" Text="V"          Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center" />
-                <TextBlock Grid.Row="23"  Grid.Column="3" Text="°C"        Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="24"  Grid.Column="3" Text="Torr"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="25"  Grid.Column="3" Text="sccm"       Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,6,0,0" Block.TextAlignment="Center"/>
             </Grid>
             <!--<Button Width="120" Height="30" Content="Abort"            Canvas.Left="910" Canvas.Top="690"  IsEnabled="{Binding IsAutoMode}"/>
             <Button Width="120" Height="30" Content="Chamber Offline"  Canvas.Left="1110" Canvas.Top="690" IsEnabled="{Binding IsAutoMode}"/>-->
         </Canvas>
-        <Grid Width="360" Height="190" Canvas.Left="1530" Canvas.Top="4"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
+        <Grid Width="540" Height="190" Canvas.Left="1351" Canvas.Top="4"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4" HorizontalAlignment="Left" VerticalAlignment="Center">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1590,13 +1590,13 @@
                 </TextBlock.Text>
             </TextBlock>
         </Grid>
-        <Grid Width="300" Height="260"  Canvas.Left="500" Canvas.Top="402" Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True">
+        <Grid Width="300" Height="130"  Canvas.Left="500" Canvas.Top="545" Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <Grid.RowDefinitions>
+                <!--<RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
+                <RowDefinition/>-->
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1610,56 +1610,58 @@
                 <ColumnDefinition Width="*"/>
 
             </Grid.ColumnDefinitions>
-            <TextBlock  Text="Source RF"  Grid.ColumnSpan="3" FontSize="15" VerticalAlignment="Center"  HorizontalAlignment="Center"/>
+            <!--<TextBlock  Text="Source RF"  Grid.ColumnSpan="3" FontSize="15" VerticalAlignment="Center"  HorizontalAlignment="Center"/>
 
 
             <TextBlock Grid.Row="1" Text="SRF Fwd Power(W)"     FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
             <TextBlock Grid.Row="2" Text="SRF Ref  Power(W)"      FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
             <TextBlock Grid.Row="3" Text="SRF Match C1(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="4" Text="SRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="4" Text="SRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>-->
 
-            <TextBox   Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFFwdPowerSetpoint,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <!--<TextBox   Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFFwdPowerSetpoint,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
             <TextBlock Grid.Row="2" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFData.ReflectPower,StringFormat='F1',UpdateSourceTrigger=PropertyChanged}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
             <TextBox   Grid.Row="3" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFMatchC1,UpdateSourceTrigger=PropertyChanged}"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
             <TextBox   Grid.Row="4" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFMatchC2,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
 
             <TextBlock Grid.Row="1" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding SRFData.ForwardPower,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="{Binding MatchC1,StringFormat='F1'}" Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="4" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding MatchC2,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="4" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding MatchC2,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>-->
 
-            <TextBlock  Text="Bias RF" Grid.Row="5" FontSize="15" Grid.ColumnSpan="3" VerticalAlignment="Center"  HorizontalAlignment="Center"/>
+            <TextBlock  Text="Bias RF"  FontSize="15" Grid.ColumnSpan="3" VerticalAlignment="Center"  HorizontalAlignment="Center"/>
 
-            <TextBlock Grid.Row="6" Text="BRF Fwd Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="7" Text="BRF Ref  Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="8" Text="BRF Match C1(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="9" Text="BRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="1" Text="BRF Fwd Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="2" Text="BRF Ref  Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="3" Text="BRF Match C1(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="4" Text="BRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
             <!--<TextBlock Grid.Row="10" Text="DC Bias(V)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>-->
 
 
-            <TextBox   Grid.Row="6" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFFwdPowerSetpoint,UpdateSourceTrigger=PropertyChanged}"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBox   Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFFwdPowerSetpoint,UpdateSourceTrigger=PropertyChanged}"  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="{Binding BRFMatchC1,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox   Grid.Row="9" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFMatchC2,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBox   Grid.Row="3" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFMatchC1,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBox   Grid.Row="4" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFMatchC2,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
 
-            <TextBlock Grid.Row="6" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding BRFData.ForwardPower,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="7" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFData.ReflectPower,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
-            <TextBlock Grid.Row="8" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding BiasMatchC1,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="9" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding BiasMatchC2,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="1" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding BRFData.ForwardPower,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="2" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFData.ReflectPower,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
+            <TextBlock Grid.Row="3" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding BiasMatchC1,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="4" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding BiasMatchC2,StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
             <!--<TextBlock Grid.Row="10" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>-->
 
         </Grid>
-        <Ellipse Width="20" Height="20" Fill="{Binding SRFData.IsRfOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="375" Stroke="Silver" StrokeThickness="2"/>
-        <Button Height="20" Width="100" Content="SRF ON/OFF" Canvas.Left="530" Canvas.Top="375" Command="{Binding SetSRfCommand}"  Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
-        <Ellipse Width="20" Height="20" Fill="{Binding BRFData.IsRfOn,Converter={StaticResource boolToColor}}"  Canvas.Left="650" Canvas.Top="375" Stroke="Silver" StrokeThickness="2"/>
-        <Button Height="20" Width="100" Content="BRF ON/OFF" Canvas.Left="680" Canvas.Top="375" Command="{Binding SetBRfCommand}"  Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+        <!--<Ellipse Width="20" Height="20" Fill="{Binding SRFData.IsRfOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="375" Stroke="Silver" StrokeThickness="2"/>
+        <Button Height="20" Width="100" Content="SRF ON/OFF" Canvas.Left="530" Canvas.Top="375" Command="{Binding SetSRfCommand}"  Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>-->
+        <Ellipse Width="20" Height="20" Fill="{Binding BRFData.IsRfOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="508" Stroke="Silver" StrokeThickness="2"/>
+        <Button Height="20" Width="100" Content="BRF ON/OFF" Canvas.Left="530" Canvas.Top="508" Command="{Binding SetBRfCommand}"  Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
 
-        <Ellipse Width="20" Height="20" Fill="{Binding ESCHVData.IsOn,Converter={StaticResource boolToColor}}" Canvas.Left="500" Canvas.Top="205" Stroke="Silver" StrokeThickness="2"/>
-        <Button Height="20" Width="100" Content="HV ON/OFF" Canvas.Left="530" Canvas.Top="205" Command="{Binding HVCommand}" CommandParameter="True" Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+        <Ellipse Width="20" Height="20" Fill="{Binding ESCHVData.IsOn,Converter={StaticResource boolToColor}}" Canvas.Left="501" Canvas.Top="247" Stroke="Silver" StrokeThickness="2"/>
+        <Button Height="20" Width="100" Content="HV ON/OFF" Canvas.Left="531" Canvas.Top="247" Command="{Binding HVCommand}" CommandParameter="True" Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
 
-        <Grid Width="320" Height="80"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="230">
+        <Grid Width="300" Height="80"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="283" HorizontalAlignment="Center" VerticalAlignment="Top">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1695,7 +1697,7 @@
 
 
         </Grid>
-        <Grid Width="250" Height="80"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="825" Canvas.Top="230">
+        <Grid Width="300" Height="101"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="388" HorizontalAlignment="Center" VerticalAlignment="Top">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1732,7 +1734,7 @@
             </TextBlock>
         </Grid>
 
-        <Grid Width="400" Height="25"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="318">
+        <Grid Width="400" Height="25"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="208">
             <Grid.RowDefinitions>
                 <RowDefinition/>
             </Grid.RowDefinitions>

+ 2 - 2
Venus/Venus_MainPages/Views/OverVenusSEView.xaml

@@ -116,8 +116,8 @@
                 </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe>
 
-            <TextBlock Text="VN22" Canvas.Left="280" Canvas.Top="90"/>
-            <customControls:CommonValveControl Status="{Binding PVN22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="288" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVN22" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <TextBlock Text="VN22" Canvas.Left="123" Canvas.Top="96" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <customControls:CommonValveControl Status="{Binding PVN22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="128" Canvas.Top="113" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVN22" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
 

+ 1 - 1
Venus/Venus_RT/Devices/JetVenusDEPM.cs

@@ -868,7 +868,7 @@ namespace Venus_RT.Devices
             }
             
             //SetSlitDoor(false, out _);
-            OpenValve(ValveType.PVN22, true);
+            //OpenValve(ValveType.PVN22, true);
         }
 
         public override void OnOffChiller(ChillerType chillerType, bool onoff)

+ 1 - 1
Venus/Venus_RT/Devices/JetVenusSEPM.cs

@@ -873,7 +873,7 @@ namespace Venus_RT.Devices
             }
 
             //SetSlitDoor(false, out _);
-            OpenValve(ValveType.PVN22, true);
+            //OpenValve(ValveType.PVN22, true);
         }
 
         public override void OnOffChiller(ChillerType chillerType, bool onoff)

+ 6 - 2
Venus/Venus_RT/Modules/PMs/PMGasVerificationRoutine.cs

@@ -228,10 +228,14 @@ namespace Venus_RT.Modules.PMs
         private void OpenPVNVlv(int mfcIndex, bool on)
         {
             ValveType[] vlvs = new ValveType[] { ValveType.PV11, ValveType.PV21, ValveType.PV31, ValveType.PV41 };
-            if(mfcIndex < 4)
+            if (_chamber.ChamberType == JetChamber.VenusSE|| _chamber.ChamberType == JetChamber.VenusDE)
             {
-                _chamber.OpenValve(vlvs[mfcIndex], on);
+                vlvs = new ValveType[] { ValveType.PV11, ValveType.PV21, ValveType.PV31, ValveType.PV41,ValveType.PV51,ValveType.PV61,ValveType.PV71,ValveType.PV81, ValveType.PV91, ValveType.PVA1, ValveType.PVB1, ValveType.PVC1, };
             }
+            //    if (mfcIndex < 4)
+            //{
+                _chamber.OpenValve(vlvs[mfcIndex], on);
+            //}
         }
 
         private bool FlowGas()

+ 5 - 1
Venus/Venus_RT/Modules/PMs/PMHomeRoutine.cs

@@ -44,7 +44,7 @@ namespace Venus_RT.Modules.PMs
 
         private bool IsHomed()
         {
-            if (_chamber.ChamberType == JetChamber.Venus || _chamber.ChamberType == JetChamber.Kepler2300 || _chamber.ChamberType == JetChamber.VenusSE || _chamber.ChamberType == JetChamber.VenusDE)
+            if (_chamber.ChamberType == JetChamber.Venus || _chamber.ChamberType == JetChamber.Kepler2300)
             {
                 return _chamber.IsSlitDoorClosed && _chamber.LiftPinPosition == Venus_Core.MovementPosition.Down && _chamber.PVN22ValveIsOpen;
 
@@ -54,6 +54,10 @@ namespace Venus_RT.Modules.PMs
                 return _chamber.IsSlitDoorClosed && _chamber.PVN22ValveIsOpen;
 
             }
+            else if(_chamber.ChamberType == JetChamber.VenusSE || _chamber.ChamberType == JetChamber.VenusDE) 
+            {
+                return _chamber.IsSlitDoorClosed && _chamber.LiftPinPosition == Venus_Core.MovementPosition.Down;
+            }
             return false;
         }
     }

+ 8 - 0
Venus/Venus_RT/Modules/PMs/VentRoutine.cs

@@ -80,6 +80,10 @@ namespace Venus_RT.Modules.PMs
         private bool ClosePVValves()
         {
             _chamber.OpenValve(ValveType.Guage, false);
+            if (_chamber.ChamberType == JetChamber.VenusSE || _chamber.ChamberType == JetChamber.VenusDE) 
+            {
+                _chamber.OpenValve(ValveType.PVN22, true);
+            }
             if (_chamber.PendulumValveIsOpen())
             {
                 return _chamber.TurnPendulumValve(false);
@@ -90,6 +94,10 @@ namespace Venus_RT.Modules.PMs
 
         private bool CloseVentGasFinalValves()
         {
+            if (_chamber.ChamberType == JetChamber.VenusSE || _chamber.ChamberType == JetChamber.VenusDE)
+            {
+                _chamber.OpenValve(ValveType.PVN22,false);
+            }
             _chamber.OpenValve(ValveType.GasFinal, false);
             _chamber.OpenValve(ValveType.N2, false);
             return true;

+ 31 - 31
Venus/Venus_RT/Modules/TM/VenusEntity/SEMFPMSwapRoutine.cs

@@ -1,4 +1,6 @@
-using Aitex.Core.RT.Log;
+using Aitex.Core.Common.DeviceData;
+using Aitex.Core.RT.Device;
+using Aitex.Core.RT.Log;
 using Aitex.Core.RT.Routine;
 using Aitex.Core.RT.SCCore;
 using Aitex.Core.Util;
@@ -50,7 +52,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
         private Hand _pickHand;
         private Hand _placeHand;
 
-        public SEMFPMSwapRoutine(HongHuTM tm,ITransferRobot robot) : base(ModuleName.TMRobot)
+        public SEMFPMSwapRoutine(HongHuTM tm, ITransferRobot robot) : base(ModuleName.TMRobot)
         {
             _TM = tm;
             _robot = robot;
@@ -108,22 +110,23 @@ namespace Venus_RT.Modules.TM.VenusEntity
 
         public RState Monitor()
         {
-            Runner.Wait(SwapStep.WaitPMReady,       () => _pmModule.IsIdle,         _delay_60s)
+            Runner.Wait(SwapStep.WaitPMReady, () => _pmModule.IsIdle, _delay_60s)
                 //.RunIf(SwapStep.PreRotation, _JetTM.PreRotateModules.ContainsKey(_targetModule), RotateArm, WaitRotateDone)
-                .Run(SwapStep.PickPrepare,          PickPrepare,                    IsModuleReadyForPick)
-                .Run(SwapStep.PickExtend,           PickExtend,                     WaitRobotExtendDone)
-                .Run(SwapStep.DropDownWafer,        NotifyPMPickWafer,              WaitPMWaferDropDown)
-                .Delay(SwapStep.PickDelay,          _pickDelayTime)
-                .Run(SwapStep.PickRetract,          PickRetract,                    WaitRobotRetractDone)
-                .Run(SwapStep.PlacePrepare,         PlacePrepare,                   IsModuleReadyForPlace)
-                .Run(SwapStep.PlaceExtend,          PlaceExtend,                    WaitRobotExtendDone)
-                .Run(SwapStep.LiftUpWafer,          NotifyLiftUpWafer,              WaitPMWaferLiftUp)
-                .Delay(SwapStep.PlaceDelay,                                         _placeDelayTime)
-                .Run(SwapStep.PlaceRetract,         PlaceRetract,                   WaitRobotRetractDone)
-                .Run(SwapStep.NotifyDone,           NotifyPMDone,                   _delay_50ms)
-                .Delay(SwapStep.PlaceDelay,         _delay_50ms)
-                .Run(SwapStep.EndDone,              PMDoorClose,                    WaitPMDoorClose)
-                .End(SwapStep.EndDelay,             NullFun,                        _delay_50ms);
+                .Run(SwapStep.PickPrepare, PickPrepare, IsModuleReadyForPick)
+                .Run(SwapStep.PickExtend, PickExtend, WaitRobotExtendDone)
+                .Run(SwapStep.DropDownWafer, NotifyPMPickWafer, WaitPMWaferDropDown)
+                .Delay(SwapStep.PickDelay, _pickDelayTime)
+                .Run(SwapStep.PickRetract, PickRetract, WaitRobotRetractDone)
+                .Run(SwapStep.PlacePrepare, PlacePrepare, IsModuleReadyForPlace)
+                .Run(SwapStep.PlaceExtend, PlaceExtend, WaitRobotExtendDone)
+                .Run(SwapStep.LiftUpWafer, NotifyLiftUpWafer, WaitPMWaferLiftUp)
+                .Delay(SwapStep.PlaceDelay, _placeDelayTime)
+                .Run(SwapStep.PlaceRetract, PlaceRetract, WaitRobotRetractDone)
+                .Run(SwapStep.NotifyDone, NotifyPMDone, _delay_50ms)
+                .Delay(SwapStep.PlaceDelay, _delay_50ms)
+                .Run(SwapStep.EndDone, CheckDoorClose, WaitPMDoorClose, 5000)
+                .End(SwapStep.EndDelay, NullFun, _delay_50ms);
+
 
             return Runner.Status;
         }
@@ -131,13 +134,13 @@ namespace Venus_RT.Modules.TM.VenusEntity
         private bool PickPrepare()
         {
             _pmModule.PostMsg(PMEntity.MSG.PreparePick);
-            _TM.TurnSlitDoor(_targetModule, true);
+            //_TM.TurnSlitDoor(_targetModule, true);
             return true;
         }
         private bool PlacePrepare()
         {
             _pmModule.PostMsg(PMEntity.MSG.PreparePlace);
-            _TM.TurnSlitDoor(_targetModule, true);
+            //_TM.TurnSlitDoor(_targetModule, true);
             return true;
         }
 
@@ -266,18 +269,10 @@ namespace Venus_RT.Modules.TM.VenusEntity
             return true;
         }
 
-        private bool PMDoorClose()
+        private bool CheckDoorClose()
         {
-            if (!_TM.CheckSlitValveClose(_targetModule))
-            {
-                LOG.Write(eEvent.WARN_TM, Module, $"PMSwap Close Door Again");
-                return _TM.TurnSlitDoor(_targetModule, false);
-            }
-            else
-            {
-                LOG.Write(eEvent.WARN_TM, Module, $"PMSwap has Close {_targetModule} Door");
-                return true;
-            }
+            LOG.Write(eEvent.WARN_TM, Module, $"PMSwap Close Door Again");
+            return _TM.TurnSlitDoor(_targetModule, false);
         }
 
         private bool WaitPMDoorClose()
@@ -289,7 +284,12 @@ namespace Venus_RT.Modules.TM.VenusEntity
             }
             else
             {
-                LOG.Write(eEvent.WARN_TM, Module, $"PMSwap Check not Close Door");
+                if (DEVICE.GetDevice<IoCylinder>($"SETM.{_targetModule}SlitDoor").SetPoint != (int)CylinderState.Close)
+                {
+                    LOG.Write(eEvent.WARN_TM, Module, $"PMSwap {_targetModule}SlitDoor set close again");
+                    DEVICE.GetDevice<IoCylinder>($"SETM.{_targetModule}SlitDoor").SetCylinder(false, out string reason);
+                }
+                //LOG.Write(eEvent.WARN_TM, Module, $"PMSwap Check not Close Door");
                 return false;
             }
         }

+ 1 - 1
Venus/Venus_Simulator/Config/_ioDefineVenusSE.xml

@@ -169,7 +169,7 @@
     <DO_ITEM Index="47" Name="DO_Slit_Door_Open_Enable" Device="" Addr="w2.15"/>
     <DO_ITEM Index="49" Name="DO_He_ISO" Device="PV9" Addr="w3.01" />
     <DO_ITEM Index="50" Name="DO_Second_Purge_Valve" Device="PV13" Addr="w3.02"/>
-    <DO_ITEM Index="51" Name="" />
+    <DO_ITEM Index="51" Name="DO_Chamber_Purge"  Device="PV14" Addr="w3.03"/>
     <DO_ITEM Index="52" Name="DO_MFC9_Valve" Device="GPV9" Addr="w3.04" />
     <DO_ITEM Index="53" Name="DO_MFC10_Valve" Device="GPV10" Addr="w3.05" />
     <DO_ITEM Index="54" Name="DO_MFC11_Valve" Device="GPV11" Addr="w3.06" />