现场bug修改

Venus/Venus_MainPages/Views/EfemView.xaml

@@ -598,7 +598,7 @@
         </StackPanel>
 
 
-        <Canvas Visibility="Visible">
+        <!--<Canvas Visibility="Visible">
             <Button Content="平移" Canvas.Left="1600" Canvas.Top="60" Width="100" Height="30" Click="Button_Click_3"/>
             <ComboBox Canvas.Left="1700" Canvas.Top="60" Width="100" Height="30" x:Name="cb2">
                 <ComboBoxItem>Right</ComboBoxItem>
@@ -624,7 +624,7 @@
             <TextBox Canvas.Left="1600" Canvas.Top="220" Text="{Binding RobotMoveInfo.BladeTarget}"/>
             <TextBox Canvas.Left="1700" Canvas.Top="220" Text="{Binding RobotMoveInfo.ArmTarget}"/>
             <TextBox Canvas.Left="1800" Canvas.Top="220" Text="{Binding RobotMoveInfo.Action}"/>
-        </Canvas>
+        </Canvas>-->
        
 
 

Venus/Venus_MainPages/Views/EfemView.xaml.cs

@@ -34,34 +34,34 @@ namespace Venus_MainPages.Views
             InitializeComponent();
         }
 
-        private async void Button_Click(object sender, RoutedEventArgs e)
-        {
-            //DoubleAnimation doubleAnimation = new DoubleAnimation();
-            //efem1.CurrentRobotPosition = RobotPosition.Original;
-            //efem1.RobotATAction = (WaferRobotTAction)Enum.Parse(typeof(WaferRobotTAction), cb1.Text);
-           // efem1.GoToPosition();
+        //private async void Button_Click(object sender, RoutedEventArgs e)
+        //{
+        //    //DoubleAnimation doubleAnimation = new DoubleAnimation();
+        //    //efem1.CurrentRobotPosition = RobotPosition.Original;
+        //    //efem1.RobotATAction = (WaferRobotTAction)Enum.Parse(typeof(WaferRobotTAction), cb1.Text);
+        //   // efem1.GoToPosition();
            
-        }
+        //}
 
-        private async void Button_Click_1(object sender, RoutedEventArgs e)
-        {
-            // robot1.RobotXAction = WaferRobotXAction.Extend;
-            //efem1.RobotAXAction = WaferRobotXAction.Extend;
-            //(this.DataContext as EfemViewModel).Robot1TAction = WaferRobotTAction.LP1;
-            //await Task.Delay(2000);
-            //(this.DataContext as EfemViewModel).Robot2TAction = WaferRobotTAction.LP2;
-            efem1.RobotAXAction = WaferRobotXAction.Extend;
-        }
+        //private async void Button_Click_1(object sender, RoutedEventArgs e)
+        //{
+        //    // robot1.RobotXAction = WaferRobotXAction.Extend;
+        //    //efem1.RobotAXAction = WaferRobotXAction.Extend;
+        //    //(this.DataContext as EfemViewModel).Robot1TAction = WaferRobotTAction.LP1;
+        //    //await Task.Delay(2000);
+        //    //(this.DataContext as EfemViewModel).Robot2TAction = WaferRobotTAction.LP2;
+        //    efem1.RobotAXAction = WaferRobotXAction.Extend;
+        //}
 
-        private void Button_Click_2(object sender, RoutedEventArgs e)
-        {
-            efem1.RobotAXAction = WaferRobotXAction.Retract;
+        //private void Button_Click_2(object sender, RoutedEventArgs e)
+        //{
+        //    efem1.RobotAXAction = WaferRobotXAction.Retract;
 
-        }
+        //}
 
-        private void Button_Click_3(object sender, RoutedEventArgs e)
-        {
-            efem1.CurrentRobotPosition = (RobotPosition)Enum.Parse(typeof(RobotPosition), cb2.Text);
-        }
+        //private void Button_Click_3(object sender, RoutedEventArgs e)
+        //{
+        //    efem1.CurrentRobotPosition = (RobotPosition)Enum.Parse(typeof(RobotPosition), cb2.Text);
+        //}
     }
 }

Venus/Venus_RT/Config/TM/TMInterlock.xml

