根据最新的TM sequence修改代码，修改DO-04功能为Vent Valve TM

取消DO-05功能

Venus/Venus_Core/VenusDevice.cs

@@ -108,9 +108,9 @@
         TMSoftPumpValve,
         TMFastPumpValve,
         TMPurgeValve,
-        //TMVentValve,
-        TMSoftVentValve,
-        TMFastVentValve,
+        TMVentValve,
+        //TMSoftVentValve,
+        //TMFastVentValve,
         LLASoftPumpValve,
         LLAFastPumpValve,
         LLAPurgeValve,

Venus/Venus_MainPages/ViewModels/TMOperationViewModel.cs

@@ -381,8 +381,8 @@ namespace Venus_MainPages.ViewModels
             TMSoftPumpValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMSoftPumpValve.IsOpen"); ;
             TMFastPumpValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMFastPumpValve.IsOpen"); ;
             //TMPurgeValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMPurgeValve.IsOpen"); ;
-            TMSoftVentValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMSoftVentValve.IsOpen"); ;
-            TMFastVentValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMFastVentValve.IsOpen"); ;
+            TMSoftVentValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMPurgeValve.IsOpen"); ;
+            TMFastVentValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.TMVentValve.IsOpen"); ;
             LLASoftPumpValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.LLASoftPumpValve.IsOpen");
             LLAFastPumpValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.LLAFastPumpValve.IsOpen");
             LLAPurgeValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, "TM.LLAPurgeValve.IsOpen");
@@ -397,9 +397,9 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"TM.TMValveN2.IsOpen");
             m_RtDataKeys.Add($"TM.TMSoftPumpValve.IsOpen");
             m_RtDataKeys.Add($"TM.TMFastPumpValve.IsOpen");
-            //m_RtDataKeys.Add($"TM.TMPurgeValve.IsOpen");
-            m_RtDataKeys.Add($"TM.TMSoftVentValve.IsOpen");
-            m_RtDataKeys.Add($"TM.TMFastVentValve.IsOpen");
+            m_RtDataKeys.Add($"TM.TMPurgeValve.IsOpen");
+            //m_RtDataKeys.Add($"TM.TMSoftVentValve.IsOpen");
+            m_RtDataKeys.Add($"TM.TMVentValve.IsOpen");
 
             m_RtDataKeys.Add($"TM.LLASoftPumpValve.IsOpen");
             m_RtDataKeys.Add($"TM.LLAFastPumpValve.IsOpen");

Venus/Venus_MainPages/Views/TMOperationView.xaml

@@ -240,7 +240,7 @@
             </userControls:Pump>
 
             <customControls:CommonValveControl Status="{Binding TMValveN2IsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="160" Canvas.Top="44"  Tag="TMValveN2" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="True"/>
-            <customControls:CommonValveControl Status="{Binding TMFastVentValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="440" Canvas.Top="204"  Tag="TMFastVentValve" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="True"/>
+            <customControls:CommonValveControl Status="{Binding TMFastVentValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="440" Canvas.Top="204"  Tag="TMVentValve" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="True"/>
             <customControls:CommonValveControl Status="{Binding LLAVentValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"   Height="20" Width="20"  Canvas.Left="245.5" Canvas.Top="360"  Tag="LLAVentValve" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="True"/>
             <customControls:CommonValveControl Status="{Binding LLAPurgeValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"   Height="20" Width="20"  Canvas.Left="307" Canvas.Top="360"  Tag="LLAPurgeValve" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="True"/>
 
@@ -475,7 +475,7 @@
             <userControls:TMChamber x:Name="PMC" ModuleName="PMC" Canvas.Top="-38"  Canvas.Left="588" Width="140" Height="140" RotateTransformValue="30"   DoorIsOpen="{Binding RtDataValues[PMC.IsSlitDoorClosed],Converter={StaticResource BoolToBool}}" RobotWafer="{Binding PMCWafer}" PMVisibility="Collapsed" IsEnabled="{Binding PMCIsInstalled}"/>
             <userControls:TMChamber x:Name="PMD" ModuleName="PMD" Canvas.Top="160"  Canvas.Left="788" Width="140" Height="140" RotateTransformValue="90"   DoorIsOpen="{Binding RtDataValues[PMD.IsSlitDoorClosed],Converter={StaticResource BoolToBool}}" RobotWafer="{Binding PMDWafer}" PMVisibility="Collapsed" IsEnabled="{Binding PMDIsInstalled}"/>
         </Canvas>
-        <customControls:CommonValveControl Status="{Binding TMSoftVentValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="440" Canvas.Top="284"  Tag="TMSoftVentValve" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="True"/>
+        <customControls:CommonValveControl Status="{Binding TMSoftVentValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="440" Canvas.Top="284"  Tag="TMPurgeValve" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="True"/>
         <!--<TextBlock  FontSize="15" Canvas.Top="260" Canvas.Left="350" Text="Pressure(mTorr)"/>
         <TextBox    Canvas.Top="286" Canvas.Left="354" Width="80" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"/>-->
 

