1.Add VenusDE JetVenusDEPM control

2.Update VenusSE PM io config & simulator

Venus/Venus_MainPages/Venus_MainPages.csproj

@@ -182,6 +182,7 @@
     <Compile Include="ViewModels\OverKepler2200BViewModel.cs" />
     <Compile Include="ViewModels\OverKepler2200AViewModel.cs" />
     <Compile Include="ViewModels\OverKepler2300ViewModel.cs" />
+    <Compile Include="ViewModels\OverVenusDEViewModel.cs" />
     <Compile Include="ViewModels\OverVenusSEViewModel.cs" />
     <Compile Include="ViewModels\OverVenusViewModel.cs" />
     <Compile Include="ViewModels\PartialPressureViewModel.cs" />
@@ -253,6 +254,9 @@
     <Compile Include="Views\OverKepler2300View.xaml.cs">
       <DependentUpon>OverKepler2300View.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\OverVenusDEView.xaml.cs">
+      <DependentUpon>OverVenusDEView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\OverVenusSEView.xaml.cs">
       <DependentUpon>OverVenusSEView.xaml</DependentUpon>
     </Compile>
@@ -413,6 +417,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\OverVenusDEView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\OverVenusSEView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Venus/Venus_MainPages/ViewModels/OverVenusDEViewModel.cs

@@ -1739,7 +1739,7 @@ namespace Venus_MainPages.ViewModels
                 ProcessHighPressure = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ProcessHighPressure");
                 ProcessLowPressure = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ProcessLowPressure");
                 ForelinePressure = float.Parse(RtDataValues[$"{ModuleName}.ForelinePressure"].ToString());
-                ESCHePressure = float.Parse(RtDataValues[$"{ModuleName}.ESCHePressure"].ToString());
+                //ESCHePressure = float.Parse(RtDataValues[$"{ModuleName}.ESCHePressure"].ToString());
 
                 ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
 

Venus/Venus_MainPages/ViewModels/OverVenusSEViewModel.cs

@@ -1740,7 +1740,7 @@ namespace Venus_MainPages.ViewModels
                 ProcessHighPressure = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ProcessHighPressure");
                 ProcessLowPressure = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.ProcessLowPressure");
                 ForelinePressure = float.Parse(RtDataValues[$"{ModuleName}.ForelinePressure"].ToString());
-                ESCHePressure = float.Parse(RtDataValues[$"{ModuleName}.ESCHePressure"].ToString());
+                //ESCHePressure = float.Parse(RtDataValues[$"{ModuleName}.ESCHePressure"].ToString());
 
                 ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
 

Venus/Venus_RT/Config/PM/VenusDE/VenusDEDeviceModel.xml

@@ -22,14 +22,14 @@
 				isDefaultOpen="false" diOpen="" doOpen="DO_PV41" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV42" display="PV42 Valve" schematicId="PV42" unit="" isNc="true"
 				isDefaultOpen="false" diOpen="" doOpen="DO_PV42" diCloseSensor="" diOpenSensor="" />
-		<IoValve id="ValvePV51" display="PV51 Valve" schematicId="PV51" unit="" isNc="true"
+		<!--<IoValve id="ValvePV51" display="PV51 Valve" schematicId="PV51" unit="" isNc="true"
 		isDefaultOpen="false" diOpen="" doOpen="DO_PV51" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV52" display="PV52 Valve" schematicId="PV52" unit="" isNc="true"
-				isDefaultOpen="false" diOpen="" doOpen="DO_PV52" diCloseSensor="" diOpenSensor="" />
-		<IoValve id="ValvePV61" display="PV61 Valve" schematicId="PV61" unit="" isNc="true"
+				isDefaultOpen="false" diOpen="" doOpen="DO_PV52" diCloseSensor="" diOpenSensor="" />-->
+		<!--<IoValve id="ValvePV61" display="PV61 Valve" schematicId="PV61" unit="" isNc="true"
 		isDefaultOpen="false" diOpen="" doOpen="DO_PV61" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV62" display="PV62 Valve" schematicId="PV62" unit="" isNc="true"
-				isDefaultOpen="false" diOpen="" doOpen="DO_PV62" diCloseSensor="" diOpenSensor="" />
+				isDefaultOpen="false" diOpen="" doOpen="DO_PV62" diCloseSensor="" diOpenSensor="" />-->
 		<IoValve id="ValvePV71" display="PV71 Valve" schematicId="PV71" unit="" isNc="true"
 		isDefaultOpen="false" diOpen="" doOpen="DO_PV71" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV72" display="PV72 Valve" schematicId="PV72" unit="" isNc="true"
