Browse Source

1.kepler2200控压模拟器修改

lixiang 1 year ago
parent
commit
407ebcf41c

+ 9 - 4
Venus/Venus_MainPages/Unity/CommonFunction.cs

@@ -32,11 +32,16 @@ namespace Venus_MainPages.Unity
         }
         public static IEnumerable<string> GetFilesNames(string path)
         {
-            return Directory.GetFiles(path, "*.rcp")?
-      .Select(Path.GetFileNameWithoutExtension);
+            if (Directory.Exists(path))
+            {
+                return Directory.GetFiles(path, "*.rcp")?
+          .Select(Path.GetFileNameWithoutExtension);
+            }
+            else
+            {
+                return new List<string>();
+            }
         }
 
-  
-
     }
 }

+ 1 - 5
Venus/Venus_RT/Config/PM/Kepler2200A/Kepler2200AInterlock.xml

@@ -18,7 +18,7 @@
 		<Limit di="DI_Gas_Box_Pressure_Switch"	value="true" tip="DI Gas Box Pressure SW"	tip.zh-CN="" tip.en-US="DI-52" />
 	</Action>
 
-	<Action do="DO_PVN22" value="true" tip="PV11" tip.zh-CN="" tip.en-US="DO-02" >
+	<Action do="DO_PV11" value="true" tip="PV11" tip.zh-CN="" tip.en-US="DO-02" >
 		<Limit di="DI_Lid_Closed"		value="true" tip="DI Lid Closed"			tip.zh-CN="" tip.en-US="DI-0" />
 		<Limit di="DI_Slit_Door_Close_POS"	value="true" tip="DI Slit Door Close POS"	tip.zh-CN="" tip.en-US="DI-11" />
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="DI CDA Pressure"			tip.zh-CN="" tip.en-US="DI-12" />
@@ -83,13 +83,9 @@
 	</Action>
 
 	<Action do="DO_N2_Valve" value="true" tip="N2 Valve" tip.zh-CN="" tip.en-US="DO-10" >
-		<Limit di="DI_Lid_Closed"		value="true" tip="DI Lid Closed"			tip.zh-CN="" tip.en-US="DI-0" />
-		<Limit di="DI_Slit_Door_Close_POS"	value="true" tip="DI Slit Door Close POS"	tip.zh-CN="" tip.en-US="DI-11" />
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="DI CDA Pressure"			tip.zh-CN="" tip.en-US="DI-12" />
 		<Limit di="DI_Gas_Box_Door_Switch"		value="true" tip="DI Gas Box Door SW"		tip.zh-CN="" tip.en-US="DI-51" />
 		<Limit di="DI_Gas_Box_Pressure_Switch"	value="true" tip="DI Gas Box Pressure SW"	tip.zh-CN="" tip.en-US="DI-52" />
-		<Limit do="DO_Soft_Pumping_Valve"		value="false" tip="Soft Pumping Valve"		tip.zh-CN="" tip.en-US="DO-22" />
-		<Limit do="DO_Fast_Pumping_Valve"	value="false" tip="Fast Pumping Valve"	tip.zh-CN="" tip.en-US="DO-23" />
 	</Action>
 
 	<Action do="DO_MFC1_Valve" value="true" tip="MFC1 Valve" tip.zh-CN="" tip.en-US="DO-11" >

+ 1 - 5
Venus/Venus_RT/Config/PM/Kepler2200B/Kepler2200BInterlock.xml

@@ -18,7 +18,7 @@
 		<Limit di="DI_Gas_Box_Pressure_Switch"	value="true" tip="DI Gas Box Pressure SW"	tip.zh-CN="" tip.en-US="DI-52" />
 	</Action>
 
-	<Action do="DO_PVN22" value="true" tip="PV11" tip.zh-CN="" tip.en-US="DO-02" >
+	<Action do="DO_PV11" value="true" tip="PV11" tip.zh-CN="" tip.en-US="DO-02" >
 		<Limit di="DI_Lid_Closed"		value="true" tip="DI Lid Closed"			tip.zh-CN="" tip.en-US="DI-0" />
 		<Limit di="DI_Slit_Door_Close_POS"	value="true" tip="DI Slit Door Close POS"	tip.zh-CN="" tip.en-US="DI-11" />
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="DI CDA Pressure"			tip.zh-CN="" tip.en-US="DI-12" />
@@ -83,13 +83,9 @@
 	</Action>
 
 	<Action do="DO_N2_Valve" value="true" tip="N2 Valve" tip.zh-CN="" tip.en-US="DO-10" >
-		<Limit di="DI_Lid_Closed"		value="true" tip="DI Lid Closed"			tip.zh-CN="" tip.en-US="DI-0" />
-		<Limit di="DI_Slit_Door_Close_POS"	value="true" tip="DI Slit Door Close POS"	tip.zh-CN="" tip.en-US="DI-11" />
 		<Limit di="DI_CDA_Pressure_Switch"			value="true" tip="DI CDA Pressure"			tip.zh-CN="" tip.en-US="DI-12" />
 		<Limit di="DI_Gas_Box_Door_Switch"		value="true" tip="DI Gas Box Door SW"		tip.zh-CN="" tip.en-US="DI-51" />
 		<Limit di="DI_Gas_Box_Pressure_Switch"	value="true" tip="DI Gas Box Pressure SW"	tip.zh-CN="" tip.en-US="DI-52" />
-		<Limit do="DO_Soft_Pumping_Valve"		value="false" tip="Soft Pumping Valve"		tip.zh-CN="" tip.en-US="DO-22" />
-		<Limit do="DO_Fast_Pumping_Valve"	value="false" tip="Fast Pumping Valve"	tip.zh-CN="" tip.en-US="DO-23" />
 	</Action>
 
 	<Action do="DO_MFC1_Valve" value="true" tip="MFC1 Valve" tip.zh-CN="" tip.en-US="DO-11" >

+ 4 - 1
Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -1818,9 +1818,12 @@ namespace Venus_Simulator.Instances
 
             // fast vent & purge
             DOAccessor vent_vlv = IO.DO[$"{mod}.DO_N2_Valve"];
+            DOAccessor gas_final_vlv = IO.DO[$"{mod}.DO_Gas_Final_Valve"];
 
 
-            if (vent_vlv.Value)
+
+
+            if (vent_vlv.Value && gas_final_vlv.Value)
             {
                 float getAiValue_ChamberPressure = GetAiValue($"{mod}.{sAI_ChamberPressure}");
                 float getAiValue_ProcessPressure = GetAiValue($"{mod}.{sAI_ProcessPressure}");