Venus/Venus_RT/Config/_ioDefineVenus_MF.xml

@@ -124,8 +124,8 @@
 		<DO_ITEM Index="3" Name="DO_Purge_Valve_TM" Device="" Addr="w0.03" />
 		<!--<DO_ITEM Index="4" Name="DO_Vent_Valve_TM" Device="" Addr="w0.04" />
 		<DO_ITEM Index="5" Name="" Device="" Addr="w0.05" />-->
-		<DO_ITEM Index="4" Name="DO_Soft_Vent_Valve_TM" Device="" Addr="w0.04" />
-		<DO_ITEM Index="5" Name="DO_Fast_Vent_Valve_TM" Device="" Addr="w0.05" />
+		<DO_ITEM Index="4" Name="DO_Vent_Valve_TM" Device="" Addr="w0.04" />
+		<!--<DO_ITEM Index="5" Name="DO_Fast_Vent_Valve_TM" Device="" Addr="w0.05" />-->
 		<DO_ITEM Index="6" Name="DO_Soft_Pumping_Valve_LLA" Device="" Addr="w0.06" />
 		<DO_ITEM Index="7" Name="DO_Fast_Pumping_Valve_LLA" Device="" Addr="w0.07" />
 		<DO_ITEM Index="8" Name="DO_Purge_Valve_LLA" Device="" Addr="w0.08" />

Venus/Venus_RT/Devices/TM/JetTM.cs

@@ -40,9 +40,9 @@ namespace Venus_RT.Devices
         private readonly IoValve _TMSoftPumpValve;
         private readonly IoValve _TMFastPumpValve;
         private readonly IoValve _TMPurgeValve;
-        //private readonly IoValve _TMVentValve;
-        private readonly IoValve _TMSoftVentValve;
-        private readonly IoValve _TMFastVentValve;
+        private readonly IoValve _TMVentValve;
+        //private readonly IoValve _TMSoftVentValve;
+        //private readonly IoValve _TMFastVentValve;
 
         private readonly IoValve _LLASoftPumpValve;
         private readonly IoValve _LLAFastPumpValve;
@@ -130,9 +130,9 @@ namespace Venus_RT.Devices
         public bool IsLLBVentValveOpen => _LLBVentValve.Status;
         public bool IsLLBPurgeValveOpen => _LLBPurgeValve.Status;
 
-        public bool IsTMSoftVentValveOpen => _TMSoftVentValve.Status;
+        public bool IsTMVentValveOpen => _TMVentValve.Status;
 
-        public bool IsTMFastVentValveOpen => _TMFastVentValve.Status;
+       // public bool IsTMFastVentValveOpen => _TMFastVentValve.Status;
 
         public bool IsTMPurgeValveOpen => _TMPurgeValve.Status;
         public bool IsTMFastPumpOpen => _TMFastPumpValve.Status;
@@ -171,9 +171,9 @@ namespace Venus_RT.Devices
             _TMSoftPumpValve    = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMSoftPumpValve}");
             _TMFastPumpValve    = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMFastPumpValve}");
             _TMPurgeValve       = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMPurgeValve}");
-            //_TMVentValve        = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMVentValve}");
-            _TMSoftVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMSoftVentValve}");
-            _TMFastVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMFastVentValve}");
+            _TMVentValve        = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMVentValve}");
+            //_TMSoftVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMSoftVentValve}");
+            //_TMFastVentValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.TMFastVentValve}");
 
             _LLASoftPumpValve = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.LLASoftPumpValve}");
             _LLAFastPumpValve   = DEVICE.GetDevice<IoValve>($"TM.{VenusDevice.LLAFastPumpValve}");
@@ -323,7 +323,7 @@ namespace Venus_RT.Devices
             switch (mod)
             {
                 case ModuleName.TM:
-                    _TMFastVentValve.TurnValve(bOn, out string _);
+                    _TMVentValve.TurnValve(bOn, out string _);
                     break;
                 case ModuleName.LLA:
                     _LLAVentValve.TurnValve(bOn, out string _);
@@ -334,47 +334,16 @@ namespace Venus_RT.Devices
             }
         }
 
-        public void TurnFastVentValve(ModuleName mod, bool bOn)
-        {
-            _TMN2Valve.TurnValve(bOn, out string _);
-            switch (mod)
-            {
-                case ModuleName.TM:
-                    _TMFastVentValve.TurnValve(bOn, out string _);
-                    break;
-                case ModuleName.LLA:
-                    _LLAVentValve.TurnValve(bOn, out string _);
-                    break;
-                case ModuleName.LLB:
-                    _LLBVentValve.TurnValve(bOn, out string _);
-                    break;
-            }
-        }
+      
+
 