@@ -154,9 +154,9 @@
 		<IoMfc id="MfcN2" display="N2" schematicId="N2" unit="sccm"
 			aiFlow="" aoFlow="" diOffline="" aoRange=""
 			diPressureAlarm="DI_PN2_Pressure_Switch"/>
-		<IoMfc id="MfcHe" display="He" schematicId="He" unit="sccm"
-			aiFlow="AI_He_Flow" aoFlow="AO_ESC_He_Pressure_Setpoint" diOffline="" aoRange=""
-			diPressureAlarm="DI_ESC_He_Pressure_100t_Gauge_Alarm"/>
+		<!--<IoMfc id="MfcHe" display="He" schematicId="He" unit="sccm"
+			aiFlow="AI_He_Flow" aoFlow="AO_ESC_He_Pressure_Setpoint1" diOffline="" aoRange=""
+			diPressureAlarm="DI_ESC_He_Pressure_100t_Gauge_Alarm"/>-->
 	</IoMfcs>
 	<IoGasSticks assembly="Venus_RT" classType="Venus_RT.Devices.IoGasStick">
 		<IoGasStick id="GasStick1" display="" mfc ="MfcGas1" downvalve="ValveMfc1" />
@@ -175,7 +175,7 @@
 	</IoGasSticks>
 
 	<IoBacksideHes assembly="Venus_RT" classType="Venus_RT.Devices.IoBacksideHe">
-		<IoBacksideHe id="BacksideHelium" display="" mfc="MfcHe" downvalve="ValvePVHe1" upvalve="ValveHeISO" up2valve="ValvePVHe3" aoControlMode="" aoPressureSP="AO_ESC_He_Pressure_Setpoint" />
+		<IoBacksideHe id="BacksideHelium" display="" mfc="" downvalve="ValvePVHe1" upvalve="ValveHeISO" up2valve="ValvePVHe3" aoControlMode="" aoPressureSP="AO_ESC_He_Pressure_Setpoint1" />
 	</IoBacksideHes>
 
 	<IoSensors>
@@ -207,7 +207,7 @@
 	</IoSensors>
 	<IoPressureMeters assembly="Venus_RT" classType="Venus_RT.Devices.IODevices.IoPressureMeter">
 		<IoPressureMeter id="ProcessGauge" display="Process Pressure" schematicId="" unit="mTorr"
-						    aiValue="AI_Process_Pressure_100mt" diGaugeFail="DI_Process_Pressure_100mt_Gauge_Alarm" scPrecision="" scOffset=""/>
+						    aiValue="AI_Process_Pressure_1t" diGaugeFail="DI_Process_Pressure_1t_Gauge_Alarm" scPrecision="" scOffset=""/>
 		<IoPressureMeter id="PressureGauge" display="Chamber Pressure" schematicId="" unit="mTorr"
 						    aiValue="AI_Chamber_Pressure_10t"
 						    diGaugeFail="DI_Chamber_Pressure_10t_Gauge_Alarm"
@@ -215,12 +215,12 @@
 						    scOffset=""/>
 		<IoPressureMeter id="ForelineGauge" display="Foreline Pressure" schematicId="" unit="mTorr"
 						    aiValue="AI_Foreline_Pressure_10t" diGaugeFail="DI_Foreline_Pressure_10t_Gauge_Alarm" scPrecision="" scOffset=""/>
-		<IoPressureMeter id="ESCHeGauge" display="ESC He Pressure" schematicId="" unit="mTorr"
-						    aiValue="AI_He_Pressure_100t" diGaugeFail="DI_ESC_He_Pressure_100t_Gauge_Alarm" scPrecision="" scOffset=""/>
+		<!--<IoPressureMeter id="ESCHeGauge" display="ESC He Pressure" schematicId="" unit="mTorr"
+						    aiValue="AI_He_Pressure_100t" diGaugeFail="DI_ESC_He_Pressure_100t_Gauge_Alarm" scPrecision="" scOffset=""/>-->
 		<IoPressureMeter id="ProcessPressureHigh" display="ProcessPressureHigh" schematicId="" unit="mTorr"
 						    aiValue="AI_Chamber_Pressure_10t" diGaugeFail="DI_Chamber_Pressure_10t_Gauge_Alarm" scPrecision="" scOffset=""/>
 		<IoPressureMeter id="ProcessPressureLow" display="ProcessPressureLow" schematicId="" unit="mTorr"
