Browse Source

Simulator Communication Port Update

Intern01 1 year ago
parent
commit
c5abe7c813

+ 23 - 23
Venus/Venus_RT/Config/System.sccfg

@@ -318,7 +318,7 @@
 		<configs name="Rf" nameView="Source RF" >
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM14" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM38" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="RF IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="500" name="PowerAlarmRange" nameView="Power Alarm Range" description="" max="1000" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="10" name="PowerAlarmTime" nameView="Power Alarm Time" description="" max="10" min="0" paramter="" tag="" unit="" type="Double" />
@@ -350,7 +350,7 @@
 			<config default="false" name="EnableMatch" nameView="Enable Source Match" description="enable match or not" max="1" min="0" tag="" unit="" type="Bool" />
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM15" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM40" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="Match IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="1" name="MatchMode" nameView="Match Mode" description="" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="false" name="EnableC1C2Position" nameView="Enable Source C1 C2 Position" description="" max="10" min="0" paramter="" tag="" unit="" type="Bool" />
@@ -766,7 +766,7 @@
 			<config default="false" name="ChillerSameWithPMA" nameView="Chiller Same With PMA" description="enable chiller same with PMA or not" max="1" min="0" tag="" unit="" type="Bool" />
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:SMC; 2, AIRSYS" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM44" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM46" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="10" name="ChillerTemperatureOffset" nameView="Chiller Temperature Offset" description="" max="100" min="0" paramter="" tag="" unit="degree" type="Double" />
 			<config default="300" name="SetPointLimitMax" nameView="Chiller Set Point Limit Max" description="" max="500" min="0" paramter="" tag="" unit="degree" type="Double" />
 			<config default="0" name="SetPointLimitMin" nameView="Chiller Set Point Limit Min" description="" max="500" min="0" paramter="" tag="" unit="degree" type="Double" />
@@ -813,14 +813,14 @@
 		<configs name="DryPump" nameView="Dry Pump" >
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:Sky; 2:Edwards" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM22" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM34" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="1000" name="ChamberForelinePressureThreshold" nameView="Chamber Foreline Pressure Threshold" description="" max="10000" min="0" paramter="" tag="" unit="mtorr" type="Double" />
 			<config default="20" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
 		</configs>
 		<configs name="Rf" nameView="Source RF" >
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM14" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM36" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="RF IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="500" name="PowerAlarmRange" nameView="Power Alarm Range" description="" max="1000" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="10" name="PowerAlarmTime" nameView="Power Alarm Time" description="" max="10" min="0" paramter="" tag="" unit="" type="Double" />
@@ -844,7 +844,7 @@
 			<config default="false" name="EnableMatch" nameView="Enable Source Match" description="enable match or not" max="1" min="0" tag="" unit="" type="Bool" />
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM15" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM42" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="Match IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="1" name="MatchMode" nameView="Match Mode" description="" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="false" name="EnableC1C2Position" nameView="Enable Source C1 C2 Position" description="" max="10" min="0" paramter="" tag="" unit="" type="Bool" />
@@ -1154,15 +1154,15 @@
 			<config name="OffsetValue_9" nameView="Offset Value 9" description="补偿值 9" unit="degree" type="Double" max="300" min="0" />
 		</configs>
 		<configs name="ElectrostaticVoltageSource" nameView="Electrostatic Voltage Source">
-			<config default="COM64" name="Port" nameView="Port" description="serial port name of ElectrostaticVoltageSource" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM48" name="Port" nameView="Port" description="serial port name of ElectrostaticVoltageSource" max="" min="" paramter="" tag="" unit="" type="String" />
 		</configs>
 		<configs name="TurboPump" nameView="Turbo Pump">
-			<config default="COM62" name="Port" nameView="Port" description="serial port name of TurboPump" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM2" name="Port" nameView="Port" description="serial port name of TurboPump" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="500" name="ChamberForelinePressureThreshold" nameView="Chamber Foreline Pressure Threshold" description="" max="10000" min="0" paramter="" tag="" unit="mtorr" type="Double" />
 			<config default="30" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
 		</configs>
 		<configs name="PendulumValve" nameView="Pendulum Valve">