-        public void TurnSoftVentValve(ModuleName mod, bool bOn)
-        {
-            _TMN2Valve.TurnValve(bOn, out string _);
-            switch (mod)
-            {
-                case ModuleName.TM:
-                    _TMSoftVentValve.TurnValve(bOn, out string _);
-                    break;
-                case ModuleName.LLA:
-                    _LLAPurgeValve.TurnValve(bOn, out string _);
-                    break;
-                case ModuleName.LLB:
-                    _LLBPurgeValve.TurnValve(bOn, out string _);
-                    break;
-            }
-        }
 
         public void TurnPurgeValve(ModuleName mod, bool bOn)
         {
             switch(mod)
             {
                 case ModuleName.TM:
-                    //_TMPurgeValve.TurnValve(bOn, out string _);
-                    _TMFastVentValve.TurnValve(bOn, out string _);
+                    _TMPurgeValve.TurnValve(bOn, out string _);
                     break;
                 case ModuleName.LLA:
                     _LLAPurgeValve.TurnValve(bOn, out string _);
@@ -482,7 +451,7 @@ namespace Venus_RT.Devices
             switch (mod)
             {
                 case ModuleName.TM:
-                    if (IsTMSoftVentValveOpen)
+                    if (IsTMVentValveOpen)
                     {
                         LOG.Write(eEvent.ERR_TM, ModuleName.TM, "TM Vent Valve not closed");
                         return false;

Venus/Venus_RT/Modules/TM/MFVentRoutine.cs

@@ -47,10 +47,10 @@ namespace Venus_RT.Modules.TM
             //Runner.Run((int)VentStep.kVenting,          OpenVentValve,      IsPressureReady,    _ventingTimeout)
             //    .End((int)VentStep.kCloseVentValves,    CloseVentValve,     _delay_50ms);
 
-            Runner.Run((int)VentStep.kOpenSoftVent, OpenSoftVentValve, IsSoftVentEnd)
-                  .Run((int)VentStep.KSwitchFastVent,SwitchFastVentValve, IsPressureReady)
-                  .Delay((int)VentStep.KDelay2S, 2*1000)
-                  .End((int)VentStep.kCloseVentValves, CloseVentValve, _delay_50ms);
+            Runner.Run((int)VentStep.kOpenSoftVent,     OpenSoftVentValve,    IsSoftVentEnd)
+                  .Run((int)VentStep.KSwitchFastVent,   SwitchFastVentValve, IsPressureReady)
+                  .Delay((int)VentStep.KDelay2S,        2*1000)
+                  .End((int)VentStep.kCloseVentValves,  CloseVentValve,        _delay_50ms);
 
             return Runner.Status;
         }
@@ -58,7 +58,7 @@ namespace Venus_RT.Modules.TM
         private bool OpenSoftVentValve()
         {
             _JetTM.TurnN2Valve(true);
-            _JetTM.TurnSoftVentValve(Module, true);
+            _JetTM.TurnPurgeValve(Module, true);
             return true;
         }
         private bool IsSoftVentEnd()
@@ -67,20 +67,20 @@ namespace Venus_RT.Modules.TM
         }
         private bool SwitchFastVentValve()
         {
-            _JetTM.TurnSoftVentValve(Module, false);
+            _JetTM.TurnPurgeValve(Module, false);
 
-            _JetTM.TurnFastVentValve(Module, true);
+            _JetTM.TurnVentValve(Module, true);
             return true;
         }
-        private bool OpenVentValve()
-        {
-            if(!IsPressureReady())
-            {
-                _JetTM.TurnVentValve(Module, true);
-            }
+        //private bool OpenVentValve()
+        //{
+        //    if(!IsPressureReady())
+        //    {
+        //        _JetTM.TurnVentValve(Module, true);
+        //    }
 
-            return true;
-        }
+        //    return true;
+        //}
 
         private bool CloseVentValve()
         {

Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -1012,8 +1012,8 @@ namespace Venus_Simulator.Instances
             DOAccessor LLB_fast_Vent_vlv = IO.DO[$"{mod}.DO_Vent_Valve_LLB"];
             DOAccessor LLB_soft_Vent_vlv = IO.DO[$"{mod}.DO_Purge_Valve_LLB"];
 
-            DOAccessor TM_fast_Vent_vlv = IO.DO[$"{mod}.DO_Fast_Vent_Valve_TM"];
-            DOAccessor TM_soft_Vent_vlv = IO.DO[$"{mod}.DO_Soft_Vent_Valve_TM"];
+            DOAccessor TM_fast_Vent_vlv = IO.DO[$"{mod}.DO_Vent_Valve_TM"];
+            DOAccessor TM_soft_Vent_vlv = IO.DO[$"{mod}.DO_Purge_Valve_TM"];
 
             float getAiValue_LLA_ChamberPressure = GetAiValue($"{mod}.{LLA_AI_ChamberPressure}");
             float getAiValue_LLB_ChamberPressure = GetAiValue($"{mod}.{LLB_AI_ChamberPressure}");