bug fix av66

Furnace/FurnaceRT/Config/DisplayReplace.xml

@@ -20,14 +20,14 @@
 		<Display Name="PM1.APC.SlowRateSetPoint" DisplayName="APC.CKD.SlowRate Set" />
 		<Display Name="PM1.APC.PositionSetPoint" DisplayName="APC.CKD.ValveAngle Set" />
 		<Display Name="PM1.APC.PositionFeedback" DisplayName="APC.CKD.ValveAngle Actual" />
-		
+
 		<Display Name="PM1.BoatElevatorServo.CurrentPosition" DisplayName="Boat.BoatElevator.Real" />
 		<Display Name="PM1.BoatElevatorServo.TargetPosition" DisplayName="Boat.BoatElevator.Target" />
 		<Display Name="PM1.BoatElevatorServo.CurrentSpeed" DisplayName="Boat.BoatElevator.Speed" />
 		<Display Name="PM1.BoatRotationServo.CurrentPosition" DisplayName="Boat.BoatRotation.Real" />
 		<Display Name="PM1.BoatRotationServo.TargetPosition" DisplayName="Boat.BoatRotation.Target" />
 		<Display Name="PM1.BoatRotationServo.CurrentSpeed" DisplayName="Boat.BoatRotation.Speed" />
-		
+
 		<Display Name="PM1.ValveAV1.SetPoint" DisplayName="Valve.AV1.Set" />
 		<Display Name="PM1.ValveAV1.Feedback" DisplayName="Valve.AV1.Actual" />
 		<Display Name="PM1.ValveAV2.SetPoint" DisplayName="Valve.AV2.Set" />
@@ -193,11 +193,11 @@
 		<Display Name="PM1.ValveSV63.SetPoint" DisplayName="Valve.SV63.Set" />
 		<Display Name="PM1.ValveSV63.Feedback" DisplayName="Valve.SV63.Actual" />
 		<Display Name="PM1.ValveSV64.SetPoint" DisplayName="Valve.SV64.Set" />
-		
+
 		<Display Name="PM1.ValveSV227.Feedback" DisplayName="Valve.SV227.Actual" />
 		<Display Name="PM1.ValveSV227.SetPoint" DisplayName="Valve.SV227.Set" />
-		
-        <Display Name="PM1.HREF.SetPoint" DisplayName="Valve.HREF.Set" />
+
+		<Display Name="PM1.HREF.SetPoint" DisplayName="Valve.HREF.Set" />
 		<Display Name="PM1.HREF.Feedback" DisplayName="Valve.HREF.Actual" />
 		<Display Name="PM1.IsCEXHOn" DisplayName="Valve.IsCEXHOn" />
 		<Display Name="PM1.IsCREFOn" DisplayName="Valve.IsCREFOn" />
@@ -209,7 +209,7 @@
 		<Display Name="PM1.ValveAV202.Feedback" DisplayName="Valve.LA Backside Door.Actual" />
 		<Display Name="PM1.ValveLAExhaustDamper.SetPoint" DisplayName="Valve.LA Exhaust Damper.Set" />
 		<Display Name="PM1.ValveLAExhaustDamper.Feedback" DisplayName="Valve.LA Exhaust Damper.Actual" />
-	
+
 		<Display Name="PM1.ValveFIMS1N2Purge.SetPoint" DisplayName="Valve.FIMS1 N2 Purge.Set" />
 		<Display Name="PM1.ValveFIMS1N2Purge.Feedback" DisplayName="Valve.FIMS1 N2 Purge.Actual" />
 		<Display Name="PM1.ValveFIMS2N2Purge.SetPoint" DisplayName="Valve.FIMS2 N2 Purge.Set" />
@@ -256,9 +256,17 @@
 		<Display Name="PM1.MFC15.Feedback" DisplayName="MFC.MFC15.Actual" />
 		<Display Name="PM1.MFC16.SetPoint" DisplayName="MFC.MFC16.Set" />
 		<Display Name="PM1.MFC16.Feedback" DisplayName="MFC.MFC16.Actual" />