-			<config default="COM66" name="Port" nameView="Port" description="serial port name of PendulumValve" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM74" name="Port" nameView="Port" description="serial port name of PendulumValve" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="400" name="PressureFullRange" nameView="PressureFullRange" description="Pressure Full Range of PendulumValve" max="100000" min="0" paramter="" tag="" unit="mtorr" type="Integer" />
 		</configs>
 
@@ -1252,7 +1252,7 @@
 			<config default="false" name="ChillerSameWithPMA" nameView="Chiller Same With PMA" description="enable chiller same with PMA or not" max="1" min="0" tag="" unit="" type="Bool" />
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:SMC; 2, AIRSYS" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM44" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM86" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="10" name="ChillerTemperatureOffset" nameView="Chiller Temperature Offset" description="" max="100" min="0" paramter="" tag="" unit="degree" type="Double" />
 			<config default="300" name="SetPointLimitMax" nameView="Chiller Set Point Limit Max" description="" max="500" min="0" paramter="" tag="" unit="degree" type="Double" />
 			<config default="0" name="SetPointLimitMin" nameView="Chiller Set Point Limit Min" description="" max="500" min="0" paramter="" tag="" unit="degree" type="Double" />
@@ -1299,14 +1299,14 @@
 		<configs name="DryPump" nameView="Dry Pump" >
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:Sky; 2:Edwards" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM22" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM96" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="1000" name="ChamberForelinePressureThreshold" nameView="Chamber Foreline Pressure Threshold" description="" max="10000" min="0" paramter="" tag="" unit="mtorr" type="Double" />
 			<config default="20" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
 		</configs>
 		<configs name="Rf" nameView="Source RF" >
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM14" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM59" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="RF IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="500" name="PowerAlarmRange" nameView="Power Alarm Range" description="" max="1000" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="10" name="PowerAlarmTime" nameView="Power Alarm Time" description="" max="10" min="0" paramter="" tag="" unit="" type="Double" />
@@ -1330,7 +1330,7 @@
 			<config default="false" name="EnableMatch" nameView="Enable Source Match" description="enable match or not" max="1" min="0" tag="" unit="" type="Bool" />
 			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-			<config default="COM15" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM75" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="Match IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="1" name="MatchMode" nameView="Match Mode" description="" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="false" name="EnableC1C2Position" nameView="Enable Source C1 C2 Position" description="" max="10" min="0" paramter="" tag="" unit="" type="Bool" />
@@ -1640,15 +1640,15 @@
 			<config name="OffsetValue_9" nameView="Offset Value 9" description="补偿值 9" unit="degree" type="Double" max="300" min="0" />
 		</configs>
 		<configs name="ElectrostaticVoltageSource" nameView="Electrostatic Voltage Source">
-			<config default="COM64" name="Port" nameView="Port" description="serial port name of ElectrostaticVoltageSource" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM17" name="Port" nameView="Port" description="serial port name of ElectrostaticVoltageSource" max="" min="" paramter="" tag="" unit="" type="String" />
 		</configs>
 		<configs name="TurboPump" nameView="Turbo Pump">
-			<config default="COM62" name="Port" nameView="Port" description="serial port name of TurboPump" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM3" name="Port" nameView="Port" description="serial port name of TurboPump" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="500" name="ChamberForelinePressureThreshold" nameView="Chamber Foreline Pressure Threshold" description="" max="10000" min="0" paramter="" tag="" unit="mtorr" type="Double" />
 			<config default="30" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
 		</configs>
 		<configs name="PendulumValve" nameView="Pendulum Valve">
