Browse Source

Venus DE he flow update

hecl 1 year ago
parent
commit
bb939f4cb1

+ 2 - 2
Venus/Venus_RT/Config/PM/VenusDE/VenusDEDeviceModel.xml

@@ -163,7 +163,7 @@
 			diPressureAlarm="DI_PN2_Pressure_Switch"/>
 		<IoMfc id="MfcHe" display="He" schematicId="He" unit="sccm"
 			aiFlow="AI_MFC_He1_Flow" aoFlow="AO_ESC_He_Pressure_Setpoint1" diOffline="" aoRange=""
-			diPressureAlarm=""/>
+			diPressureAlarm="DI_He_Pressure_Switch"/>
 	</IoMfcs>
 	<IoGasSticks assembly="Venus_RT" classType="Venus_RT.Devices.IoGasStick">
 		<IoGasStick id="GasStick1" display="" mfc ="MfcGas1" downvalve="ValveMfc1" />
@@ -182,7 +182,7 @@
 	</IoGasSticks>
 
 	<IoBacksideHes assembly="Venus_RT" classType="Venus_RT.Devices.IoBacksideHe">
-		<IoBacksideHe id="BacksideHelium" display="" mfc="" downvalve="ValvePVHe1" upvalve="ValveHeISO" up2valve="ValvePVHe3" aoControlMode="" aoPressureSP="AO_ESC_He_Pressure_Setpoint1" />
+		<IoBacksideHe id="BacksideHelium" display="" mfc="MfcHe" downvalve="ValvePVHe1" upvalve="ValveHeISO" up2valve="ValvePVHe3" aoControlMode="" aoPressureSP="AO_ESC_He_Pressure_Setpoint1" />
 	</IoBacksideHes>
 
 	<IoSensors>

+ 4 - 4
Venus/Venus_RT/Config/PM/VenusDE/VenusDEIoDefine.xml

@@ -319,10 +319,10 @@
     <AI_ITEM Index="32" Name="" />
     <AI_ITEM Index="33" Name="" />
     <AI_ITEM Index="34" Name="" />
-    <AI_ITEM Index="35" Name="AI_MFC9Flow" BufferOffset="70" Device="" Addr="d2070" Note="float" />
-    <AI_ITEM Index="36" Name="AI_MFC10Flow" BufferOffset="72" Device="" Addr="d2072" Note="float" />
-    <AI_ITEM Index="37" Name="AI_MFC11Flow" BufferOffset="74" Device="" Addr="d2074" Note="float" />
-    <AI_ITEM Index="38" Name="AI_MFC12Flow" BufferOffset="76" Device="" Addr="d2076" Note="float" />
+    <AI_ITEM Index="35" Name="AI_MFC9_Flow" BufferOffset="70" Device="" Addr="d2070" Note="float" />
+    <AI_ITEM Index="36" Name="AI_MFC10_Flow" BufferOffset="72" Device="" Addr="d2072" Note="float" />
+    <AI_ITEM Index="37" Name="AI_MFC11_Flow" BufferOffset="74" Device="" Addr="d2074" Note="float" />
+    <AI_ITEM Index="38" Name="AI_MFC12_Flow" BufferOffset="76" Device="" Addr="d2076" Note="float" />
     <AI_ITEM Index="39" Name="AI_MFC_He2_Flow" BufferOffset="78" Device="" Addr="d2078" Note="MFC He2"/>
     <AI_ITEM Index="40" Name="AI_He_Pressure1" BufferOffset="80" Device="" Addr="d2080" Note="float" />
     <AI_ITEM Index="41" Name="AI_He_Pressure2" BufferOffset="82"  Device="" Addr="d2082" Note="float"  />

+ 4 - 4
Venus/Venus_Simulator/Config/_ioDefineVenusDE.xml

@@ -319,10 +319,10 @@
     <AI_ITEM Index="32" Name="" />
     <AI_ITEM Index="33" Name="" />
     <AI_ITEM Index="34" Name="" />
-    <AI_ITEM Index="35" Name="AI_MFC9Flow" BufferOffset="70" Device="" Addr="d2070" Note="float" />
-    <AI_ITEM Index="36" Name="AI_MFC10Flow" BufferOffset="72" Device="" Addr="d2072" Note="float" />
-    <AI_ITEM Index="37" Name="AI_MFC11Flow" BufferOffset="74" Device="" Addr="d2074" Note="float" />
-    <AI_ITEM Index="38" Name="AI_MFC12Flow" BufferOffset="76" Device="" Addr="d2076" Note="float" />
+    <AI_ITEM Index="35" Name="AI_MFC9_Flow" BufferOffset="70" Device="" Addr="d2070" Note="float" />
+    <AI_ITEM Index="36" Name="AI_MFC10_Flow" BufferOffset="72" Device="" Addr="d2072" Note="float" />
+    <AI_ITEM Index="37" Name="AI_MFC11_Flow" BufferOffset="74" Device="" Addr="d2074" Note="float" />
+    <AI_ITEM Index="38" Name="AI_MFC12_Flow" BufferOffset="76" Device="" Addr="d2076" Note="float" />
     <AI_ITEM Index="39" Name="AI_MFC_He2_Flow" BufferOffset="78" Device="" Addr="d2078" Note="MFC He2"/>
     <AI_ITEM Index="40" Name="AI_He_Pressure1" BufferOffset="80" Device="" Addr="d2080" Note="float" />
     <AI_ITEM Index="41" Name="AI_He_Pressure2" BufferOffset="82"  Device="" Addr="d2082" Note="float"  />

+ 18 - 0
Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -739,6 +739,7 @@ namespace Venus_Simulator.Instances
                             MonitorSEPressure(item.Key);
                             MonitorSEGas(item.Key);
                             ChangeTime(item.Key);
+                            this.SimulateSEHe(item.Key);
                             break;
                         case JetChamber.VenusDE:
                             MonitorPin(item.Key);
@@ -746,6 +747,7 @@ namespace Venus_Simulator.Instances
                             //MonitorVenuDESlitDoor(item.Key);
                             MonitorDEPressure(item.Key);
                             ChangeTime(item.Key);
+                            this.SimulateDEHe(item.Key);
                             break;
                     }
                 }
@@ -2306,6 +2308,22 @@ namespace Venus_Simulator.Instances
 
             SetAiValue($"{mod}.AI_Turbo_Pump_N2_Flow", (float)sp);
         }
+        private void SimulateSEHe(ModuleName mod)
+        {
+            var sp = GetAoValue($"{mod}.AO_ESC_He_Pressure_Setpoint");
+
+            var mock_fb = _rd.Next((int)sp - 3, (int)sp + 3) + _rd.NextDouble();
+
+            SetAiValue($"{mod}.AI_He_Flow", (float)mock_fb);
+        }
+        private void SimulateDEHe(ModuleName mod)
+        {
+            var sp = GetAoValue($"{mod}.AO_ESC_He_Pressure_Setpoint1");
+
+            var mock_fb = _rd.Next((int)sp - 3, (int)sp + 3) + _rd.NextDouble();
+
+            SetAiValue($"{mod}.AI_MFC_He1_Flow", (float)mock_fb);
+        }
         private void SimulateHe(ModuleName mod)
         {
             var sp = GetAoValue($"{mod}.AO_He_Flow_Setpoint");