diff --git a/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index 60c31e3..2afdf4a 100644
--- a/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -141,7 +141,7 @@
-
+
diff --git a/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
index d094556..e2712db 100644
--- a/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
+++ b/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
@@ -153,6 +153,7 @@
+
diff --git a/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml b/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
index ed5c56a..fe45c3e 100644
--- a/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
+++ b/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
@@ -74,6 +74,7 @@
+
@@ -138,7 +139,7 @@
-
+
diff --git a/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
index 8329a02..95756a2 100644
--- a/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
+++ b/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
@@ -148,6 +148,7 @@
+
diff --git a/SicSimulator/Config/_ioDefinePM.xml b/SicSimulator/Config/_ioDefinePM.xml
index 0b8d023..cfdcba9 100644
--- a/SicSimulator/Config/_ioDefinePM.xml
+++ b/SicSimulator/Config/_ioDefinePM.xml
@@ -153,6 +153,7 @@
+
diff --git a/SicSimulator/Instances/SimulatorSystem.cs b/SicSimulator/Instances/SimulatorSystem.cs
index b882ce8..ec640b9 100644
--- a/SicSimulator/Instances/SimulatorSystem.cs
+++ b/SicSimulator/Instances/SimulatorSystem.cs
@@ -972,7 +972,7 @@ namespace SicSimulator.Instances
IO.DI[$"{pm}.DI_ChamBodyArPurgeFB(V68)"].Value = IO.DO[$"{pm}.DO_ChamBodyArPurge(V68)"].Value;
IO.DI[$"{pm}.DI_ReactorLeakCheckFB(V69)"].Value = IO.DO[$"{pm}.DO_ReactorLeakCheck(V69)"].Value;
IO.DI[$"{pm}.DI_TMPressBalanceFB(V70)"].Value = IO.DO[$"{pm}.DO_TMPressBalance(V70)"].Value;
- //IO.DI[$"{pm}.DI_CarryGasFinal_FB"].Value = IO.DO[$"{pm}.DO_CarryGasFinal(V97)"].Value;
+ IO.DI[$"{pm}.DI_CarryGasFinalFB(V97)"].Value = IO.DO[$"{pm}.DO_CarryGasFinal(V97)"].Value;
IO.DI[$"{pm}.DI_GasBoxVentPumpFB(V72)"].Value = IO.DO[$"{pm}.DO_GasBoxVentPump(V72)"].Value;
IO.DI[$"{pm}.DI_MOVacFB(V73)"].Value = IO.DO[$"{pm}.DO_MOVac(V73)"].Value;
IO.DI[$"{pm}.DI_GasboxLeakCheckFB(V74)"].Value = IO.DO[$"{pm}.DO_GasboxLeakCheck(V74)"].Value;
diff --git a/SicUI/Models/PMs/PMOperationView.xaml b/SicUI/Models/PMs/PMOperationView.xaml
index 246255d..c4ccfc6 100644
--- a/SicUI/Models/PMs/PMOperationView.xaml
+++ b/SicUI/Models/PMs/PMOperationView.xaml
@@ -6,15 +6,12 @@
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
xmlns:controlRT="clr-namespace:SicUI.Controls"
xmlns:controls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.Controls;assembly=MECF.Framework.UI.Client"
- xmlns:converters="clr-namespace:Aitex.Core.UI.Converters;assembly=MECF.Framework.UI.Core"
- xmlns:ctrl="http://OpenSEMI.Ctrlib.com/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:industrialcontrol="clr-namespace:MECF.Framework.UI.Client.IndustrialControl;assembly=MECF.Framework.UI.Client"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pm="clr-namespace:SicUI.Models.PMs"
xmlns:system="clr-namespace:System;assembly=mscorlib"
d:Background="#91b0cd"
d:DesignHeight="920"
@@ -133,32 +130,24 @@
Background="{DynamicResource MainFrame_BG_Title}"
BorderBrush="{DynamicResource MainFrame_BD}"
BorderThickness="1,0,1,0">
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
-
-
+
-
-
-
-
-
-
-
+
-
-
+
-
-
+
-
+
-
-
-
-
@@ -1410,7 +1332,6 @@
Grid.Column="0"
Width="1581"
Margin="-100,40,0,-3"
- HorizontalAlignment="Left"
IsEnabled="{Binding IsServiceMode}">
-
-
@@ -5437,8 +4832,6 @@
Canvas.Left="1200"
Canvas.Top="422"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc15Data}"
OperationName="SetMfcFlowValue" />
@@ -5454,8 +4847,6 @@
Canvas.Left="1200"
Canvas.Top="347"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc26Data}"
OperationName="SetMfcFlowValue" />
@@ -5463,8 +4854,6 @@
Canvas.Left="1200"
Canvas.Top="386"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc25Data}"
OperationName="SetMfcFlowValue" />
@@ -5473,8 +4862,6 @@
Canvas.Left="1200"
Canvas.Top="458"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc20Data}"
OperationName="SetMfcFlowValue" />
@@ -5482,20 +4869,14 @@
Canvas.Left="1200"
Canvas.Top="498"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc19Data}"
OperationName="SetMfcFlowValue" />
-
-
@@ -5503,8 +4884,6 @@
Canvas.Left="1200"
Canvas.Top="270"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc29Data}"
OperationName="SetMfcFlowValue" />
@@ -5512,8 +4891,6 @@
Canvas.Left="1200"
Canvas.Top="231"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc31Data}"
OperationName="SetMfcFlowValue" />
@@ -5522,8 +4899,6 @@
Canvas.Left="1200"
Canvas.Top="113"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc27Data}"
OperationName="SetMfcFlowValue" />
@@ -5531,8 +4906,6 @@
Canvas.Left="1200"
Canvas.Top="190"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc40Data}"
OperationName="SetMfcFlowValue" />
@@ -5541,8 +4914,6 @@
Canvas.Top="240"
Width="16"
Height="15"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
MFCCount="{Binding V90CountMFC}"
@@ -5556,8 +4927,6 @@
Canvas.Top="124"
Width="16"
Height="15"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
OnOff="{Binding V87.Feedback}"
@@ -5566,26 +4935,34 @@
ValveName="{Binding V87.DisplayName}" />
+
+
+ ValveName="{Binding V65.DisplayName}" />
-
@@ -5636,8 +5006,6 @@
Canvas.Top="164"
Width="16"
Height="15"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
OnOff="{Binding V91.Feedback}"
@@ -5649,39 +5017,30 @@
Canvas.Left="1449"
Canvas.Top="217"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
- DeviceData="{Binding Mfc32Data}"
+ DeviceData="{Binding Mfc42Data}"
OperationName="SetMfcFlowValue" />
-
@@ -5690,8 +5049,6 @@
Canvas.Left="1449"
Canvas.Top="141"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc36Data}"
OperationName="SetMfcFlowValue" />
@@ -5699,8 +5056,6 @@
Canvas.Left="1449"
Canvas.Top="103"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc37Data}"
OperationName="SetMfcFlowValue" />
@@ -5708,8 +5063,6 @@
Canvas.Left="1449"
Canvas.Top="66"
Width="62"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdSetMfcFlow}"
DeviceData="{Binding Mfc38Data}"
OperationName="SetMfcFlowValue" />
@@ -5718,8 +5071,6 @@
Canvas.Top="75"
Width="16"
Height="15"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
OnOff="{Binding V96.Feedback}"
@@ -5731,8 +5082,6 @@
Canvas.Top="113"
Width="16"
Height="15"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
OnOff="{Binding V95.Feedback}"
@@ -5744,8 +5093,6 @@
Canvas.Top="150"
Width="16"
Height="15"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
OnOff="{Binding V94.Feedback}"
@@ -5757,8 +5104,6 @@
Canvas.Top="188"
Width="16"
Height="15"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
OnOff="{Binding V93.Feedback}"
@@ -5770,53 +5115,41 @@
Canvas.Top="321"
Width="16"
Height="15"
- HorizontalAlignment="Center"
- VerticalAlignment="Top"
Command="{Binding CmdTurnGasValve}"
HideBlinding="True"
- OnOff="{Binding V92.Feedback}"
- Tag="V92"
+ OnOff="{Binding V97.Feedback}"
+ Tag="V97"
ValveDirection="ToBottom"
- ValveName="{Binding V92.DisplayName}" />
+ ValveName="{Binding V97.DisplayName}" />
@@ -7556,8 +6664,6 @@
Canvas.Top="325"
Width="6"
Height="6"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
KnotDirection="ToTop"
KnotElliColor="White"
KnotT="Through"
@@ -7567,8 +6673,6 @@
Canvas.Top="325"
Width="6"
Height="6"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
KnotDirection="ToTop"
KnotElliColor="White"
KnotT="Through"
@@ -7581,14 +6685,11 @@
DeviceData="{Binding PumpData}"
EnableControl="True" />
-
-
-
-
+
\ No newline at end of file