修复钟摆阀状态错误bug

# Conflicts:
#	Venus/Venus_RT/Config/System.sccfg

Venus/Venus_MainPages/ViewModels/TopViewModel.cs

@@ -257,15 +257,15 @@ namespace Venus_MainPages.ViewModels
         #region 构造函数
         public TopViewModel()
         {
-            JetChamber selectedChamber = (JetChamber)(Convert.ToInt32(QueryDataClient.Instance.Service.GetConfig("System.ChamberSelect")));
-            if (selectedChamber == JetChamber.Venus)
-            {
-                Title = "Venus";
-            }
-            else
-            {
-                Title = "Kepler";
-            }
+            //JetChamber selectedChamber = (JetChamber)(Convert.ToInt32(QueryDataClient.Instance.Service.GetConfig("System.ChamberSelect")));
+            //if (selectedChamber == JetChamber.Venus)
+            //{
+            //    Title = "Venus";
+            //}
+            //else
+            //{
+            //    Title = "Kepler";
+            //}
             //Title = selectedChamber.ToString();
             m_SoftwareVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
 

Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -301,8 +301,8 @@
                         </TextBlock>
 
                         <StackPanel Orientation="Horizontal">
-                            <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding LoadWaferCommand}"   CommandParameter="LP1"  Visibility="{Binding RtDataValues[LP1.CassettePlaced],Converter={StaticResource boolToVisibility3}}" IsEnabled="{Binding RtDataValues[LP1.IsLoaded],Converter={StaticResource BoolToBool}}"/>
-                            <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP1"  Visibility="{Binding RtDataValues[LP1.CassettePlaced],Converter={StaticResource boolToVisibility3}}" IsEnabled="{Binding RtDataValues[LP1.IsLoaded]}"/>
+                            <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding LoadWaferCommand}"   CommandParameter="LP1"   IsEnabled="{Binding RtDataValues[LP1.IsLoaded],Converter={StaticResource BoolToBool}}"/>
+                            <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP1"   IsEnabled="{Binding RtDataValues[LP1.IsLoaded]}"/>
                         </StackPanel>
                         
 
@@ -318,8 +318,8 @@
                             </TextBlock.Text>
                         </TextBlock>
                         <StackPanel Orientation="Horizontal">
-                            <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding LoadWaferCommand}" CommandParameter="LP2"   Visibility="{Binding RtDataValues[LP2.CassettePlaced],Converter={StaticResource boolToVisibility3}}" IsEnabled="{Binding RtDataValues[LP2.IsLoaded],Converter={StaticResource BoolToBool}}"/>
-                            <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="5,5,0,0" Width="80" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP2" Visibility="{Binding RtDataValues[LP2.CassettePlaced],Converter={StaticResource boolToVisibility3}}" IsEnabled="{Binding RtDataValues[LP2.IsLoaded]}"/>
+                            <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding LoadWaferCommand}" CommandParameter="LP2"    IsEnabled="{Binding RtDataValues[LP2.IsLoaded],Converter={StaticResource BoolToBool}}"/>
+                            <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="5,5,0,0" Width="80" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP2"  IsEnabled="{Binding RtDataValues[LP2.IsLoaded]}"/>
                         </StackPanel>
                            
 
@@ -335,8 +335,8 @@
                                 </TextBlock.Text>
                         </TextBlock>
                         <StackPanel Orientation="Horizontal">
-                            <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding LoadWaferCommand}" CommandParameter="LP3"   Visibility="{Binding RtDataValues[LP3.CassettePlaced],Converter={StaticResource boolToVisibility3}}"  IsEnabled="{Binding RtDataValues[LP3.IsLoaded],Converter={StaticResource BoolToBool}}"/>
-                            <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP3" Visibility="{Binding RtDataValues[LP3.CassettePlaced],Converter={StaticResource boolToVisibility3}}"  IsEnabled="{Binding RtDataValues[LP3.IsLoaded]}"/>
+                            <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding LoadWaferCommand}" CommandParameter="LP3"     IsEnabled="{Binding RtDataValues[LP3.IsLoaded],Converter={StaticResource BoolToBool}}"/>
+                            <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="0,5,0,0" Width="80" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP3"   IsEnabled="{Binding RtDataValues[LP3.IsLoaded]}"/>
                         </StackPanel>
 
                            

Venus/Venus_MainPages/Views/OverKepler2200AView.xaml

@@ -93,25 +93,7 @@
         </Grid>
         <!--</Border>-->
 