-						    aiValue="AI_Process_Pressure_100mt" diGaugeFail="DI_Process_Pressure_100mt_Gauge_Alarm" scPrecision="" scOffset=""/>
+						    aiValue="AI_Process_Pressure_1t" diGaugeFail="DI_Process_Pressure_1t_Gauge_Alarm" scPrecision="" scOffset=""/>
 	</IoPressureMeters>
 	<IoPressureControls assembly="Venus_RT" classType="Venus_RT.Devices.IoPressureControl">
 		<IoPressureControl id="PressureControl" display="PressureControl" schematicId="PressureControl" unit="mTorr"
@@ -231,7 +231,7 @@
 						   scIsBoostPumpInstalled="EnableBoosterPump"
 						   scTvInstalled="EnableThrottleValve"
 						   boost="" tv="ThrottleValve" drypump="MainPump"
-						   pressureMeter ="PressureGauge" processMeter="ProcessGauge" forelineMeter="ForelineGauge" loadlockMeter="" escHeGauge="ESCHeGauge" processPressureHigh="ProcessPressureHigh" processPressureLow="ProcessPressureLow"/>
+						   pressureMeter ="PressureGauge" processMeter="ProcessGauge" forelineMeter="ForelineGauge" loadlockMeter="" escHeGauge="" processPressureHigh="ProcessPressureHigh" processPressureLow="ProcessPressureLow"/>
 	</IoPressureControls>
 	<IoHeartbeats assembly="Venus_RT" classType=" Venus_RT.Devices.IODevices.IoHeartbeat">
 		<IoHeartbeat  id="Heartbeat" display="" schematicId="" unit="" ao="AO_Heartbeat" ai="AI_Heartbeat_FB" />
@@ -254,11 +254,11 @@
            diDeviation="DI_Valve_TC_Deviation_out_of_range"
            diPowerOnFeedback="DI_Valve_Heater_On_FB"
            diControlTcBroken="DI_Valve_Control_TC_Broken_Alarm"
-           diMonitorTcBroken="DI_Valve_Monitor_TC_Broken_Alarm"
+           diMonitorTcBroken=""
            aoSetPoint="AO_Valve_Temperature_Setpoint"
            aoSetPointLimit="AO_Valve_Temp_Limit_Setpoint"
            aiFeedback="AI_Valve_Control_TC_Temp"
-           aiMonitor="AI_Valve_Monitor_TC_Temp"
+           aiMonitor=""
            scSetPointLimit="ValveHeaterSetPointLimit" />
 
     <IoHeater id="ForelineHeater" display="Foreline Heater" schematicId="" unit="℃"
@@ -273,7 +273,7 @@
          aiMonitor="AI_Fline_Monitor_TC_Temp"
          scSetPointLimit="ForeLineHeaterSetPointLimit" />
 
-    <IoHeater id="WallHeater" display="Wall Heater" schematicId="" unit="℃"
+    <!--<IoHeater id="WallHeater" display="Wall Heater" schematicId="" unit="℃"
               doPowerOn="DO_CHB_Wall_Heater_On"
 
               diDeviation="DI_CHB_Wall_TC_Deviation_out_of_range"
@@ -287,6 +287,6 @@
               aiFeedback="AI_CHB_Wall_Control_TC_Temp"
               aiMonitor="AI_CHB_Wall_Monitor_TC_Temp"
 
-              scSetPointLimit="WallHeaterSetPointLimit" />
+              scSetPointLimit="WallHeaterSetPointLimit" />-->
   </IoHeaters>
 </DeviceModelDefine>

Venus/Venus_RT/Config/PM/VenusDE/VenusDEInterlock.xml

@@ -380,7 +380,7 @@
     <Limit di="DI_CDA_Pressure_Switch"				value="true" tip="DI CDA Pressure"				tip.zh-CN="" tip.en-US="DI-12" />
   </Action>
 
-  <Action do="DO_Gauge_Valve" value="true" tip="Guage Valve" tip.zh-CN="" tip.en-US="DO-31" >
+  <Action do="DO_Guage_Valve" value="true" tip="Guage Valve" tip.zh-CN="" tip.en-US="DO-31" >
     <Limit di="DI_PM_VAC_Switch"				value="true" tip="DI PM Vacuum SW"				tip.zh-CN="" tip.en-US="DI-2" />
   </Action>
 </Interlock>

Venus/Venus_RT/Config/PM/VenusDE/VenusDEIoDefine.xml

@@ -9,8 +9,8 @@
     <DI_ITEM Index="2"   Name="DI_PM_VAC_Switch" Device="" Addr="w20.02" />
     <DI_ITEM Index="3"   Name="DI_ESC_Coolant_Flow_SW" Device="" Addr="w20.03" />
     <DI_ITEM Index="4"   Name="DI_Water_Leak_Sensor" Device="" Addr="w20.04" />