+		
+		<Display Name="PM1.MFC17.SetPoint" DisplayName="MFC.MFC17.Set" />
+		<Display Name="PM1.MFC17.Feedback" DisplayName="MFC.MFC17.Actual" />
+		<Display Name="PM1.MFC31.SetPoint" DisplayName="MFC.MFC31.Set" />
+		<Display Name="PM1.MFC31.Feedback" DisplayName="MFC.MFC31.Actual" />
+		<Display Name="PM1.MFC32.SetPoint" DisplayName="MFC.MFC32.Set" />
+		<Display Name="PM1.MFC32.Feedback" DisplayName="MFC.MFC32.Actual" />
+		
 		<Display Name="PM1.MFC51.SetPoint" DisplayName="MFC.MFC51.Set" />
 		<Display Name="PM1.MFC51.Feedback" DisplayName="MFC.MFC51.Actual" />
-	
+
 		<Display Name="System.HeaterU.TempFeedback" DisplayName="Heater.U.Actual" />
 		<Display Name="System.HeaterU.TempSetPoint" DisplayName="Heater.U.Set" />
 		<Display Name="System.HeaterU.CascadePV" DisplayName="Heater.U.Cascade PV" />
@@ -319,7 +327,7 @@
 		<Display ColName="PS132(act)" Name="PM1.Tank1Pressure.Value" DisplayName="Pressure.PS132.Actual" />
 		<Display ColName="PS135(act)" Name="PM1.Tank2Pressure.Value" DisplayName="Pressure.PS135.Actual" />
 		<Display ColName="O2(act)" Name="PM1.ConcentrationO2.Value" DisplayName="Pressure.O2.Actual" />
-		
+
 		<Display ColName="APCPressure(set)" Name="PM1.APC.PressureSetPoint" DisplayName="APC.CKD.Pressure Set" />
 		<Display ColName="APCSensor1(act)" Name="PM1.APC.Pressure1Feedback" DisplayName="APC.CKD.Sensor1" />
 		<Display ColName="APCSensor2(act)" Name="PM1.APC.Pressure2Feedback" DisplayName="APC.CKD.Sensor2" />

Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -1513,8 +1513,8 @@
 		<IoValve id="ValveAV63" doOpen="DO_FIMS1N2PurgeValveOpen" doClose="DO_FIMS1N2PurgeValveClose" display="ValveAV63" schematicId="" isNc="true" isDefaultOpen="false"/>
 		<IoValve id="ValveAV64" doOpen="DO_FIMS2N2PurgeValveOpen" doClose="DO_FIMS2N2PurgeValveClose" display="ValveAV64" schematicId="" isNc="true" isDefaultOpen="false"/>
 
-		<IoValve id="ValveAV65" doOpen="DO_FFUAirInValveOpen" doClose="DO_FFUAirInValveClose" diOpenSensor="DI_AV65FFUAirInOpened" diCloseSensor="DI_AV65FFUAirInClosed" display="ValveAV65" schematicId="" ILKDi="DI_AV65ILK"  isNc="true" isDefaultOpen="false"/>
-		<IoValve id="ValveAV66" diOpenSensor="DI_AV66CommonExhaustOpened" diCloseSensor="DI_AV66CommonExhaustClosed"  doOpen="DO_LAExhaustValveOpen" doClose="DO_LAExhaustValveClose" display="ValveAV66" ILKDi="DI_AV66ILK" schematicId="" isNc="true" isDefaultOpen="false"/>
+		<IoValve id="ValveAV65" doOpen="DO_FFUAirInValveOpen" doClose="DO_FFUAirInValveClose"  display="ValveAV65" schematicId="" ILKDi="DI_AV65ILK"  isNc="true" isDefaultOpen="false"/>
+		<IoValve id="ValveAV66"  doOpen="DO_LAExhaustValveOpen" doClose="DO_LAExhaustValveClose" display="ValveAV66" ILKDi="DI_AV66ILK" schematicId="" isNc="true" isDefaultOpen="false"/>
 		<IoValve id="ValveAV67" diOpen="" doOpen="DO_ValveAV67" display="ValveAV67" schematicId="" ILKDi="DI_AV67ILK" isNc="true" isDefaultOpen="false"/>
 		<IoValve id="ValveAV68" diOpen="" doOpen="DO_ValveAV68" display="ValveAV68" schematicId="" ILKDi="DI_AV68ILK" isNc="true" isDefaultOpen="false"/>
 		<IoValve id="ValveAV69" diOpen="" doOpen="DO_ValveAV69" display="ValveAV69" schematicId="" ILKDi="DI_AV69ILK" isNc="true" isDefaultOpen="false"/>