-        <Grid Height="33" Canvas.Left="500" Canvas.Top="550" Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="100"/>
-                <ColumnDefinition Width="100"/>
-                <ColumnDefinition Width="100"/>
-                <ColumnDefinition Width="80"/>
-
-
-            </Grid.ColumnDefinitions>
-            <TextBlock Text="Heater Position" Width="100" Padding="4,8,0,0"/>
-            <ComboBox Grid.Column="1" SelectedIndex="0"  Height="25" Margin="1,2,0,2" SelectedValue="{Binding SelectedPosition}">
-                <ComboBoxItem>Origin</ComboBoxItem>
-                <ComboBoxItem>Position1</ComboBoxItem>
-                <ComboBoxItem>Position2</ComboBoxItem>
-                <ComboBoxItem>Position3</ComboBoxItem>
-            </ComboBox>
-            <TextBlock Grid.Column="2" Text="{Binding HighTemperatureHeaterData.HighTemperatureHeaterPosition}"  Width="100" Padding="30,8,0,0"/>
-            <Button    Grid.Column="3" Content="Set" Width="60" Style="{x:Null}" Height="25" Cursor="Hand" Command="{Binding GotoPositionCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
-        </Grid>
+        
        
         <Canvas Canvas.Top="40" >
            
@@ -279,7 +261,7 @@
 
 
             <!--与chamber上方连接的管道-->
-            <ctrls:FlowPipe  Height="8"  Width="440" Canvas.Left="482" Canvas.Top="120">
+            <ctrls:FlowPipe  Height="8"  Width="480" Canvas.Left="482" Canvas.Top="120">
                 <ctrls:FlowPipe.IsFlowing>
                     <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                         <Binding Path="GasFinalValveIsOpen"/>
@@ -299,7 +281,7 @@
             <TextBlock Text="Gas Final" Canvas.Left="700" Canvas.Top="90" FontSize="15"/>
             <customControls:CommonValveControl Status="{Binding GasFinalValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="722" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="21" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
-            <ctrls:Pipe2    Canvas.Left="920" Canvas.Top="120" HorizontalAlignment="Left" VerticalAlignment="Top"  />
+            <ctrls:Pipe2    Canvas.Left="960" Canvas.Top="120" HorizontalAlignment="Left" VerticalAlignment="Top"  />
                             
            
             <ctrls:FlowPipe Name="l8" Height="8"  Width="56" Canvas.Left="490" Canvas.Top="126"  RotateTransformValue="90" IsReverse="True">
@@ -400,7 +382,7 @@
                     </MultiBinding>
                 </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe>-->
-            <ctrls:FlowPipe  Height="8"  Width="110" Canvas.Left="933" Canvas.Top="129" RotateTransformValue="90">
+            <ctrls:FlowPipe  Height="8"  Width="110" Canvas.Left="973" Canvas.Top="129" RotateTransformValue="90">
                 <ctrls:FlowPipe.IsFlowing>
                     <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                         <Binding Path="GasFinalValveIsOpen"/>
@@ -482,8 +464,8 @@
 
             
 
-            <Ellipse Width="20" Height="20" Fill="{Binding GasIsFlowing,Converter={StaticResource boolToColor}}"  Canvas.Left="260" Canvas.Top="538" Stroke="Silver" StrokeThickness="2"/>
-            <Button  Width="100" Content="Gas ON/OFF" Canvas.Left="290" Canvas.Top="540" Style="{StaticResource SysBtnStyle}"  Command="{Binding GasCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+            <Ellipse Width="20" Height="20" Fill="{Binding GasIsFlowing,Converter={StaticResource boolToColor}}"  Canvas.Left="360" Canvas.Top="538" Stroke="Silver" StrokeThickness="2"/>
+            <Button  Width="100" Content="Gas ON/OFF" Canvas.Left="390" Canvas.Top="540" Style="{StaticResource SysBtnStyle}"  Command="{Binding GasCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
             <TextBlock FontSize="13" Text="Vent N2" Canvas.Left="10" Canvas.Top="117" Foreground="Black"  Block.TextAlignment="Right" Width="50"/>
             <TextBlock FontSize="13" Canvas.Left="-5" Canvas.Top="227" Block.TextAlignment="Right" MaxWidth="65">
                 <TextBlock.Text>
@@ -559,17 +541,17 @@
             <RadioButton Canvas.Left="890" Canvas.Top="684" Content="Pressure Mode" FontSize="15" IsChecked="{Binding HeIsPressureMode}"/>-->
 
             <!--与chamber右上角连接的管道-->
-            <ctrls:FlowPipe  Height="8"  Width="40" Canvas.Left="1192" Canvas.Top="275"  RotateTransformValue="90" />
-            <ctrls:FlowPipe  Height="8"  Width="126" Canvas.Left="1180" Canvas.Top="192"  RotateTransformValue="90" />
-            <ctrls:Pipe2     Canvas.Left="1184" Canvas.Top="285" HorizontalAlignment="Left" VerticalAlignment="Top" RotateTransformValue="-90" />
+            <ctrls:FlowPipe  Height="8"  Width="40" Canvas.Left="1232" Canvas.Top="275"  RotateTransformValue="90" />
+            <ctrls:FlowPipe  Height="8"  Width="126" Canvas.Left="1220" Canvas.Top="192"  RotateTransformValue="90" />
+            <ctrls:Pipe2     Canvas.Left="1224" Canvas.Top="285" HorizontalAlignment="Left" VerticalAlignment="Top" RotateTransformValue="-90" />
 