-    <DI_ITEM Index="5"   Name="DI_Lift_Pin_Up_Pos" Device="" Addr="w20.05" />
-    <DI_ITEM Index="6"   Name="DI_Lift_Pin_Down_Pos" Device="" Addr="w20.06" />
+    <DI_ITEM Index="5"   Name="DI_Lift_Pin_Up_POS" Device="" Addr="w20.05" />
+    <DI_ITEM Index="6"   Name="DI_Lift_Pin_Down_POS" Device="" Addr="w20.06" />
     <DI_ITEM Index="7"   Name="DI_RF_HV_Interlock_OK" Device="Lid_VAC_Slit_Door_MATCH_INT_OK." Addr="w20.07" />
     <DI_ITEM Index="8"   Name="" />
     <DI_ITEM Index="9"   Name="DI_Turbo_Pump_Interlock" Device="" Addr="w20.09" />
@@ -20,7 +20,7 @@
     <DI_ITEM Index="13"  Name="DI_ESC_Coolant_Inlet_TC_Broken_Alarm" Device="TC模块信号" Addr="w20.13" />
     <DI_ITEM Index="14"  Name="DI_ESC_Coolant_Outlet_TC_Broken_Alarm" Device="TC模块信号" Addr="w20.14" />
     <DI_ITEM Index="15"  Name="DI_Chamber_Pressure_10t_Gauge_Alarm" Device="VG_PPH_真空值比较" Addr="w20.15" />
-    <DI_ITEM Index="16"  Name="DI_Process_Pressure_1t_Gauge_Alarm" Device="VG PPL" Addr="w21.00" />
+    <DI_ITEM Index="16"  Name="DI_Process_Pressure_1t_Gauge_Alarm" Device="VG PPL" Addr="w21.00" /> 
     <DI_ITEM Index="17"  Name="" />
     <DI_ITEM Index="18"  Name="DI_Foreline_Pressure_10t_Gauge_Alarm" Device="TC模块信号" Addr="w21.02" />
     <DI_ITEM Index="19"  Name="" />
@@ -38,7 +38,7 @@
     <DI_ITEM Index="31"  Name="" />
     <DI_ITEM Index="32"  Name="" />
     <DI_ITEM Index="33"  Name=""/>
-    <DI_ITEM Index="34"  Name="DI_N2_Pressure_Switch" Device="PGN2" Addr="w22.02" Note="Gas Box" />
+    <DI_ITEM Index="34"  Name="DI_PN2_Pressure_Switch" Device="PGN2" Addr="w22.02" Note="Gas Box" />
     <DI_ITEM Index="35"  Name="DI_MFC1_Pressure_Switch" Device="PG1" Addr="w22.03" Note="Gas Box" />
     <DI_ITEM Index="36"  Name="DI_MFC2_Pressure_Switch" Device="PG2" Addr="w22.04" Note="Gas Box" />
     <DI_ITEM Index="37"  Name="DI_MFC3_Pressure_Switch" Device="PG3" Addr="w22.05" Note="Gas Box" />
@@ -149,7 +149,7 @@
     <DO_ITEM Index="28" Name="" />
     <DO_ITEM Index="29" Name="DO_Turbo_Pump_Pumping_Valve" Device="PV6" Addr="w1.13" />
     <DO_ITEM Index="30" Name="DO_Turbo_Pump_Purge_Valve" Device="PV7" Addr="w1.14" />
-    <DO_ITEM Index="31" Name="DO_Gauge_Valve" Device="PV8" Addr="w1.15" />
+    <DO_ITEM Index="31" Name="DO_Guage_Valve" Device="PV8" Addr="w1.15" />
     <DO_ITEM Index="32" Name="DO_Reset_Signal" Device="" Addr="w2.00" />
     <DO_ITEM Index="33" Name="DO_Valve_Heater_On" Device="" Addr="w2.01" />
     <DO_ITEM Index="34" Name="DO_Foreline_Heater_On" Device="" Addr="w2.02" />

Venus/Venus_RT/Devices/DeviceManager.cs

@@ -263,7 +263,7 @@ namespace Venus_RT.Instances
                     AddCustomDevice(new JetVenusSEPM(mod));
                     break;
                 case JetChamber.VenusDE:
-                    //AddCustomDevice(new JetVenusSEPM(mod));
+                    AddCustomDevice(new JetVenusSEPM(mod));
                     break;
             }
 

Venus/Venus_RT/Venus_RT.csproj