@@ -18,8 +18,6 @@
 		<Limit di="DI_LLB_E_Slit_Door_close_Position"			value="true" tip="LLB In Slit Door close Position"		tip.zh-CN="" tip.en-US="DI-28" />
 		<Limit di="DI_LLB_T_Slit_Door_close_Position"			value="true" tip="LLB Out Slit Door close Position"		tip.zh-CN="" tip.en-US="DI-30" />
 		<Limit di="DI_LLB_Lid_Door_Closed"			value="true" tip="LLB Lid Door Closed"		tip.zh-CN="" tip.en-US="DI-31" />
-		<Limit do="DO_Purge_Valve_TM"	value="false" tip="Purge Valve TM"			tip.zh-CN="" tip.en-US="D0-03" />
-		<Limit do="DO_Vent_Valve_TM"				value="false" tip="Soft Vent Valve TM"					tip.zh-CN="" tip.en-US="DO-04" />
 	</Action>
 
 	<Action do="DO_Fast_Pumping_Valve_TM"					value="true" tip="Fast Pumping Valve TM"	tip.zh-CN="" tip.en-US="DO-02" >
@@ -31,24 +29,18 @@
 		<Limit di="DI_LLB_E_Slit_Door_close_Position"			value="true" tip="LLB In Slit Door close Position"		tip.zh-CN="" tip.en-US="DI-28" />
 		<Limit di="DI_LLB_T_Slit_Door_close_Position"			value="true" tip="LLB Out Slit Door close Position"		tip.zh-CN="" tip.en-US="DI-30" />
 		<Limit di="DI_LLB_Lid_Door_Closed"			value="true" tip="LLB Lid Door Closed"		tip.zh-CN="" tip.en-US="DI-31" />
-		<Limit do="DO_Purge_Valve_TM"	value="false" tip="Purge Valve TM"			tip.zh-CN="" tip.en-US="D0-03" />
-		<Limit do="DO_Vent_Valve_TM"				value="false" tip="Soft Vent Valve TM"					tip.zh-CN="" tip.en-US="DO-04" />
 	</Action>
 
 	<Action do="DO_Purge_Valve_TM"					value="true" tip="Purge Valve TM"	tip.zh-CN="" tip.en-US="DO-03" >
 		<Limit di="DI_TM_CHB_Door_Closed"	value="true" tip="TM CHB Lid Door Closed"			tip.zh-CN="" tip.en-US="DI-17" />
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="CDA Pressure Switch"		tip.zh-CN="" tip.en-US="DI-19" />
-		<Limit di="DI_N2_Pressure_Switch"			value="true" tip="N2 Pressure Switch"		tip.zh-CN="" tip.en-US="DI-21" />
-		<Limit do="DO_Soft_Pumping_Valve_TM"			value="false" tip="Soft Pumping Valve TM"		tip.zh-CN="" tip.en-US="DO-01" />
-		<Limit do="DO_Fast_Pumping_Valve_TM"			value="false" tip="Fast Pumping Valve TM"		tip.zh-CN="" tip.en-US="DO-02" />
+		<Limit di="DI_N2_Pressure_Switch"			value="true" tip="N2 Pressure Switch"		tip.zh-CN="" tip.en-US="DI-21" />	
 	</Action>
 
 	<Action do="DO_Vent_Valve_TM"					value="true" tip="Soft Vent Valve TM"	tip.zh-CN="" tip.en-US="DO-04" >
 		<Limit di="DI_TM_CHB_Door_Closed"	value="true" tip="TM CHB Lid Door Closed"			tip.zh-CN="" tip.en-US="DI-17" />
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="CDA Pressure Switch"		tip.zh-CN="" tip.en-US="DI-19" />
 		<Limit di="DI_N2_Pressure_Switch"			value="true" tip="N2 Pressure Switch"		tip.zh-CN="" tip.en-US="DI-21" />
-		<Limit do="DO_Soft_Pumping_Valve_TM"			value="false" tip="Soft Pumping Valve TM"		tip.zh-CN="" tip.en-US="DO-01" />
-		<Limit do="DO_Fast_Pumping_Valve_TM"			value="false" tip="Fast Pumping Valve TM"		tip.zh-CN="" tip.en-US="DO-02" />
 	</Action>
 
 	<Action do="DO_Soft_Pumping_Valve_LLA"					value="true" tip="Soft Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-06" >