-            <ctrls:FlowPipe  Height="8"  Width="80" Canvas.Left="1182" Canvas.Top="182"   />
-            <ctrls:FlowPipe  Height="8"  Width="70" Canvas.Left="1194" Canvas.Top="272"   />
-            <TextBlock Text="Guage" Canvas.Left="1202" Canvas.Top="248"/>
+            <ctrls:FlowPipe  Height="8"  Width="80" Canvas.Left="1222" Canvas.Top="182"   />
+            <ctrls:FlowPipe  Height="8"  Width="70" Canvas.Left="1234" Canvas.Top="272"   />
+            <TextBlock Text="Guage" Canvas.Left="1242" Canvas.Top="248"/>
 
-            <customControls:CommonValveControl   ValveOrientation="Horizontal" Status="{Binding GuageValveIsOpen,Mode=TwoWay}" Height="20" Width="20" Canvas.Left="1210" Canvas.Top="265" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="27" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl   ValveOrientation="Horizontal" Status="{Binding GuageValveIsOpen,Mode=TwoWay}" Height="20" Width="20" Canvas.Left="1250" Canvas.Top="265" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="27" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
-            <Border    BorderBrush="Gray"  BorderThickness="0"  Width="18" Height="6" Canvas.Left="1245" Canvas.Top="164" >
+            <Border    BorderBrush="Gray"  BorderThickness="0"  Width="18" Height="6" Canvas.Left="1285" Canvas.Top="164" >
                 <Border.RenderTransform>
                     <RotateTransform Angle="90"/>
                 </Border.RenderTransform>
@@ -581,7 +563,7 @@
                     </LinearGradientBrush>
                 </Border.Background>
             </Border>
-            <Border    BorderBrush="Gray"  BorderThickness="0"  Width="20" Height="6" Canvas.Left="1215" Canvas.Top="188" >
+            <Border    BorderBrush="Gray"  BorderThickness="0"  Width="20" Height="6" Canvas.Left="1255" Canvas.Top="188" >
                 <Border.RenderTransform>
                     <RotateTransform Angle="90"/>
                 </Border.RenderTransform>
@@ -593,11 +575,11 @@
                     </LinearGradientBrush>
                 </Border.Background>
             </Border>