@@ -209,6 +209,7 @@
     <Compile Include="Devices\JetKepler2200BPM.cs" />
     <Compile Include="Devices\JetKepler2200APM.cs" />
     <Compile Include="Devices\JetPMBase.cs" />
+    <Compile Include="Devices\JetVenusDEPM.cs" />
     <Compile Include="Devices\JetVenusSEPM.cs" />
     <Compile Include="Devices\JetVenusSEPMBase.cs" />
     <Compile Include="Devices\JetVenusPM.cs" />

Venus/Venus_Simulator/Config/_ioDefineVenusSE_MF.xml

@@ -7,11 +7,11 @@
     <DI_ITEM Index="2" Name="DI_TM_DI3" Device="" Addr="w0.02" Note="VCE SLIT DOOR OPEN ENABLE" />
     <DI_ITEM Index="3" Name="DI_TM_DI5" Device="" Addr="w0.03" Note="PMA SLIT DOOR OPEN  ENABLE" />
     <DI_ITEM Index="4" Name="DI_TM_DI7" Device="" Addr="w0.04" Note="PMB SLIT DOOR OPEN  ENABLE" />
-    <DI_ITEM Index="5" Name="DI_TM_DI9" Device="" Addr="w0.05" Note="PMC SLIT DOOR OPEN  ENABLE" />
-    <DI_ITEM Index="6" Name="DI_TM_DI4" Device="" Addr="w0.06" Note="TM RB EXTEND VCE  ENABLE" />
-    <DI_ITEM Index="7" Name="DI_TM_DI6" Device="" Addr="w0.07" Note="TM RB EXTEND PMA  ENABLE" />
-    <DI_ITEM Index="8" Name="DI_TM_DI8" Device="" Addr="w0.08" Note="TM RB EXTEND PMB  ENABLE" />
-    <DI_ITEM Index="9" Name="DI_TM_DI10" Device="" Addr="w0.09" Note="TM RB EXTEND PMC  ENABLE" />
+    <DI_ITEM Index="5" Name="DI_VCE_A" Device="" Addr="w0.05" Note="VCE大气信号" />
+    <DI_ITEM Index="6" Name="DI_TM_A" Device="" Addr="w0.06" Note="TM大气信号" />
+    <DI_ITEM Index="7" Name="DI_VCE_SS" Device="" Addr="w0.07" Note="VCE wafer senser" />
+    <DI_ITEM Index="8" Name="DI_PMA_SS" Device="" Addr="w0.08" Note="PMA wafer senser" />
+    <DI_ITEM Index="9" Name="DI_PMB_SS" Device="" Addr="w0.09" Note="PMB wafer senser" />
     <DI_ITEM Index="10" Name="DI_SYS_C1" Device="" Addr="w0.10" Note="AC RACK FAN OK" />
     <DI_ITEM Index="11" Name="DI_SYS_C2" Device="" Addr="w0.11" Note="AC RACK Smoke Detector out1" />
     <DI_ITEM Index="12" Name="DI_SYS_C3" Device="" Addr="w0.12" Note="AC RACK Smoke Detector out2" />
@@ -34,11 +34,10 @@
     <DI_ITEM Index="29" Name="DI_PMA_RB_RET" Device="" Addr="w1.13" Note="ROBOT TO PMA RETRACT" />
     <DI_ITEM Index="30" Name="DI_PMB_RB_RET" Device="" Addr="w1.14" Note="ROBOT TO PMB RETRACT" />
     <DI_ITEM Index="31" Name="DI_PMC_RB_RET" Device="" Addr="w1.15" Note="ROBOT TO PMC RETRACT" />
-    <DI_ITEM Index="32" Name="DI_PMD_RB_RET" Device="" Addr="w2.00" Note="ROBOT TO PMD RETRACT" />
-    <DI_ITEM Index="33" Name="DI_TM_PMC_OPS" Device="" Addr="w2.01" Note="TM到PMC门阀开信号" />
-    <DI_ITEM Index="34" Name="DI_TM_PMC_CLS" Device="" Addr="w2.02" Note="TM到PMC门阀关信号" />
-    <DI_ITEM Index="35" Name="DI_TM_PMD_OPS" Device="" Addr="w2.03" Note="TM到PMD门阀开信号" />
-    <DI_ITEM Index="36" Name="DI_TM_PMD_CLS" Device="" Addr="w2.04" Note="TM到PMD门阀关信号" />
+    <DI_ITEM Index="32" Name="DI_TM_DI8" Device="" Addr="w2.00" Note="PMC SLIT DOOR OPEN  ENABLE" />
+    <DI_ITEM Index="33" Name="DI_PMC_SS" Device="" Addr="w2.01" Note="PMC wafer senser" />
+    <DI_ITEM Index="34" Name="DI_TM_PMC_OPS" Device="" Addr="w2.02" Note="TM到PMC门阀开信号" />
+    <DI_ITEM Index="35" Name="DI_TM_PMC_CLS" Device="" Addr="w2.03" Note="TM到PMC门阀关信号" />
   </Dig_In>
   <Dig_Out>
     <DO_ITEM Index="0" Name="" Device="" Addr="" />