-			<config default="COM66" name="Port" nameView="Port" description="serial port name of PendulumValve" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="COM77" name="Port" nameView="Port" description="serial port name of PendulumValve" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="400" name="PressureFullRange" nameView="PressureFullRange" description="Pressure Full Range of PendulumValve" max="100000" min="0" paramter="" tag="" unit="mtorr" type="Integer" />
 		</configs>
 
@@ -1738,7 +1738,7 @@
       <config default="false" name="ChillerSameWithPMA" nameView="Chiller Same With PMA" description="enable chiller same with PMA or not" max="1" min="0" tag="" unit="" type="Bool" />
       <config default="1" name="MFG" nameView="MFG" description="厂商, 1:SMC; 2, AIRSYS" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
       <config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-      <config default="COM44" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
+      <config default="COM27" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="10" name="ChillerTemperatureOffset" nameView="Chiller Temperature Offset" description="" max="100" min="0" paramter="" tag="" unit="degree" type="Double" />
       <config default="300" name="SetPointLimitMax" nameView="Chiller Set Point Limit Max" description="" max="500" min="0" paramter="" tag="" unit="degree" type="Double" />
       <config default="0" name="SetPointLimitMin" nameView="Chiller Set Point Limit Min" description="" max="500" min="0" paramter="" tag="" unit="degree" type="Double" />
@@ -1785,14 +1785,14 @@
     <configs name="DryPump" nameView="Dry Pump" >
       <config default="1" name="MFG" nameView="MFG" description="厂商, 1:Sky; 2:Edwards" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
       <config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-      <config default="COM22" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
+      <config default="COM29" name="Port" nameView="Port" description="serial port name of pump" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="1000" name="ChamberForelinePressureThreshold" nameView="Chamber Foreline Pressure Threshold" description="" max="10000" min="0" paramter="" tag="" unit="mtorr" type="Double" />
       <config default="20" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
     </configs>
     <configs name="Rf" nameView="Source RF" >
       <config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
       <config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-      <config default="COM14" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
+      <config default="COM41" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="RF IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="500" name="PowerAlarmRange" nameView="Power Alarm Range" description="" max="1000" min="0" paramter="" tag="" unit="" type="Double" />
       <config default="10" name="PowerAlarmTime" nameView="Power Alarm Time" description="" max="10" min="0" paramter="" tag="" unit="" type="Double" />
@@ -1816,7 +1816,7 @@
       <config default="false" name="EnableMatch" nameView="Enable Source Match" description="enable match or not" max="1" min="0" tag="" unit="" type="Bool" />
       <config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
       <config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
-      <config default="COM15" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
+      <config default="COM51" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="Match IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="1" name="MatchMode" nameView="Match Mode" description="" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
       <config default="false" name="EnableC1C2Position" nameView="Enable Source C1 C2 Position" description="" max="10" min="0" paramter="" tag="" unit="" type="Bool" />
@@ -2126,15 +2126,15 @@
       <config name="OffsetValue_9" nameView="Offset Value 9" description="补偿值 9" unit="degree" type="Double" max="300" min="0" />
     </configs>
     <configs name="ElectrostaticVoltageSource" nameView="Electrostatic Voltage Source">
-      <config default="COM64" name="Port" nameView="Port" description="serial port name of ElectrostaticVoltageSource" max="" min="" paramter="" tag="" unit="" type="String" />
+      <config default="COM53" name="Port" nameView="Port" description="serial port name of ElectrostaticVoltageSource" max="" min="" paramter="" tag="" unit="" type="String" />
     </configs>
     <configs name="TurboPump" nameView="Turbo Pump">
-      <config default="COM62" name="Port" nameView="Port" description="serial port name of TurboPump" max="" min="" paramter="" tag="" unit="" type="String" />
+      <config default="COM5" name="Port" nameView="Port" description="serial port name of TurboPump" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="500" name="ChamberForelinePressureThreshold" nameView="Chamber Foreline Pressure Threshold" description="" max="10000" min="0" paramter="" tag="" unit="mtorr" type="Double" />
       <config default="30" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
     </configs>
     <configs name="PendulumValve" nameView="Pendulum Valve">