-            <Ellipse Width="20" Height="20"  Canvas.Left="1232" Canvas.Top="150" Fill="{Binding IsATM,Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
-            <Ellipse Width="20" Height="20"  Canvas.Left="1202" Canvas.Top="200" Fill="{Binding IsVAC,Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
-            <TextBlock Text="ATM" Canvas.Left="1230" Canvas.Top="134"/>
-            <TextBlock Text="VAC" Canvas.Left="1200" Canvas.Top="220"/>
-            <ctrls:Pipe2     Canvas.Left="1172" Canvas.Top="195" HorizontalAlignment="Left" VerticalAlignment="Top" RotateTransformValue="-90" />
+            <Ellipse Width="20" Height="20"  Canvas.Left="1272" Canvas.Top="150" Fill="{Binding IsATM,Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="20" Height="20"  Canvas.Left="1242" Canvas.Top="200" Fill="{Binding IsVAC,Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <TextBlock Text="ATM" Canvas.Left="1270" Canvas.Top="134"/>
+            <TextBlock Text="VAC" Canvas.Left="1240" Canvas.Top="220"/>
+            <ctrls:Pipe2     Canvas.Left="1212" Canvas.Top="195" HorizontalAlignment="Left" VerticalAlignment="Top" RotateTransformValue="-90" />
 
 
 
@@ -747,8 +729,8 @@
           
 
             <!--chamber管道标签-->
-            <ctrls:TextboxWithLabel  Canvas.Top="156" Canvas.Left="1256" LabelValue="CM2(mTorr)" TextBoxValue="{Binding ProcessHighPressure,StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
-            <ctrls:TextboxWithLabel  Canvas.Top="248" Canvas.Left="1248" LabelValue="CM1(mTorr)" TextBoxValue="{Binding ProcessLowPressure,StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
+            <ctrls:TextboxWithLabel  Canvas.Top="156" Canvas.Left="1296" LabelValue="CM2(mTorr)" TextBoxValue="{Binding ProcessHighPressure,StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
+            <ctrls:TextboxWithLabel  Canvas.Top="248" Canvas.Left="1288" LabelValue="CM1(mTorr)" TextBoxValue="{Binding ProcessLowPressure,StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
             <!--<ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="880"  LabelValue="Pressure(mTorr)" TextBoxValue="{Binding HePressureSetpoint,Mode=TwoWay}" TextBoxColor="White" IsReadOnly="False"/>-->
             <!--<ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="820" TextBoxValue="{Binding HeGasSetpoint,Mode=TwoWay}"    LabelValue="Flow(sccm)/Pressure(Torr)"  TextBoxColor="White" IsReadOnly="False"/>-->
             <!--<Ellipse Width="20" Height="20"  Canvas.Top="651.5" Canvas.Left="775" Fill="{Binding MFCHeData.IsWarning,Converter={StaticResource boolToColor4}}"  Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>-->
@@ -793,13 +775,13 @@
                 <TextBlock Text="Foreline Heater"/>
                 <Button Height="18" Width="50" Content="{Binding ForelineHeaterData.FeedBack}" ToolTip="{Binding ForelineHeaterData,Converter={StaticResource HeaterToStringConverter}}" Foreground="White" ContentStringFormat="F1"  Background="{Binding ForelineHeaterData.IsPowerOnSetPoint,Converter={StaticResource boolToColor5}}" Style="{x:Null}" Command="{Binding HeaterCommand}" CommandParameter="{Binding ForelineHeaterData}" Cursor="Hand" />
             </StackPanel>
-            <StackPanel Canvas.Top="320" Canvas.Left="1210" Orientation="Vertical">
+            <StackPanel Canvas.Top="320" Canvas.Left="1250" Orientation="Vertical">
                 <TextBlock Text="Wall Heater"/>
                 <Button Height="18" Width="50" Content="{Binding WallHeaterData.FeedBack}" ToolTip="{Binding WallHeaterData,Converter={StaticResource HeaterToStringConverter}}" Foreground="White"  ContentStringFormat="F1" Background="{Binding WallHeaterData.IsPowerOnSetPoint,Converter={StaticResource boolToColor5}}" Style="{x:Null}" Command="{Binding HeaterCommand}" CommandParameter="{Binding WallHeaterData}" Cursor="Hand"/>
             </StackPanel>
 
             <!--Chamber-->
-            <ctrls:Chamber Canvas.Left="960" Canvas.Top="224" 
+            <ctrls:Chamber Canvas.Left="1000" Canvas.Top="224" 
                        IsLiftPinUp="{Binding LiftPinIsUp}" 
                        IsOpenSlitDoor="{Binding IsSlitDoorClosed,Converter={StaticResource BoolToBool}}" 
                        IsLidOpen="{Binding IsLidClosed,Converter={StaticResource BoolToBool}}"  
@@ -812,16 +794,7 @@
                        IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"
                         />
 
-            <!--<Ellipse Width="20" Height="20" Fill="{Binding LiftPinIsUp,Converter={StaticResource boolToColor}}"  Canvas.Left="1065" Canvas.Top="466" Stroke="Silver" StrokeThickness="2"/>
-            <Button Height="20" Width="100" Content="Pin Up" Canvas.Left="1100" Canvas.Top="466" Command="{Binding PinUpDownCommand}" CommandParameter="True" Style="{StaticResource SysBtnStyle}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
-            <Ellipse Width="20" Height="20" Fill="{Binding LiftPinIsUp,Converter={StaticResource boolToColor2}}" Canvas.Left="1065" Canvas.Top="490" Stroke="Silver" StrokeThickness="2"/>
-            <Button Height="20" Width="100" Content="Pin Down" Canvas.Left="1100" Canvas.Top="490" Command="{Binding PinUpDownCommand}" CommandParameter="False" Style="{StaticResource SysBtnStyle}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>-->
-
-
-            <!--<Ellipse Width="20" Height="20" Fill="{Binding IsLidClosed,Converter={StaticResource boolToColor2}}"  Canvas.Left="1280" Canvas.Top="366" Stroke="Silver" StrokeThickness="2"/>
-            <Button Height="20" Width="70" Content="Lid Up"                                                      Canvas.Left="1310" Canvas.Top="366" Command="{Binding LidUpDownCommand}" CommandParameter="Up" Style="{StaticResource SysBtnStyle}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
-            <Ellipse Width="20" Height="20" Fill="{Binding IsLidClosed,Converter={StaticResource boolToColor}}" Canvas.Left="1280" Canvas.Top="390" Stroke="Silver" StrokeThickness="2"/>
-            <Button Height="20" Width="70" Content="Lid Down"                                                    Canvas.Left="1310" Canvas.Top="390" Command="{Binding LidUpDownCommand}" CommandParameter="Down" Style="{StaticResource SysBtnStyle}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>-->
+          
 
             <ctrls:Pump Canvas.Top="700"  Canvas.Left="1245" Width="35" Height="35" IsOpen="{Binding PumpIsOpen,Mode=TwoWay}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}">
                 <ctrls:Pump.ContextMenu>
@@ -839,8 +812,8 @@
 
             <!--<Button Width="120" Height="30" Content="Flash"  Canvas.Left="700" Canvas.Top="100" Command="{Binding LoadRecipeCommand}" IsEnabled="{Binding IsAutoMode}" Style="{x:Null}"/>-->
             <!--<TextBlock Background="Silver"  Height="30" Width="230" Canvas.Left="820" Canvas.Top="100" Text="{Binding SelectedRecipe}" TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,7,0,0"/>-->
-            <TextBox  Width="140" Height="30" Text="Recipe:"  Canvas.Left="700" Canvas.Top="100" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="15" IsReadOnly="True" Background="Transparent"/>
-            <Border Width="210" Height="28"  Canvas.Left="840" Canvas.Top="101" BorderBrush="Black" BorderThickness=".7">
+            <TextBox  Width="140" Height="30" Text="Recipe:"  Canvas.Left="700" Canvas.Top="150" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="15" IsReadOnly="True" Background="Transparent"/>
+            <Border Width="210" Height="28"  Canvas.Left="840" Canvas.Top="151" BorderBrush="Black" BorderThickness=".7">
                 <ComboBox  ItemsSource="{Binding CurrentModuleRecipes}" SelectedItem="{Binding SelectedRecipe}" IsEnabled="{Binding IsAutoMode}" Style="{StaticResource customeComboBoxStyle}" BorderBrush="White" FontSize="15">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="DropDownOpened">
@@ -850,9 +823,9 @@
                 </ComboBox>
             </Border>
 
-            <customControls:PathButton Width="120" Height="30" Content="Start"  Canvas.Left="1100" Canvas.Top="100" IsEnabled="{Binding IsAutoMode}" Command="{Binding RunRecipeCommand}"/>
+            <customControls:PathButton Width="120" Height="30" Content="Start"  Canvas.Left="1100" Canvas.Top="150" IsEnabled="{Binding IsAutoMode}" Command="{Binding RunRecipeCommand}"/>
 
-            <Grid  Width="540" Height="400" Canvas.Left="700" Canvas.Top="150"  unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.LineThickness="1">
+            <Grid  Width="540" Height="460" Canvas.Left="700" Canvas.Top="200"  unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.LineThickness="1">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
                     <RowDefinition/>
@@ -961,7 +934,7 @@
                 <TextBlock Grid.Row="10"  Grid.Column="1" Text="{Binding MFC4Data.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 MFC5Data.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 MFC6Data.FeedBack,StringFormat='F1'}"       Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
-                <TextBlock Grid.Row="13" Grid.Column="1"  Text="Home"           Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,5,0,0"/>
+                <TextBlock Grid.Row="13" Grid.Column="1"  Text="{Binding HighTemperatureHeaterData.HighTemperatureHeaterPosition}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center"    Block.TextAlignment="Center" Padding="0,5,0,0"/>
                 <TextBlock Grid.Row="14"  Grid.Column="1" Text="{Binding SRFData.ReflectPower}"           Background="#E9EDF4"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
                 <TextBlock Grid.Row="15"  Grid.Column="1" Text="{Binding BiasMatchC1,StringFormat='F1'}"           Background="#D0D8E8"   TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center"/>
                 
@@ -1002,7 +975,7 @@
             </Grid>
 
         </Canvas>
-        <Grid Width="360" Height="190" Canvas.Left="1350" Canvas.Top="5"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
+        <Grid Width="360" Height="190" Canvas.Left="1350" Canvas.Top="45"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -1116,38 +1089,48 @@
         <Button Height="20" Width="100" Content="RF 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 HighTemperatureHeaterData.HighTemperatureHeaterIson,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="605" Stroke="Silver" StrokeThickness="2"/>
-        <Button Height="20" Width="100" Content="Heater ON/OFF" Canvas.Left="530" Canvas.Top="605"   Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Command="{Binding SwitchHighTemperatureHeaterCommand}"/>
+        <Ellipse Width="20" Height="20" Fill="{Binding HighTemperatureHeaterData.HighTemperatureHeaterIson,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="205" Stroke="Silver" StrokeThickness="2"/>
+        <Button Height="20" Width="100" Content="Heater ON/OFF" Canvas.Left="530" Canvas.Top="205"   Style="{StaticResource SysBtnStyle}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Command="{Binding SwitchHighTemperatureHeaterCommand}"/>
         
-        <Grid Width="390" Height="80"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="638">
+        <Grid Width="390" Height="120"  Background="#E8E8E8" unity:GridOptions.LineBrush="#afb4db" unity:GridOptions.ShowBorder="True" Canvas.Left="500" Canvas.Top="238">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
-
+                <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="6*"/>
+                <ColumnDefinition Width="170"/>
+                <ColumnDefinition Width="3*"/>
                 <ColumnDefinition Width="2*"/>
                 <ColumnDefinition Width="2*"/>
-                <ColumnDefinition Width="3*"/>
             </Grid.ColumnDefinitions>
 
-            <TextBlock Grid.Row="0" Text="Heater Temp.(°C)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="4,0,0,0"/>
+            <TextBlock Grid.Row="0" Text="Heater Temp.(°C)" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="4,0,0,0"/>
             <TextBox Grid.Row="0" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding HighTemperatureHeaterTemperatureSetpoint,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />
             <TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding HighTemperatureHeaterData.HighTemperatureHeaterTemperature,StringFormat='F1'}" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