@@ -49,30 +48,30 @@
     <DO_ITEM Index="5" Name="" Device="" Addr="" />
     <DO_ITEM Index="6" Name="" Device="" Addr="" />
     <DO_ITEM Index="7" Name="" Device="" Addr="" />
-    <DO_ITEM Index="8" Name="" Device="" Addr="" />
-    <DO_ITEM Index="9" Name="" Device="" Addr="" />
-    <DO_ITEM Index="10" Name="" Device="" Addr="" />
-    <DO_ITEM Index="11" Name="DO_TM_PMD_OP" Device="" Addr="w199.14" Note="TM到PMD门阀开"/>
-    <DO_ITEM Index="12" Name="DO_TM_PMD_CL" Device="" Addr="w199.15" Note="TM到PMD门阀关" />
+    <DO_ITEM Index="8" Name="DO_TM_PMC_OP" Device="" Addr="w199.11" Note="TM到PMC门阀开"/>
+    <DO_ITEM Index="9" Name="DO_TM_PMC_CL" Device="" Addr="w199.12" Note="TM到PMC门阀关"/>
+    <DO_ITEM Index="10" Name="DO_TM_V_LS" Device="" Addr="w199.13"  Note="TM腔慢抽真空"/>
+    <DO_ITEM Index="11" Name="DO_TM_BUZZER" Device="" Addr="w199.14" Note="蜂鸣"/>
+    <DO_ITEM Index="12" Name="DO_RED" Device="" Addr="w199.15" Note="报警灯1(红灯)" />
     <DO_ITEM Index="13" Name="DO_VCE_TM_OP" Device="" Addr="w200.00" Note="VCE到TM门阀开" />
     <DO_ITEM Index="14" Name="DO_VCE_TM_CL" Device="" Addr="w200.01" Note="VCE到TM门阀关" />
     <DO_ITEM Index="15" Name="DO_TM_PMA_OP" Device="" Addr="w200.02" Note="TM到PMA门阀开"/>
     <DO_ITEM Index="16" Name="DO_TM_PMA_CL" Device="" Addr="w200.03" Note="TM到PMA门阀关"/>
     <DO_ITEM Index="17" Name="DO_TM_PMB_OP" Device="" Addr="w200.04" Note="TM到PMB门阀开"/>
     <DO_ITEM Index="18" Name="DO_TM_PMB_CL" Device="" Addr="w200.05" Note="TM到PMB门阀关"/>
-    <DO_ITEM Index="19" Name="DO_TM_PMC_OP" Device="" Addr="w200.06" Note="TM到PMC门阀开"/>
-    <DO_ITEM Index="20" Name="DO_TM_PMC_CL" Device="" Addr="w200.07" Note="TM到PMC门阀关"/>
+    <DO_ITEM Index="19" Name="DO_ORANGE" Device="" Addr="w200.06" Note="报警灯2(橙灯)"/>
+    <DO_ITEM Index="20" Name="DO_GREEN" Device="" Addr="w200.07" Note="报警灯3(绿灯)"/>
     <DO_ITEM Index="21" Name="DO_TM_V_HS" Device="" Addr="w200.08" Note="TM腔快抽真空"/>
-    <DO_ITEM Index="22" Name="DO_TM_V_LS" Device="" Addr="w200.09" Note="TM腔慢抽真空"/>
+    <DO_ITEM Index="22" Name="DO_BLUE" Device="" Addr="w200.09" Note="报警灯4(蓝灯)"/>
     <DO_ITEM Index="23" Name="DO_TM_B_HS" Device="" Addr="w200.10" Note="TM腔快破真空"/>
     <DO_ITEM Index="24" Name="DO_TM_B_LS" Device=""  Addr="w200.11" Note="TM腔慢破真空"/>
     <DO_ITEM Index="25" Name="DO_VCE_V_HS" Device="" Addr="w200.12" Note="VCE腔快抽真空"/>
     <DO_ITEM Index="26" Name="DO_VCE_V_LS" Device="" Addr="w200.13" Note="VCE腔慢抽真空" />
     <DO_ITEM Index="27" Name="DO_VCE_B_HS" Device="" Addr="w200.14" Note="VCE腔快破真空"/>
     <DO_ITEM Index="28" Name="DO_VCE_B_LS" Device="" Addr="w200.15" Note="VCE腔慢破真空"/>