-      <config default="COM66" name="Port" nameView="Port" description="serial port name of PendulumValve" max="" min="" paramter="" tag="" unit="" type="String" />
+      <config default="COM57" name="Port" nameView="Port" description="serial port name of PendulumValve" max="" min="" paramter="" tag="" unit="" type="String" />
       <config default="400" name="PressureFullRange" nameView="PressureFullRange" description="Pressure Full Range of PendulumValve" max="100000" min="0" paramter="" tag="" unit="mtorr" type="Integer" />
     </configs>
 

+ 6 - 1
Venus/Venus_RT/Devices/IODevices/IoHeater.cs

@@ -232,6 +232,7 @@ namespace Venus_RT.Devices
         private ToleranceChecker _checkerAlarm = new ToleranceChecker();
 
         private string HeaterDeviationAlarm = "HeaterDeviationAlarm";
+        private bool isinit;
 
 
         public IoHeater(string module, XmlElement node, string ioModule = "")
@@ -315,7 +316,7 @@ namespace Venus_RT.Devices
             _scDeviationWarningTime = SC.GetConfigItem($"{Module}.{Name}.HeaterWarningTime");
 
             EV.Subscribe(new EventItem("Event", HeaterDeviationAlarm, "Heater Deviation Out of Tolerance", EventLevel.Alarm, EventType.HostNotification));
-
+            isinit = true;
             return true;
         }
 