-            <Button Grid.Row="0" Grid.Column="3" Margin="5,0,0,0" Height="20" Width="70"  Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"    IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
+            <Button Grid.Row="0" Grid.Column="3" Margin="5,0,5,0" Height="20"   Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"    IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
 
             <TextBlock Grid.Row="1" Text="Heater Ratio" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="4,0,0,0"/>
             <TextBox Grid.Row="1"  Grid.Column="1"  Width="Auto" Height="Auto"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />
             <TextBlock Grid.Row="1" Grid.Column="2" Text="0.0" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
-            <Button  Grid.Row="1" Grid.Column="3" Margin="5,0,0,0" Height="20" Width="70"  Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"    IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
+            <Button  Grid.Row="1" Grid.Column="3" Margin="5,0,5,0" Height="20"   Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"    IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
 
-            <TextBlock Grid.Row="2" Text="Heater Temp Range Rate" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="4,0,0,0"/>
+            <TextBlock Grid.Row="2" Text="Heater Temp Range Rate" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="4,0,0,0"/>
             <TextBox Grid.Row="2" Grid.Column="1" Width="Auto" Height="Auto"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="White"  BorderThickness="0" />
             <TextBlock Grid.Row="2" Grid.Column="2" Text="0.0" FontSize="15" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" />
-            <Button  Grid.Row="2" Grid.Column="3" Margin="5,0,0,0" Height="20" Width="70"  Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"    IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
+            <Button  Grid.Row="2" Grid.Column="3" Margin="5,0,5,0" Height="20"   Style="{x:Null}" Content="Set"             Command="{Binding SetChillerTempCommand}"    IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Cursor="Hand"/>
 