-    <DO_ITEM Index="29" Name="DO_V_220V" Device="" Addr="w201.00" Note="220V线圈"/>
-    <DO_ITEM Index="30" Name="DO_TM_C1" Device=""  Addr="w201.01" Note="系统允许断电"/>
-    <DO_ITEM Index="31" Name="DO_TM_C2" Device=""  Addr="w201.02" Note="备用"/>
+    <DO_ITEM Index="29" Name="DO_V_220V" Device="" Addr="w201.00" Note="水阀"/>
+    <DO_ITEM Index="30" Name="" Device=""  Addr="" Note=""/>
+    <DO_ITEM Index="31" Name="" Device=""  Addr="" Note=""/>
     <DO_ITEM Index="32" Name="" Device="" Addr="" />
     <DO_ITEM Index="33" Name="" Device="" Addr="" />
     <DO_ITEM Index="34" Name="" Device="" Addr="" />
@@ -80,8 +79,8 @@
     <DO_ITEM Index="36" Name="" Device="" Addr="" />
   </Dig_Out>
   <Ana_Out>
-    <AO_ITEM Index="0" Name="AO_MFC_Flow_Setpoint" BufferOffset="0" Device="" Addr="d200"  Note="MFC Flow Setpoint" />
-    <AO_ITEM Index="1" Name="AO_TM_Vacuum_Gauge" BufferOffset="1"  Device="" Addr="d201" Note="TM"/>
+    <AO_ITEM Index="0" Name="AO_MFC_Flow_Setpoint" BufferOffset="0" Device="" Addr="d308"  Note="MFC Flow Setpoint" />
+    <AO_ITEM Index="1" Name="" BufferOffset="" />
     <AO_ITEM Index="2" Name="" BufferOffset=""  />
     <AO_ITEM Index="3" Name="" BufferOffset="" />
     <AO_ITEM Index="4" Name="" BufferOffset="" />
@@ -132,11 +131,11 @@
     <AO_ITEM Index="49" Name="" />
   </Ana_Out>
   <Ana_In>
-    <AI_ITEM Index="0" Name="AI_MFC_Flow_Setpoint"  BufferOffset="2" Device="" Addr="D100" />
-    <AI_ITEM Index="1" Name="AI_VCE_Vacuum_Gauge"  BufferOffset="10" Device="" Addr="D101" />
-    <AI_ITEM Index="2" Name="AI_TM_Vacuum_Gauge"  BufferOffset="2" Device="" Addr="D102"/>
-    <AI_ITEM Index="3" Name="AI_VCE_Pipeline_Vacuum_Gauge"  BufferOffset="10" Device="" Addr="D103"/>
-    <AI_ITEM Index="4" Name="AI_TM_Pipeline_Vacuum_Gauge"  BufferOffset="22" Device="" Addr="D104"/>
+    <AI_ITEM Index="0" Name="AI_VCE_Vacuum_Gauge"  BufferOffset="0" Device="" Addr="D300" />
+    <AI_ITEM Index="1" Name="AI_TM_Vacuum_Gauge"  BufferOffset="2" Device="" Addr="D302" />
+    <AI_ITEM Index="2" Name="AI_Pipeline_Vacuum_Gauge"  BufferOffset="4" Device="" Addr="D304"/>
+    <AI_ITEM Index="3" Name="AI_MFC_Flow"  BufferOffset="6" Device="" Addr="D306"/>
+    <AI_ITEM Index="4" Name=""/>
     <AI_ITEM Index="5" Name=""/>
     <AI_ITEM Index="6" Name="" />
     <AI_ITEM Index="7" Name=""/>

Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -648,9 +648,12 @@ namespace Venus_Simulator.Instances
             IO.DI[$"{mod}.DI_TM_DI3"].Value = true;
             IO.DI[$"{mod}.DI_TM_DI5"].Value = true;
             IO.DI[$"{mod}.DI_TM_DI7"].Value = true;