@@ -386,6 +387,10 @@ namespace Venus_RT.Devices
         {
             try
             {
+                if (isinit == false)
+                {
+                    return;
+                }
                 _trigControlTcBroken.CLK = IsControlTcBroken;
                 if (_trigControlTcBroken.Q)
                 {

+ 7 - 8
Venus/Venus_Simulator/Config/UILayout.xml

@@ -34,16 +34,11 @@
 	  <SubView Id="io2" Name="IO-PMB" ViewClass="Venus_Simulator.Views.SimulatorIo2View" Assembly="Venus_Simulator"/>
  
 	  <SubView Id="SkyPumpPMB" Name="SkyPumpPMB" ViewClass="Venus_Simulator.Views.SimuSkyPumpPMBView" Assembly="Venus_Simulator" />
-
- 
 	  <SubView Id="EdwardsPumpPMB" Name="EdwardsPumpPMB" ViewClass="Venus_Simulator.Views.SimuEdwardsPumpPMBView" Assembly="Venus_Simulator" />
-
- 
-	  <SubView Id="AdTecRFGPMB" Name="AdTecRFGPMB" ViewClass="Venus_Simulator.Views.SimuAdTecGeneratorPMBView" Assembly="Venus_Simulator" />
-	  
+	  <SubView Id="AdTecRFGPMB" Name="AdTecRFGPMB" ViewClass="Venus_Simulator.Views.SimuAdTecGeneratorPMBView" Assembly="Venus_Simulator" />  
 	  <SubView Id="AdTecMatchPMB" Name="AdTecMatchPMB" ViewClass="Venus_Simulator.Views.SimuAdTecMatchPMBView" Assembly="Venus_Simulator" />
-
-	 
+    <SubView Id="TurboPumpPMB" Name="Turbo Pump" ViewClass="Venus_Simulator.Views.SimuTurboPumpPMBView" Assembly="Venus_Simulator" />
+    <SubView Id="PendulumValvePMA" Name="Pendulum Valve" ViewClass="Venus_Simulator.Views.SimuPendulumPMBView" Assembly="Venus_Simulator" />
 	  <SubView Id="SMCChillerPMB" Name="SMCChillerPMB" ViewClass="Venus_Simulator.Views.SimuSMCChillerPMBView" Assembly="Venus_Simulator" />
 	  <SubView Id="SMCChillerGridPMB" Name="Grid Chiller" ViewClass="Venus_Simulator.Views.SimuSMCChillerGridPMBView" Assembly="Venus_Simulator" />
 
@@ -56,6 +51,8 @@
     <SubView Id="EdwardsPumpPMC" Name="EdwardsPumpPMC" ViewClass="Venus_Simulator.Views.SimuEdwardsPumpPMCView" Assembly="Venus_Simulator"/>
     <SubView Id="AdTecRFGPMC" Name="AdTecRFGPMC" ViewClass="Venus_Simulator.Views.SimuAdTecGeneratorPMCView" Assembly="Venus_Simulator"/>
     <SubView Id="AdTecMatchPMC" Name="AdTecMatchPMC" ViewClass="Venus_Simulator.Views.SimuAdTecMatchPMCView" Assembly="Venus_Simulator" />
+    <SubView Id="TurboPumpPMC" Name="Turbo Pump" ViewClass="Venus_Simulator.Views.SimuTurboPumpPMCView" Assembly="Venus_Simulator" />
+    <SubView Id="PendulumValvePMC" Name="Pendulum Valve" ViewClass="Venus_Simulator.Views.SimuPendulumPMCView" Assembly="Venus_Simulator" />
     <SubView Id="SMCChillerPMC" Name="SMCChillerPMC" ViewClass="Venus_Simulator.Views.SimuSMCChillerPMCView" Assembly="Venus_Simulator" />
     <SubView Id="SMCChillerGridPMC" Name="Grid Chiller" ViewClass="Venus_Simulator.Views.SimuSMCChillerGridPMCView" Assembly="Venus_Simulator"/>
   </Navigation>
@@ -67,6 +64,8 @@
     <SubView Id="EdwardsPumpPMD" Name="EdwardsPumpPMD" ViewClass="Venus_Simulator.Views.SimuEdwardsPumpPMDView" Assembly="Venus_Simulator"/>
     <SubView Id="AdTecRFGPMD" Name="AdTecRFGPMD" ViewClass="Venus_Simulator.Views.SimuAdTecGeneratorPMDView" Assembly="Venus_Simulator"/>
     <SubView Id="AdTecMatchPMD" Name="AdTecMatchPMD" ViewClass="Venus_Simulator.Views.SimuAdTecMatchPMDView" Assembly="Venus_Simulator" />
+    <SubView Id="TurboPumpPMD" Name="Turbo Pump" ViewClass="Venus_Simulator.Views.SimuTurboPumpPMDView" Assembly="Venus_Simulator" />
+    <SubView Id="PendulumValvePMD" Name="Pendulum Valve" ViewClass="Venus_Simulator.Views.SimuPendulumPMDView" Assembly="Venus_Simulator" />
     <SubView Id="SMCChillerPMD" Name="SMCChillerPMD" ViewClass="Venus_Simulator.Views.SimuSMCChillerPMDView" Assembly="Venus_Simulator" />
     <SubView Id="SMCChillerGridPMD" Name="Grid Chiller" ViewClass="Venus_Simulator.Views.SimuSMCChillerGridPMDView" Assembly="Venus_Simulator"/>
   </Navigation>

+ 1 - 1
Venus/Venus_Simulator/Devices/AdTecGeneratorMockPMC.cs

@@ -17,7 +17,7 @@ namespace Venus_Simulator.Devices
         public static GeneratorStatus _simGeneratorStatus;
         private const string EOF = "\r";
         private const char MSG_DELIMITER = '_';
-        private const string MOCKUP_PORT = "COM93";
+        private const string MOCKUP_PORT = "COM60";
 
         public AdTecGeneratorMockPMC() : base(MOCKUP_PORT, -1, EOF, MSG_DELIMITER)
         {

+ 1 - 1
Venus/Venus_Simulator/Devices/AdTecMatchMockPMC.cs

@@ -8,7 +8,7 @@ namespace Venus_Simulator.Devices
     {
         private const string EOF = "\r";
         private const char MSG_DELIMITER = '\r';
-        private const string MOCKUP_PORT = "COM94";
+        private const string MOCKUP_PORT = "COM76";
 
         public AdTecMatchMockPMC() : base(MOCKUP_PORT, -1, EOF, MSG_DELIMITER)
         {

+ 5 - 4
Venus/Venus_Simulator/Devices/SMCChillerMockPMB.cs

@@ -64,13 +64,14 @@ namespace Venus_Simulator.Devices
                     module = "PMA";
                     break;
                 case "COM45":
-                case "COM55":
                     module = "PMB";
                      break;
-                case "COM97":
-                case "COM57":
+                case "COM86":
                     module = "PMC";
-                    break;     
+                    break;
+                case "COM28":
+                    module = "PMD";
+                    break;
                 default:
                     module = "PMB";
                     break;

+ 1 - 1
Venus/Venus_Simulator/Devices/SkyPumpMockPMC.cs

@@ -15,7 +15,7 @@ namespace Venus_Simulator.Devices
         public static SimPumpStatus _simPumpStatus;
         private const string EOF = "\r\n";
         private const char MSG_DELIMITER = ' ';
-        private const string MOCKUP_PORT = "COM71";
+        private const string MOCKUP_PORT = "COM97";
 
         public SkyPumpMockPMC() : base(MOCKUP_PORT, -1, EOF, MSG_DELIMITER)
         {

+ 75 - 0
Venus/Venus_Simulator/Venus_Simulator.csproj

@@ -78,18 +78,30 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Devices\AdTecGeneratorMockPMD.cs" />
     <Compile Include="Devices\AdTecGeneratorMockPMC.cs" />
+    <Compile Include="Devices\AdTecMatchMockPMD.cs" />
     <Compile Include="Devices\AdTecMatchMockPMC.cs" />
     <Compile Include="Devices\AIRSYSChillerMock.cs" />
     <Compile Include="Devices\EdwardsPumpMockLL.cs" />
     <Compile Include="Devices\EdwardsPumpMockPMC.cs" />
     <Compile Include="Devices\EdwardsPumpMockTM.cs" />
+    <Compile Include="Devices\ESCHVMockPMD.cs" />
+    <Compile Include="Devices\ESCHVMockPMC.cs" />
+    <Compile Include="Devices\ESCHVMockPMB.cs" />
     <Compile Include="Devices\ESCHVMockPMA.cs" />
+    <Compile Include="Devices\PendulumValveMockPMD.cs" />
+    <Compile Include="Devices\PendulumValveMockPMC.cs" />
+    <Compile Include="Devices\PendulumValveMockPMB.cs" />
     <Compile Include="Devices\PendulumValveMockPMA.cs" />
     <Compile Include="Devices\SkyPumpMockLL.cs" />
+    <Compile Include="Devices\SkyPumpMockPMD.cs" />
     <Compile Include="Devices\SkyPumpMockPMC.cs" />
     <Compile Include="Devices\SkyPumpMockTM.cs" />
     <Compile Include="Devices\TMSimulatorServer.cs" />
+    <Compile Include="Devices\TurboPumpMockPMC.cs" />
+    <Compile Include="Devices\TurboPumpMockPMD.cs" />
+    <Compile Include="Devices\TurboPumpMockPMB.cs" />
     <Compile Include="Devices\TurboPumpMockPMA.cs" />
     <Compile Include="Instances\SystemConfig.cs" />
     <Compile Include="JetChamber.cs" />
@@ -150,6 +162,15 @@
     <Compile Include="Views\SimuEdwardsPumpPMBView.xaml.cs">
       <DependentUpon>SimuEdwardsPumpPMBView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\simuESCHVPMDView.xaml.cs">
+      <DependentUpon>simuESCHVPMDView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\simuESCHVPMCView.xaml.cs">
+      <DependentUpon>simuESCHVPMCView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\simuESCHVPMBView.xaml.cs">
+      <DependentUpon>simuESCHVPMBView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\simuESCHVPMAView.xaml.cs">
       <DependentUpon>simuESCHVPMAView.xaml</DependentUpon>
     </Compile>
@@ -168,6 +189,15 @@
     <Compile Include="Views\SimulatorIoTMView.xaml.cs">
       <DependentUpon>SimulatorIoTMView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SimuPendulumValvePMDView.xaml.cs">
+      <DependentUpon>SimuPendulumValvePMDView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SimuPendulumValvePMCView.xaml.cs">
+      <DependentUpon>SimuPendulumValvePMCView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SimuPendulumValvePMBView.xaml.cs">
+      <DependentUpon>SimuPendulumValvePMBView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SimuPendulumValvePMAView.xaml.cs">
       <DependentUpon>SimuPendulumValvePMAView.xaml</DependentUpon>
     </Compile>
@@ -216,6 +246,15 @@
     <Compile Include="Views\SimuSMCChillerPMBView.xaml.cs">
       <DependentUpon>SimuSMCChillerPMBView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SimuTurboPumpPMDView.xaml.cs">
+      <DependentUpon>SimuTurboPumpPMDView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SimuTurboPumpPMCView.xaml.cs">
+      <DependentUpon>SimuTurboPumpPMCView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SimuTurboPumpPMBView.xaml.cs">
+      <DependentUpon>SimuTurboPumpPMBView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SimuTurboPumpPMAView.xaml.cs">
       <DependentUpon>SimuTurboPumpPMAView.xaml</DependentUpon>
     </Compile>
@@ -375,6 +414,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\simuESCHVPMDView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\simuESCHVPMCView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\simuESCHVPMBView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\simuESCHVPMAView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -399,6 +450,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\SimuPendulumValvePMDView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SimuPendulumValvePMCView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SimuPendulumValvePMBView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\SimuPendulumValvePMAView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -463,6 +526,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\SimuTurboPumpPMDView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SimuTurboPumpPMCView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SimuTurboPumpPMBView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\SimuTurboPumpPMAView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

+ 1 - 1
Venus/Venus_Simulator/Views/SimuAdTecGeneratorPMDView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockAdTecGeneratorViewModelPMD() : base("AdTecPMDRFG")
         {
-            Init(new AdTecGeneratorMockPMC());
+            Init(new AdTecGeneratorMockPMD());
         }
     }
 }

+ 1 - 1
Venus/Venus_Simulator/Views/SimuAdTecMatchPMCView.xaml.cs

@@ -20,7 +20,7 @@ namespace Venus_Simulator.Views
     {
         public string Title
         {
-            get { return "AdTEC match PMB simulator"; }
+            get { return "AdTEC match PMC simulator"; }
         }
 
         public MockAdTecMatchViewModelPMC() : base("AdTecMatchPMBSimulator")

+ 1 - 1
Venus/Venus_Simulator/Views/SimuAdTecMatchPMDView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockAdTecMatchViewModelPMD() : base("AdTecMatchPMDSimulator")
         {
-            Init(new AdTecMatchMockPMC());
+            Init(new AdTecMatchMockPMD());
         }
     }
 }

+ 1 - 1
Venus/Venus_Simulator/Views/SimuSMCChillerPMCView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockSMCChillerViewModelPMC() : base("SMCChillerPMCSimulator")
         {
-            Init(new SMCChillerMock("COM97"));
+            Init(new SMCChillerMock("COM85"));
         }
     }
 }

+ 1 - 1
Venus/Venus_Simulator/Views/SimuSMCChillerPMDView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockSMCChillerViewModelPMD() : base("SMCChillerPMDSimulator")
         {
-            Init(new SMCChillerMock("COM97"));
+            Init(new SMCChillerMock("COM28"));
         }
     }
 }

+ 1 - 1
Venus/Venus_Simulator/Views/SimuSkyPumpPMDView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockSkyPumpViewModelPMD() : base("SkyPumpPMDSimulator")
         {
-            Init(new SkyPumpMockPMC());
+            Init(new SkyPumpMockPMD());
         }
     }
 }