+
+            <TextBlock Grid.Row="3" Text="Heater Position" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="4,0,0,0" FontSize="14"/>
+            <ComboBox Grid.Row="3" Grid.Column="1" SelectedIndex="0"  Height="25" Margin="1,2,0,2" SelectedValue="{Binding SelectedPosition}">
+                <ComboBoxItem>Origin</ComboBoxItem>
+                <ComboBoxItem>Position1</ComboBoxItem>
+                <ComboBoxItem>Position2</ComboBoxItem>
+                <ComboBoxItem>Position3</ComboBoxItem>
+            </ComboBox>
+            <TextBlock Grid.Row="3" Grid.Column="2" Text="{Binding HighTemperatureHeaterData.HighTemperatureHeaterPosition}"   TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <Button    Grid.Row="3" Grid.Column="3" Margin="5,0,5,0" Height="20"  Content="Set"  Style="{x:Null}"  Cursor="Hand" Command="{Binding GotoPositionCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
         </Grid>
 
 

Venus/Venus_MainPages/Views/OverKepler2300View.xaml

@@ -820,7 +820,7 @@
 
             <customControls:PathButton Width="120" Height="30" Content="Start"  Canvas.Left="1100" Canvas.Top="100" IsEnabled="{Binding IsAutoMode}" Command="{Binding RunRecipeCommand}"/>
 
-            <Grid  Width="540" Height="550" Canvas.Left="700" Canvas.Top="150"  unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.LineThickness="1">
+            <Grid  Width="540" Height="500" Canvas.Left="700" Canvas.Top="150"  unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.LineThickness="1">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
                     <RowDefinition/>
@@ -840,10 +840,10 @@
                     <RowDefinition/>
                     <RowDefinition/>
                     <RowDefinition/>
+                    <!--<RowDefinition/>
                     <RowDefinition/>
                     <RowDefinition/>
-                    <RowDefinition/>
-                    <RowDefinition/>
+                    <RowDefinition/>-->
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2*"/>
@@ -933,10 +933,10 @@
                         </MultiBinding>
                     </TextBlock.Text>
                 </TextBlock>
-                <TextBlock Grid.Row="18"   Text="ESC Clamp Voltage"          Background="#E9EDF4"  Padding="10,5,0,0"  />
+                <!--<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="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"/>
@@ -955,10 +955,10 @@
                 <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 ESCHVOutputVoltage}"          Background="#E9EDF4"  TextBlock.TextAlignment="Center" Padding="0,5,0,0" Block.TextAlignment="Center" />
+                <!--<TextBlock Grid.Row="18"  Grid.Column="1" Text="{Binding ESCHVOutputVoltage}"          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="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"/>
@@ -977,10 +977,10 @@
                 <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[4].ESCClampValtage}"          Background="#E9EDF4"  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="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"/>
@@ -999,10 +999,10 @@
                 <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="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="V"          Background="#E9EDF4"  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="21"  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}"/>-->

Venus/Venus_RT/Devices/JetPMBase.cs

@@ -9,6 +9,7 @@ using Aitex.Core.RT.Device.Unit;
 using Venus_RT.Modules;
 using System;
 using FabConnect.SecsGemInterface.Application.Objects.ProcessManagement;
+using Aitex.Core.RT.SCCore;
 
 namespace Venus_RT.Devices
 {
@@ -127,12 +128,14 @@ namespace Venus_RT.Devices
         public  bool EPDCaptured => _epdClient.Captured;
         public  bool EPDConnected => _epdClient.IsEPDConnected;
 
+        public JetChamber ChamberType= JetChamber.None;
+
         public JetPMBase(ModuleName module) :  base(module.ToString(), module.ToString(), module.ToString(), module.ToString())
         {
             Module = module;
 
             _epdClient = DEVICE.GetDevice<JetEPDBase>($"{Module}.{VenusDevice.EndPoint}");
-
+            ChamberType= (JetChamber)SC.GetValue<int>($"{Module}.ChamberType");
             DATA.Subscribe($"{Name}.ForelinePressure", () => ForelinePressure);
             DATA.Subscribe($"{Name}.ProcessHighPressure", () => ProcessHighPressure);
             DATA.Subscribe($"{Name}.ProcessLowPressure", () => ProcessLowPressure);

Venus/Venus_RT/Devices/PendulumValve.cs

@@ -179,7 +179,7 @@ namespace Venus_RT.Devices
                     DeviceName = Name,
                     Module = Module,
                     Pressure = Pressure,
-                    IsOpen = IsOpen,
+                    IsOpen = IsOpen || Position>0,
                     Position = IsOpen ? Position : 0,
 
                 };
@@ -280,7 +280,11 @@ namespace Venus_RT.Devices
                         }
                         break;
                     case "C":