-            IO.DI[$"{mod}.DI_TM_DI8"].Value = true;
-            IO.DI[$"{mod}.DI_TM_DI9"].Value = true;
-            IO.DI[$"{mod}.DI_TM_DI10"].Value = true;
+            IO.DI[$"{mod}.DI_VCE_A"].Value = true;
+            IO.DI[$"{mod}.DI_TM_A"].Value = true;
+            IO.DI[$"{mod}.DI_VCE_SS"].Value = false;
+            IO.DI[$"{mod}.DI_PMB_SS"].Value = false;
+            IO.DI[$"{mod}.DI_PMA_SS"].Value = false;
+            IO.DI[$"{mod}.DI_PMC_SS"].Value = false;
             IO.DI[$"{mod}.DI_SYS_C1"].Value = true;
             IO.DI[$"{mod}.DI_SYS_C2"].Value = false;
             IO.DI[$"{mod}.DI_SYS_C3"].Value = false;
@@ -666,15 +669,22 @@ namespace Venus_Simulator.Instances
             IO.DI[$"{mod}.DI_TM_PMC_OPS"].Value = false;
             IO.DI[$"{mod}.DI_TM_PMC_CLS"].Value = true;
             IO.DI[$"{mod}.DI_TM_HE"].Value = true;
+            IO.DI[$"{mod}.DI_TM_N2_2"].Value = true;
+            IO.DI[$"{mod}.DI_TM_DI8"].Value = true;
+            IO.DI[$"{mod}.DI_TM_LEAK"].Value = true;
+            IO.DI[$"{mod}.DI_TM_CDA"].Value = true;
+            IO.DI[$"{mod}.DI_VCE_V"].Value = false;
+            IO.DI[$"{mod}.DI_TM_V"].Value = false;
+            IO.DI[$"{mod}.DI_TM_LEAK"].Value = true;
+            IO.DI[$"{mod}.DI_VCE_RB_RET"].Value = true;
             IO.DI[$"{mod}.DI_VCE_RB_RET"].Value = true;
             IO.DI[$"{mod}.DI_PMA_RB_RET"].Value = true;
             IO.DI[$"{mod}.DI_PMB_RB_RET"].Value = true;
             IO.DI[$"{mod}.DI_PMC_RB_RET"].Value = true;
 
-            SetAiValue($"{mod}.AI_MFC_Flow_Setpoint", 3000);
+            SetAiValue($"{mod}.AI_MFC_Flow", 3000);
             SetAiValue($"{mod}.AI_VCE_Vacuum_Gauge", 3000);
-            SetAiValue($"{mod}.AI_VCE_Pipeline_Vacuum_Gauge", 3000);
-            SetAiValue($"{mod}.AI_TM_Pipeline_Vacuum_Gauge", 3000);
+            SetAiValue($"{mod}.AI_Pipeline_Vacuum_Gauge", 3000);
             SetAiValue($"{mod}.AI_TM_Vacuum_Gauge", 3000);
         }
 
@@ -900,31 +910,18 @@ namespace Venus_Simulator.Instances
             }
 
             //pmc
-            if (IO.DO[$"{mod}.DO_TM_PMC_OP"].Value)
-            {
-
-                IO.DI[$"{mod}.DI_TM_PMC_OPS"].Value = true;
-                IO.DI[$"{mod}.DI_TM_PMC_CLS"].Value = false;
-            }
-
-            if (IO.DO[$"{mod}.DO_TM_PMC_CL"].Value)
-            {
-                IO.DI[$"{mod}.DI_TM_PMC_OPS"].Value = false;
-                IO.DI[$"{mod}.DI_TM_PMC_CLS"].Value = true;
-            }
-            //pmd
-            if (IO.DO[$"{mod}.DO_TM_PMD_OP"].Value)
-            {
+            //if (IO.DO[$"{mod}.DO_TM_PMC_OP"].Value)
+            //{
 
-                IO.DI[$"{mod}.DI_TM_PMD_OPS"].Value = true;
-                IO.DI[$"{mod}.DI_TM_PMD_CLS"].Value = false;
-            }
+            //    IO.DI[$"{mod}.DI_TM_PMC_OPS"].Value = true;
+            //    IO.DI[$"{mod}.DI_TM_PMC_CLS"].Value = false;
+            //}
 
-            if (IO.DO[$"{mod}.DO_TM_PMD_CL"].Value)
-            {
-                IO.DI[$"{mod}.DI_TM_PMD_OPS"].Value = false;
-                IO.DI[$"{mod}.DI_TM_PMD_CLS"].Value = true;
-            }
+            //if (IO.DO[$"{mod}.DO_TM_PMC_CL"].Value)
+            //{
+            //    IO.DI[$"{mod}.DI_TM_PMC_OPS"].Value = false;
+            //    IO.DI[$"{mod}.DI_TM_PMC_CLS"].Value = true;
+            //}
         }