@@ -75,16 +67,12 @@
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="CDA Pressure Switch"		tip.zh-CN="" tip.en-US="DI-19" />
 		<Limit di="DI_N2_Pressure_Switch"			value="true" tip="N2 Pressure Switch"		tip.zh-CN="" tip.en-US="DI-21" />
 		<Limit di="DI_LLA_Lid_Door_Closed"			value="true" tip="LLA Lid Door Closed"		tip.zh-CN="" tip.en-US="DI-26" />
-		<Limit do="DO_Soft_Pumping_Valve_LLA"					value="false" tip="Soft Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-06" />
-		<Limit do="DO_Fast_Pumping_Valve_LLA"					value="false" tip="Fast Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-07" />
 	</Action>
 
 	<Action do="DO_Vent_Valve_LLA"					value="true" tip="Vent Valve LLA"	tip.zh-CN="" tip.en-US="DO-09" >
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="CDA Pressure Switch"		tip.zh-CN="" tip.en-US="DI-19" />
 		<Limit di="DI_N2_Pressure_Switch"			value="true" tip="N2 Pressure Switch"		tip.zh-CN="" tip.en-US="DI-21" />
 		<Limit di="DI_LLA_Lid_Door_Closed"			value="true" tip="LLA Lid Door Closed"		tip.zh-CN="" tip.en-US="DI-26" />
-		<Limit do="DO_Soft_Pumping_Valve_LLA"					value="false" tip="Soft Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-06" />
-		<Limit do="DO_Fast_Pumping_Valve_LLA"					value="false" tip="Fast Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-07" />
 	</Action>
 
 	<Action do="DO_LLA_Slit_Door_E_Open"					value="true" tip="LLA Slit Door/I Open"	tip.zh-CN="" tip.en-US="DO-11" >
@@ -131,8 +119,6 @@
 		<Limit di="DI_EFEM_Side_Door_Closed"				value="true" tip="EFEM Side Panel Closed"			tip.zh-CN="" tip.en-US="DI-31" />
 		<Limit do="DO_Soft_Pumping_Valve_LLA"					value="false" tip="Soft Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-06" />
 		<Limit do="DO_Fast_Pumping_Valve_LLA"					value="false" tip="Fast Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-07" />
-		<Limit do="DO_Purge_Valve_LLB"	value="false" tip="Purge Valve LLB"		tip.zh-CN="" tip.en-US="DO-18" />
-		<Limit do="DO_Vent_Valve_LLB"				value="false" tip="Vent Valve LLB"			tip.zh-CN="" tip.en-US="DO-19" />
 	</Action>
 
 	<Action do="DO_Fast_Pumping_Valve_LLB"			value="true"  tip="Fast Pumping Valve LLB"		tip.zh-CN="" tip.en-US="DO-17" >
@@ -141,24 +127,18 @@
 		<Limit di="DI_LLB_Lid_Door_Closed"				value="true"  tip="LLB Lid Closed"					tip.zh-CN="" tip.en-US="DI-31" />
 		<Limit do="DO_Soft_Pumping_Valve_LLA"			value="false" tip="Soft Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-06" />
 		<Limit do="DO_Fast_Pumping_Valve_LLA"			value="false" tip="Fast Pumping Valve LLA"	tip.zh-CN="" tip.en-US="DO-07" />
-		<Limit do="DO_Purge_Valve_LLB"	                value="false" tip="Purge Valve LLB"		tip.zh-CN="" tip.en-US="DO-18" />
-		<Limit do="DO_Vent_Valve_LLB"				    value="false" tip="Vent Valve LLB"			tip.zh-CN="" tip.en-US="DO-19" />
 	</Action>
 
 	<Action do="DO_Purge_Valve_LLB"					value="true" tip="Purge Valve LLB"		tip.zh-CN="" tip.en-US="DO-18" >
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="CDA Pressure Switch"		tip.zh-CN="" tip.en-US="DI-19" />
 		<Limit di="DI_N2_Pressure_Switch"			value="true" tip="N2 Pressure Switch"		tip.zh-CN="" tip.en-US="DI-21" />
 		<Limit di="DI_LLB_Lid_Door_Closed"				value="true" tip="LLB Lid Closed"					tip.zh-CN="" tip.en-US="DI-31" />