+                        IsOpen = false;
+                        break;
                     case "O":
+                        IsOpen = true;
+                        break;
                     case "H":
                     case "R":
                     case "S":
@@ -372,16 +376,25 @@ namespace Venus_RT.Devices
                 case Operation.GetDeviceStatus:
                     {
                         Status = data.Substring(4, 8);
-                        if(Status[1] == 'E')
+                        if (Status[1] == 'E')
                         {
                             // Fatal Error
                             _noRepeatAlarm($"Device Status error:{Status}");
                         }
-                        else if(Status[3] == '1')
+                        else if (Status[3] == '1')
                         {
                             // Warning Present
                             _noRepeatAlarm($"Device Warning Present:{Status}");
                         }
+                        else if (Status[1] == '3')
+                        {
+                            IsOpen = false;
+                        }
+                        else if (Status[1] == '4')
+                        {
+                            IsOpen = true;
+                        }
+
                     }
                     break;
                 case Operation.GetPressureSP:
@@ -403,7 +416,6 @@ namespace Venus_RT.Devices
         {
             if(_CheckStatus())
             {
-                IsOpen = postion > 0;
                 return SendCommand(Operation.SetPosition, postion * _position_unit);
             }
 
@@ -414,7 +426,7 @@ namespace Venus_RT.Devices
         {
             if(_CheckStatus())
             {
-                IsOpen = true;
+                //IsOpen = true;
                 return SendCommand(Operation.SetPressure, pressure * 1000000 / _pressure_ful_range);
             }
 
@@ -430,12 +442,6 @@ namespace Venus_RT.Devices
         {
             if(_CheckStatus(on))
             {
-                IsOpen = on;
-                if (IsOpen == false)
-                {
-                    SetPosition(0);
-                    SetPressure(0);
-                }
                 return SendCommand(on ? Operation.OpenValve : Operation.CloseValve);
             }
 

Venus/Venus_RT/Modules/PMs/PMHomeRoutine.cs

@@ -17,7 +17,7 @@ namespace Venus_RT.Modules.PMs
             Name = "PM Home";
         }
 
-        public RState  Init()
+        public RState Init()
         {
             return RState.End;
         }
@@ -43,8 +43,18 @@ namespace Venus_RT.Modules.PMs
         }
 
         private bool IsHomed()
-        {          
-            return _chamber.IsSlitDoorClosed && _chamber.LiftPinPosition == Venus_Core.MovementPosition.Down && _chamber.PVN22ValveIsOpen;
+        {
+            if (_chamber.ChamberType == JetChamber.Venus || _chamber.ChamberType == JetChamber.Kepler2300)
+            {
+                return _chamber.IsSlitDoorClosed && _chamber.LiftPinPosition == Venus_Core.MovementPosition.Down && _chamber.PVN22ValveIsOpen;
+
+            }
+            else if (_chamber.ChamberType == JetChamber.Kepler2200A)
+            {
+                return _chamber.IsSlitDoorClosed && _chamber.PVN22ValveIsOpen;
+
+            }
+            return false;
         }
     }
 }

Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -493,6 +493,10 @@ namespace Venus_RT.Modules.PMs
             _chamber.OpenValve(ValveType.TurboPumpPurge, true);
             _chamber.OpenValve(ValveType.Guage, true);
             _chamber.SetPVPostion(1000);
+            if (_jetChamber == JetChamber.Venus && _chamber.IsHVOn==true)
+            {
+                _chamber.OnOffSetESCHV(false);
+            }
             WaferManager.Instance.UpdateWaferProcessStatus(Module, 0, EnumWaferProcessStatus.Completed);
             WaferInfo waferInfo = WaferManager.Instance.GetWafer(ModuleHelper.Converter(Module.ToString()), 0);
             if (!waferInfo.IsEmpty)

Venus/Venus_RT/Modules/PMs/ProcessDefine.cs

@@ -490,6 +490,7 @@ namespace Venus_RT.Modules.PMs
             Chamber.SetESCClampVoltage(0);
             //Chamber.SetBacksideHePressure(0);
             Chamber.SetBacksideHeThreshold(0, 0);
+            //Chamber.OnOffSetESCHV(false);
         }
 
         private RState ProcessKitUnit_Start(ProcessUnitBase unit, RecipeStep step)

Venus/Venus_Simulator/Devices/PendulumValveMockPMA.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ServiceModel.Channels;
 using MECF.Framework.Simulator.Core.Driver;
 
 namespace Venus_Simulator.Devices