Furnace/FurnaceUI/Views/Maintenances/IOListView.xaml

@@ -271,25 +271,9 @@ FontSize="30">
             </i:Interaction.Triggers>
         </Button>
 
+     
         <Button
 Grid.Row="6"
-Content="Signal Ligh"
-FontFamily="Segoe"
-FontSize="30">
-            <i:Interaction.Triggers>
-                <i:EventTrigger EventName="Click">
-                    <cal:ActionMessage MethodName="BtnEdit">
-                        <cal:Parameter Value="IoSignalTower" />
-                        <cal:Parameter Value="SignalTower" />
-                        <cal:Parameter Value="SignalTower" />
-
-                    </cal:ActionMessage>
-                </i:EventTrigger>
-            </i:Interaction.Triggers>
-        </Button>
-        <Button
-Grid.Row="6"
-            Grid.Column="2"
 Content="APC CKD"
 FontFamily="Segoe"
 FontSize="30">

Furnace/FurnaceUI/Views/Operations/Maintenances/N2PurgeStatusView.xaml

@@ -1624,7 +1624,7 @@
                                     Grid.Column="0"
                                     Grid.ColumnSpan="3"
                                     VerticalAlignment="Bottom"
-                                    Text="N2 Purge Sequence"/>
+                                    Text="N2 Purge Status"/>
 
                                 <TextBox
                                     Grid.Row="1"
@@ -1633,7 +1633,7 @@
                                     Height="30"
                                     IsReadOnly="True"
                                     Text="{Binding N2PurgeMode, Mode=OneWay}"/>
-                                <TextBlock
+                                <!--<TextBlock
                                     Grid.Row="2"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="3"
@@ -1642,8 +1642,8 @@
 
                                 <TextBox
                                     Grid.Row="3"
-                                    Grid.Column="0"
-                                    Grid.ColumnSpan="3"/>
+                                    Grid.Column="0"   IsReadOnly="True"
+                                    Grid.ColumnSpan="3"/>-->
                                 <!--<TextBlock
                                     Grid.Row="5"
                                     Grid.Column="0"
@@ -1684,10 +1684,11 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="3"
+                                    IsReadOnly="True"
                                     Text="{Binding CheckO2Location,UpdateSourceTrigger=PropertyChanged}"/>
                                 <TextBox
                                     Grid.Row="2"
-                                    Grid.Column="0"
+                                    Grid.Column="0"   IsReadOnly="True"
                                     Grid.ColumnSpan="1"     Text="{Binding ConcentrationO2Value, StringFormat={}{0:f2}}" />
                                 <TextBlock
                                     Grid.Row="2"
@@ -1697,7 +1698,7 @@
                                     Text="/"/>
                                 <TextBox
                                     Grid.Row="2"
-                                    Grid.Column="2"
+                                    Grid.Column="2"   IsReadOnly="True"
                                     Grid.ColumnSpan="1"   Text="{Binding O2SetCheckSetPoint,UpdateSourceTrigger=PropertyChanged}"/>
                                 <!--<UniformGrid
                                     Grid.Row="3"

Furnace/FurnaceUI/Views/Operations/StatusView.xaml

@@ -2267,7 +2267,7 @@
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         Background="#DAE5F1"
-                                        IsEnabled="False"/>
+                                        IsEnabled="False"    Text="{Binding N2PurgeMode, Mode=OneWay}"/>
                                 </Border>
                             </Grid>
                             <Grid Grid.Row="1">

Furnace/FurnaceUI/Views/Operations/StatusViewModel.cs

@@ -1145,6 +1145,8 @@ namespace FurnaceUI.Views.Operations
 
         public string DefaultUnit { get; set; }
 
+        [Subscription("PM1.N2PurgeMode")]
+        public string N2PurgeMode { get; set; }
         #region Gas
         [Subscription("PM1.MFCList")]
         public List<AITMfcData> MFCList { get; set; }