-		<Limit do="DO_Soft_Pumping_Valve_LLB"	value="false" tip="Soft Pumping Valve LLB"		tip.zh-CN="" tip.en-US="DO-16" />
-		<Limit do="DO_Fast_Pumping_Valve_LLB"				value="false" tip="Fast Pumping Valve LLB"			tip.zh-CN="" tip.en-US="DO-17" />
 	</Action>
 
 	<Action do="DO_Vent_Valve_LLB"					value="true" tip="Vent Valve LLB"		tip.zh-CN="" tip.en-US="DO-19" >
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="CDA Pressure Switch"		tip.zh-CN="" tip.en-US="DI-19" />
 		<Limit di="DI_N2_Pressure_Switch"			value="true" tip="N2 Pressure Switch"		tip.zh-CN="" tip.en-US="DI-21" />
 		<Limit di="DI_LLB_Lid_Door_Closed"				value="true" tip="LLB Lid Closed"					tip.zh-CN="" tip.en-US="DI-31" />
-		<Limit do="DO_Soft_Pumping_Valve_LLB"	value="false" tip="Soft Pumping Valve LLB"		tip.zh-CN="" tip.en-US="DO-16" />
-		<Limit do="DO_Fast_Pumping_Valve_LLB"				value="false" tip="Fast Pumping Valve LLB"			tip.zh-CN="" tip.en-US="DO-17" />
 	</Action>
 
 	<Action do="DO_LLB_Slit_Door_E_Open"					value="true" tip="LLB Slit Door/I Open"		tip.zh-CN="" tip.en-US="DO-21" >

Venus/Venus_RT/Modules/Schedulers/SchedulerEfemRobot.cs

@@ -191,7 +191,7 @@ namespace Venus_RT.Scheduler
             if(_currentScheduler != null)
             {
                 _currentScheduler.moveList.Clear();
-                _currentScheduler.Status = RState.End;
+                _currentScheduler.Status = RState.Init;
             }
         }
     }

Venus/Venus_RT/Modules/TM/MFPurgeRoutine.cs

@@ -56,11 +56,11 @@ namespace Venus_RT.Modules.TM
                 _purgeVentPressure = SC.GetValue<double>($"{Module}.PurgeVentPressure");
                 _purgeCycleCounter = SC.GetValue<int>($"{Module}.PurgeCycleCount");
                 _purgePumpTime = SC.GetValue<int>($"{Module}.PurgePumpTime");
+                //_JetTM.TurnN2Valve(true);
 
                 PurgeCounter = 0;
                 return Runner.Start(Module, Name);
             }
-
             return RState.Failed;
         }
 

Venus/Venus_RT/Modules/TM/MFVentRoutine.cs

@@ -59,7 +59,7 @@ namespace Venus_RT.Modules.TM
         {
             _JetTM.TurnN2Valve(true);
             _JetTM.TurnPurgeValve(Module, true);
-            _JetTM.TurnSoftPumpValve(Module, true);
+            // _JetTM.TurnSoftPumpValve(Module, true);
             return true;
         }
         private bool IsSoftVentEnd()

Venus/Venus_RT/Modules/TM/TMEntity.cs

@@ -637,6 +637,10 @@ namespace Venus_RT.Modules
         }
         private bool ControlPressureTimer_Elapsed(object[] param)
         {
+            if (RouteManager.IsATMMode)
+            {
+                return true;
+            }
             if (IsOnline == true)
             {
                 if (startControlPressureFlag==true)
@@ -652,11 +656,11 @@ namespace Venus_RT.Modules
                 {
                     if (_tm.PMASlitDoorClosed == false || _tm.PMBSlitDoorClosed == false || _tm.PMCSlitDoorClosed == false || _tm.PMDSlitDoorClosed == false)
                     {
-                        _tm.SwitchTMPressureMode(true);
+                        _tm.SwitchTMPressureMode(false);
                     }
                     else
                     {
-                        _tm.SwitchTMPressureMode(false);
+                        _tm.SwitchTMPressureMode(true);
                     }
                 }
             }