@@ -31,75 +32,87 @@ namespace Venus_Simulator.Devices
         {
             if (string.IsNullOrEmpty(message))
                 throw new ArgumentException("Hardware command message is invalid");
-
-            if(_bHold == false)
+            var items = message.Split('\r');
+            foreach (var item in message.Split('\r'))
             {
-                _pressure += _rd.Next(-10, 10);
-                _position += _rd.Next(-50, 50);
-            }
 
-            if(_simPendulumValveStatus == PendulumValveStatus.OFF)
-            {
-                _position = 0;
-            }
-            
-            string sRes = string.Empty;
-            string str = message.Trim();
-            switch(str)
-            {
-                case "P:":
-                    sRes = string.Format("P:{0:D8}\r\n", _pressure);
-                    break;
-                case "A:":
-                    sRes = string.Format("A:{0:D6}\r\n", _position);
-                    break;
-                case "C:":
-                    _bHold = false;
-                    _simPendulumValveStatus = PendulumValveStatus.OFF;
-                    sRes = "C:\r\n";
-                    break;
-                case "O":
-                    _bHold = false;
-                    _simPendulumValveStatus = PendulumValveStatus.ON;
-                    sRes = "O:\r\n";
-                    break;
-                case "H:":
-                    _bHold = true;
-                    sRes = "H:\r\n";
-                    break;
-                case "i:30":
-                    sRes = "i:3012100000\r\n";
-                    break;
-                default:
-                    {
-                        if (str.Contains("S:"))
-                        {
-                            int pressure;
-                            if (int.TryParse(str.Substring(2, 8), out pressure))
-                            {
-                                _pressure = pressure;
-                            }
+                if (item == "")
+                {
+                    continue;
+                }
+                string item2= item + "\r";
 
-                            _bHold = false;
-                            sRes = "S:\r\n";
-                        }
-                        else if (str.StartsWith("R:"))
+                if (_bHold == false)
+                {
+                    _pressure += _rd.Next(-10, 10);
+                    _position += _rd.Next(-50, 50);
+                }
+
+                if (_simPendulumValveStatus == PendulumValveStatus.OFF)
+                {
+                    _position = 0;
+                }
+
+                string sRes = string.Empty;
+                string str = item2.Trim();
+                switch (str)
+                {
+                    case "P:":
+                        sRes = string.Format("P:{0:D8}\r\n", _pressure);
+                        break;
+                    case "A:":
+                        sRes = string.Format("A:{0:D6}\r\n", _position);
+                        break;
+                    case "C:":
+                        _bHold = false;
+                        _simPendulumValveStatus = PendulumValveStatus.OFF;
+                        sRes = "C:\r\n";
+                        break;
+                    case "O":
+                        _bHold = false;
+                        _simPendulumValveStatus = PendulumValveStatus.ON;
+                        sRes = "O:\r\n";
+                        break;
+                    case "H:":
+                        _bHold = true;
+                        sRes = "H:\r\n";
+                        break;
+                    case "i:30":
+                        string data = _simPendulumValveStatus == PendulumValveStatus.OFF ? "3" : "4";
+                        sRes = $"i:301{data}100000\r\n";
+                        break;
+                    default:
                         {
-                            int position;
-                            if (int.TryParse(str.Substring(2, 6), out position))
+                            if (str.Contains("S:"))
                             {
-                                _position = position;
+                                int pressure;
+                                if (int.TryParse(str.Substring(2, 8), out pressure))
+                                {
+                                    _pressure = pressure;
+                                }
+
+                                _bHold = false;
+                                sRes = "S:\r\n";
                             }
+                            else if (str.StartsWith("R:"))
+                            {
+                                int position;
+                                if (int.TryParse(str.Substring(2, 6), out position))
+                                {
+                                    _position = position;
+                                }
 
-                            _bHold = false;
-                            sRes = "R:\r\n";
+                                _bHold = false;
+                                sRes = "R:\r\n";
+                            }
+                            else
+                                return;
                         }
-                        else
-                            return;
-                    }
-                    break;
-            }
+                        break;
+                }
                 OnWriteMessage(sRes);
+            }
+          
         }
     }
 }

Venus/Venus_UI/Config/UIMenu.json

@@ -94,7 +94,7 @@
         "Id": "CleanRecipe",
         "Name": "Idle Clean",
         "View": "CleanRecipeView",
-        "IsShow": "true"
+        "IsShow": "false"
       }
 
     ]
@@ -162,7 +162,7 @@
         "Id": "CleanRecipe",
         "Name": "Idle Clean",
         "View": "CleanRecipeView",
-        "IsShow": "true"
+        "IsShow": "false"
       }
 
     ]
@@ -224,7 +224,7 @@
         "Id": "CleanRecipe",
         "Name": "Idle Clean",
         "View": "CleanRecipeView",
-        "IsShow": "true"
+        "IsShow": "false"
       }
 
     ]
@@ -288,7 +288,7 @@
         "Id": "CleanRecipe",
         "Name": "Idle Clean",
         "View": "CleanRecipeView",
-        "IsShow": "true"
+        "IsShow": "false"
       }
 
     ]