revise reservoir config

CyberX8_MainPages/ViewModels/StandardHotReservoirsViewModel.cs

@@ -732,17 +732,17 @@ namespace CyberX8_MainPages.ViewModels
             }
             _timer.Start();
             //加载Config
-            _reservoirCMMFlowHighWarning = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMFlowHighWarning"));
-            _reservoirCMMFlowHighError = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMFlowHighFault"));
-            _reservoirCMMFlowLowWarning = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMFlowLowWarning"));
-            _reservoirCMMFlowLowError = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMFlowLowFault"));
-            CMMAnodeLifeTimeAHrs = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMAnodeLifeTimeAHrs"));
-            CMMCathodeLifeTimeAHrs = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMCathodeLifeTimeAHrs"));
+            _reservoirCMMFlowHighWarning = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMFlowHighWarning"));
+            _reservoirCMMFlowHighError = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMFlowHighFault"));
+            _reservoirCMMFlowLowWarning = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMFlowLowWarning"));
+            _reservoirCMMFlowLowError = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMFlowLowFault"));
+            CMMAnodeLifeTimeAHrs = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMAnodeLifeTimeAHrs"));
+            CMMCathodeLifeTimeAHrs = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMCathodeLifeTimeAHrs"));
             _reservoirHighLevel = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.HighLevel"));
-            _cmmAnodeTotalAmpHoursWarningLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMAnodeTotalAmpHoursWarningLimit"));
-            _cmmAnodeTotalAmpHoursFaultLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMAnodeTotalAmpHoursFaultLimit"));
-            _cmmCathodeTotalAmpHoursWarningLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMCathodeTotalAmpHoursWarningLimit"));
-            _cmmCathodeTotalAmpHoursFaultLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig("Reservoir.CMM.CMMCathodeTotalAmpHoursFaultLimit"));
+            _cmmAnodeTotalAmpHoursWarningLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMAnodeTotalAmpHoursWarningLimit"));
+            _cmmAnodeTotalAmpHoursFaultLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMAnodeTotalAmpHoursFaultLimit"));
+            _cmmCathodeTotalAmpHoursWarningLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMCathodeTotalAmpHoursWarningLimit"));
+            _cmmCathodeTotalAmpHoursFaultLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMCathodeTotalAmpHoursFaultLimit"));
 
         }
 

CyberX8_RT/Config/Devices/FestoControllerCfg.xml

@@ -13,13 +13,13 @@
 		<DO Name="Festo.DO9"  Address="40004" Invert="false" Bit="1"/>
 		<DO Name="c_QDRD1_DI_FILL" Address="40004" Invert="false" Bit="2"/>
 		<DO Name="c_QDRD1_DUMP" Address="40004" Invert="false" Bit="3"/>
-		<DO Name="c_RESERVOIR1_DI_REPLEN" Address="40004" Invert="false" Bit="4"/>
+		<DO Name="c_RES1_DI_REPLEN" Address="40004" Invert="false" Bit="4"/>
 		<DO Name="c_QDRD2_DI_FILL" Address="40004" Invert="false" Bit="5"/>
 		<DO Name="c_QDRD2_DUMP" Address="40004" Invert="false" Bit="6"/>
-		<DO Name="c_RESERVOIR2_DI_REPLEN" Address="40004" Invert="false" Bit="7"/>
+		<DO Name="c_RES2_DI_REPLEN" Address="40004" Invert="false" Bit="7"/>
 		<DO Name="c_QDRD3_DI_FILL" Address="40005" Invert="false" Bit="0"/>
 		<DO Name="c_QDRD3_DUMP" Address="40005" Invert="false" Bit="1"/>
-		<DO Name="c_RESERVOIR3_DI_REPLEN" Address="40005" Invert="false" Bit="2"/>
+		<DO Name="c_RES3_DI_REPLEN" Address="40005" Invert="false" Bit="2"/>
 		<DO Name="c_PH2_FLOW_VALVE" Address="40005" Invert="false" Bit="3"/>
 		<DO Name="Festo.DO20" Address="40005" Invert="false" Bit="4"/>
 		<DO Name="Festo.DO21" Address="40005" Invert="false" Bit="5"/>
@@ -65,7 +65,7 @@
 	<DO Name="Festo.DO3"  Address="40003" Invert="false" Bit="3"/>
 	<DO Name="Festo.DO4"  Address="40003" Invert="false" Bit="4"/>
 	<DO Name="Festo.DO5"  Address="40003" Invert="false" Bit="5"/>
-	<DO Name="c_RESERVOIR4_DI_REPLEN"  Address="40003" Invert="false" Bit="6"/>
+	<DO Name="c_RES4_DI_REPLEN"  Address="40003" Invert="false" Bit="6"/>
 	<DO Name="Festo.DO7"  Address="40003" Invert="false" Bit="7"/>
 	<DO Name="c_METAL3_CIRCULATION"  Address="40004" Invert="false" Bit="0"/>
 	<DO Name="Festo.DO9"  Address="40004" Invert="false" Bit="1"/>

CyberX8_RT/Config/Devices/ModuleIOCfg.xml

@@ -415,7 +415,7 @@
 	<IO Name="Reservoir1.HedFlow" IOName="r_RES1_HED_FLOW"/>
 	</Module>
 	<Module Name="Reservoir2">
-	<IO Name="Reservoir2.Flow" IOName="r_RES2_CMM_FLOW"/>
+	<IO Name="Reservoir2.Flow" IOName="r_MBS2_FLOW"/>
 	<IO Name="Reservoir2.DiReplen" IOName="c_RES2_DI_REPLEN"/>
 	<IO Name="Reservoir2.PHFlowValve" IOName="c_PH2_FLOW_VALVE"/>
 	<IO Name="Reservoir2.PHValue" IOName="r_pH2"/>
@@ -443,6 +443,7 @@
 	<IO Name="Reservoir4.LowLevel" IOName="r_RES4_LOW_LEVEL"/>
     <IO Name="Reservoir4.SafetyHighLevel" IOName="r_RES4_HIGH_LEVEL"/>
 	<IO Name="Reservoir4.HedFlow" IOName="r_RES4_HED_FLOW"/>
+	<IO Name="Reservoir4.ResPowerOn" IOName="c_RES4_POWER_ON"/>
 	</Module>
   
 	<Module Name="Metal1">

CyberX8_RT/Config/Devices/PowerSupplierCfg-Simulator.xml

@@ -53,7 +53,7 @@
 		<Device Name="Power14-1" Address="1" />
 	</PowerSupplierDeviceConfig>
   
-  <PowerSupplierDeviceConfig Name="CMMPower1" IpAddress="127.0.0.1" Port="830" SendTimeout="2000" RecvTimeout="2000"> 
+  <PowerSupplierDeviceConfig Name="CMMPower1" IpAddress="127.0.0.1" Port="835" SendTimeout="2000" RecvTimeout="2000"> 
     <Device Name="CMMPower1-1" Address="1" />
   </PowerSupplierDeviceConfig>
 </PowerSupplierConfig>

CyberX8_RT/Config/Devices/WagoControllerCfg-Simulator.xml

@@ -263,7 +263,7 @@
 				<DO Name="c_HED1_POWER_ON"  Address="547" Invert="false"/>
 			</DOGroup>
 			<DOGroup Name="27">
-				<DO Name="c_HED2_POWER_ON"  Address="548" Invert="false"/>
+				<DO Name="c_HED3_POWER_ON"  Address="548" Invert="false"/>
 				<DO Name="DO37"  Address="549" Invert="false"/>
 			</DOGroup>
 			<DOGroup Name="28">
@@ -271,13 +271,13 @@
 				<DO Name="DO39"  Address="551" Invert="false"/>
 			</DOGroup>
 			<DOGroup Name="29">
-				<DO Name="c_RES3_POWER_ON"  Address="552" Invert="false"/>
-				<DO Name="c_METAL4_PUMP_ON"  Address="553" Invert="false"/>
+				<DO Name="c_RES4_POWER_ON"  Address="552" Invert="false"/>
+				<DO Name="DO41"  Address="553" Invert="false"/>
 			</DOGroup>
 		</Dig_Out>
 		<Ano_In>
 			<AIGroup Name="1">
-				<AI Name="r_pH2"  Address="0" Scaling="0=3276.7,14=32767" DataType="short"/>
+				<AI Name="r_pH2"  Address="0" Scaling="0=0,14=32767" DataType="short"/>
 				<AI Name="AI1"  Address="1" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI2"  Address="2" Scaling="13=0,150=32767" DataType="short"/>
 				<AI Name="AI3"  Address="3" Scaling="13=0,150=32767" DataType="short"/>
@@ -292,7 +292,7 @@
 				<AI Name="AI8"  Address="8" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="r_SYSTEM_EXHAUST"  Address="9" Scaling="0=0, 2=32767" DataType="short"/>
 				<AI Name="r_PREWET_FLOW"  Address="10" Scaling="0=3276.7,40=32767" DataType="short"/>
-				<AI Name="r_DI_WATER_PRESSURE"  Address="11" Scaling="0=3276.7,100=32767" DataType="short"/>
+				<AI Name="r_DI_WATER_PRESSURE"  Address="11" Scaling="0=0,100=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="4">
 				<AI Name="r_PUMP1_FLOW"  Address="12" Scaling="0=3276.7,40=16383.5" DataType="short"/>
@@ -316,7 +316,7 @@
 				<AI Name="AI24"  Address="24" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI25"  Address="25" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI26"  Address="26" Scaling="13=0,150=32767" DataType="short"/>
-				<AI Name="AI27"  Address="27" Scaling="13=0,150=32767" DataType="short"/>
+				<AI Name="r_MBS2_FLOW"  Address="27" Scaling="0=0,20=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="8">
 				<AI Name="r_QDRD1_WATER_LEVEL"  Address="28" Scaling="0=0,100=32767" DataType="short"/>
@@ -524,5 +524,7 @@
 				<AO Name="AO4"  Address="515" DataType="short"/>
 			</AOGroup>
 		</Ano_Out>
+	<Ano_In>
+	</Ano_In>
 	</WagoDeviceConfig>
 </WagoControllerConfig>

CyberX8_RT/Config/Devices/WagoControllerCfg.xml

@@ -195,7 +195,7 @@
 				<DI Name="DI29"  Address="31" Invert="false"/>
 			</DIGroup>
 			<DIGroup Name="22">
-				<DI Name="r_RES1_HI_LEVEL"  Address="32" Invert="false"/>
+				<DI Name="r_RES1_HIGH_LEVEL"  Address="32" Invert="false"/>
 				<DI Name="r_RES1_LOW_LEVEL"  Address="33" Invert="true"/>
 				<DI Name="r_RES2_HIGH_LEVEL"  Address="34" Invert="false"/>
 				<DI Name="r_RES2_LOW_LEVEL"  Address="35" Invert="true"/>
@@ -263,7 +263,7 @@
 				<DO Name="c_HED1_POWER_ON"  Address="547" Invert="false"/>
 			</DOGroup>
 			<DOGroup Name="27">
-				<DO Name="c_HED2_POWER_ON"  Address="548" Invert="false"/>
+				<DO Name="c_HED3_POWER_ON"  Address="548" Invert="false"/>
 				<DO Name="DO37"  Address="549" Invert="false"/>
 			</DOGroup>
 			<DOGroup Name="28">
@@ -271,13 +271,13 @@
 				<DO Name="DO39"  Address="551" Invert="false"/>
 			</DOGroup>
 			<DOGroup Name="29">
-				<DO Name="c_RES3_POWER_ON"  Address="552" Invert="false"/>
+				<DO Name="c_RES4_POWER_ON"  Address="552" Invert="false"/>
 				<DO Name="DO41"  Address="553" Invert="false"/>
 			</DOGroup>
 		</Dig_Out>
 		<Ano_In>
 			<AIGroup Name="1">
-				<AI Name="r_pH2"  Address="0" Scaling="0=3276.7,14=32767" DataType="short"/>
+				<AI Name="r_pH2"  Address="0" Scaling="0=0,14=32767" DataType="short"/>
 				<AI Name="AI1"  Address="1" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI2"  Address="2" Scaling="13=0,150=32767" DataType="short"/>
 				<AI Name="AI3"  Address="3" Scaling="13=0,150=32767" DataType="short"/>
@@ -316,7 +316,7 @@
 				<AI Name="AI24"  Address="24" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI25"  Address="25" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI26"  Address="26" Scaling="13=0,150=32767" DataType="short"/>
-				<AI Name="AI27"  Address="27" Scaling="13=0,150=32767" DataType="short"/>
+				<AI Name="r_MBS2_FLOW"  Address="27" Scaling="0=0,20=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="8">
 				<AI Name="r_QDRD1_WATER_LEVEL"  Address="28" Scaling="0=0,100=32767" DataType="short"/>
@@ -331,10 +331,10 @@
 				<AI Name="AI35"  Address="35" Scaling="13=0,150=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="10">
-				<AI Name="r_RES_LEVEL_1_raw"  Address="36" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_RES_LEVEL_2_raw"  Address="37" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_RES_LEVEL_3_raw"  Address="38" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_RES_LEVEL_4_raw"  Address="39" Scaling="0=3276.7,100=32767" DataType="short"/>
+				<AI Name="r_RES1_LEVEL_raw"  Address="36" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_RES2_LEVEL_raw"  Address="37" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_RES3_LEVEL_raw"  Address="38" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_RES4_LEVEL_raw"  Address="39" Scaling="0=0,100=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="11">
 				<AI Name="AI40"  Address="40" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
@@ -524,5 +524,7 @@
 				<AO Name="AO4"  Address="515" DataType="short"/>
 			</AOGroup>
 		</Ano_Out>
+	<Ano_In>
+	</Ano_In>
 	</WagoDeviceConfig>
 </WagoControllerConfig>

CyberX8_RT/Config/Layout/ToolLayoutConfiguration.xml

@@ -411,7 +411,7 @@
 			<AutoDrainsInstalled>false</AutoDrainsInstalled>
 			<SlipstreamType>None</SlipstreamType>
 			<CMMType>Standard</CMMType>
-			<CMMSupplyID>CMMPower1-1</CMMSupplyID>
+			<CMMSupplyID></CMMSupplyID>
 			<EvaporatorType>STD</EvaporatorType>
 		</Item>
 
@@ -514,7 +514,7 @@
 			<AutoDrainsInstalled>false</AutoDrainsInstalled>
 			<SlipstreamType>None</SlipstreamType>
 			<CMMType>Standard</CMMType>
-			<CMMSupplyID>CMMPower1-1</CMMSupplyID>
+			<CMMSupplyID></CMMSupplyID>
 			<EvaporatorType>STD</EvaporatorType>
 		</Item>
 
@@ -552,7 +552,7 @@
 			<AutoDrainsInstalled>false</AutoDrainsInstalled>
 			<SlipstreamType>None</SlipstreamType>
 			<CMMType>Standard</CMMType>
-			<CMMSupplyID>CMMPower1-1</CMMSupplyID>
+			<CMMSupplyID></CMMSupplyID>
 			<EvaporatorType>STD</EvaporatorType>
 		</Item>
 

CyberX8_RT/Config/System.sccfg

@@ -487,18 +487,6 @@
 			<config default="1" name="BottleReserveVolume2" nameView="BottleReserveVolume2" description="Bottle Reserve Volume of Replen2" max="5000" min="0" paramter="" tag="" unit="mL" type="Double" />
 			<config default="60" name="DosingOutTime" nameView="DosingOutTime" description="Dosing Out Time" max="600" min="1" paramter="" tag="" unit="s" type="Double" />
 
-			<config default="20" name="CMMFlowHighFault" nameView="CMMFlowHighFault" description="CMM Flow Over HighFault,system occurs error " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="20" name="CMMFlowHighWarning" nameView="CMMFlowHighWarning" description="CMM Flow Over HighWarninb,system occurs warning " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="0" name="CMMFlowLowFault" nameView="CMMFlowLowFault" description="CMM Flow Less LowFault,system occurs error " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="0" name="CMMFlowLowWarning" nameView="CMMFlowLowWarning" description="CMM Flow less HighFault,system occurs warning " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="1000" name="CMMAnodeLifeTimeAHrs" nameView="CMMAnodeLifeTimeAHrs" description="CMM Anode LifeTimeAHrs" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="1000" name="CMMCathodeLifeTimeAHrs" nameView="CMMCathodeLifeTimeAHrs" description="CMM Cathode LifeTimeAHrs" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="6" name="CMMFlowCheckDelaySeconds" nameView="CMMFlowCheckDelaySeconds" description="CMM Flow Check Delay Seconds" max="30" min="0" paramter="" tag="" unit="s" type="Integer" />
-			<config default="50" name="CMMAnodeTotalAmpHoursWarningLimit" nameView="CMMAnodeTotalAmpHoursWarningLimit" description="CMM Anode Total Amp Hours Warning Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="100" name="CMMAnodeTotalAmpHoursFaultLimit" nameView="CMMAnodeTotalAmpHoursFaultLimit" description="CMM Anode Total Amp Hours Fault Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="50" name="CMMCathodeTotalAmpHoursWarningLimit" nameView="CMMCathodeTotalAmpHoursWarningLimit" description="CMM Cathode Total AmpHours Warning Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="100" name="CMMCathodeTotalAmpHoursFaultLimit" nameView="CMMCathodeTotalAmpHoursFaultLimit" description="CMM Cathode Total AmpHours Fault Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-
 			<config default="52" name="ReservoirTotalAmpHoursWarningLimit" nameView="ReservoirTotalAmpHoursWarningLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
 			<config default="102" name="ReservoirTotalAmpHoursFaultLimit" nameView="ReservoirTotalAmpHoursFaultLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
 			<config default="52" name="BathTotalAmpHoursWarningLimit" nameView="BathTotalAmpHoursWarningLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
@@ -563,18 +551,6 @@
 			<config default="1" name="BottleReserveVolume2" nameView="BottleReserveVolume2" description="Bottle Reserve Volume of Replen2" max="5000" min="0" paramter="" tag="" unit="mL" type="Double" />
 			<config default="60" name="DosingOutTime" nameView="DosingOutTime" description="Dosing Out Time" max="600" min="1" paramter="" tag="" unit="s" type="Double" />
 
-			<config default="20" name="CMMFlowHighFault" nameView="CMMFlowHighFault" description="CMM Flow Over HighFault,system occurs error " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="20" name="CMMFlowHighWarning" nameView="CMMFlowHighWarning" description="CMM Flow Over HighWarninb,system occurs warning " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="0" name="CMMFlowLowFault" nameView="CMMFlowLowFault" description="CMM Flow Less LowFault,system occurs error " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="0" name="CMMFlowLowWarning" nameView="CMMFlowLowWarning" description="CMM Flow less HighFault,system occurs warning " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="1000" name="CMMAnodeLifeTimeAHrs" nameView="CMMAnodeLifeTimeAHrs" description="CMM Anode LifeTimeAHrs" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="1000" name="CMMCathodeLifeTimeAHrs" nameView="CMMCathodeLifeTimeAHrs" description="CMM Cathode LifeTimeAHrs" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="6" name="CMMFlowCheckDelaySeconds" nameView="CMMFlowCheckDelaySeconds" description="CMM Flow Check Delay Seconds" max="30" min="0" paramter="" tag="" unit="s" type="Integer" />
-			<config default="50" name="CMMAnodeTotalAmpHoursWarningLimit" nameView="CMMAnodeTotalAmpHoursWarningLimit" description="CMM Anode Total Amp Hours Warning Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="100" name="CMMAnodeTotalAmpHoursFaultLimit" nameView="CMMAnodeTotalAmpHoursFaultLimit" description="CMM Anode Total Amp Hours Fault Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="50" name="CMMCathodeTotalAmpHoursWarningLimit" nameView="CMMCathodeTotalAmpHoursWarningLimit" description="CMM Cathode Total AmpHours Warning Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="100" name="CMMCathodeTotalAmpHoursFaultLimit" nameView="CMMCathodeTotalAmpHoursFaultLimit" description="CMM Cathode Total AmpHours Fault Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-
 			<config default="52" name="ReservoirTotalAmpHoursWarningLimit" nameView="ReservoirTotalAmpHoursWarningLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
 			<config default="102" name="ReservoirTotalAmpHoursFaultLimit" nameView="ReservoirTotalAmpHoursFaultLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
 			<config default="52" name="BathTotalAmpHoursWarningLimit" nameView="BathTotalAmpHoursWarningLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
@@ -601,18 +577,6 @@
 			<config default="1" name="BottleReserveVolume2" nameView="BottleReserveVolume2" description="Bottle Reserve Volume of Replen2" max="5000" min="0" paramter="" tag="" unit="mL" type="Double" />
 			<config default="60" name="DosingOutTime" nameView="DosingOutTime" description="Dosing Out Time" max="600" min="1" paramter="" tag="" unit="s" type="Double" />
 
-			<config default="20" name="CMMFlowHighFault" nameView="CMMFlowHighFault" description="CMM Flow Over HighFault,system occurs error " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="20" name="CMMFlowHighWarning" nameView="CMMFlowHighWarning" description="CMM Flow Over HighWarninb,system occurs warning " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="0" name="CMMFlowLowFault" nameView="CMMFlowLowFault" description="CMM Flow Less LowFault,system occurs error " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="0" name="CMMFlowLowWarning" nameView="CMMFlowLowWarning" description="CMM Flow less HighFault,system occurs warning " max="20" min="0" paramter="" tag="" unit="L/min" type="Double" />
-			<config default="1000" name="CMMAnodeLifeTimeAHrs" nameView="CMMAnodeLifeTimeAHrs" description="CMM Anode LifeTimeAHrs" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="1000" name="CMMCathodeLifeTimeAHrs" nameView="CMMCathodeLifeTimeAHrs" description="CMM Cathode LifeTimeAHrs" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="6" name="CMMFlowCheckDelaySeconds" nameView="CMMFlowCheckDelaySeconds" description="CMM Flow Check Delay Seconds" max="30" min="0" paramter="" tag="" unit="s" type="Integer" />
-			<config default="50" name="CMMAnodeTotalAmpHoursWarningLimit" nameView="CMMAnodeTotalAmpHoursWarningLimit" description="CMM Anode Total Amp Hours Warning Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="100" name="CMMAnodeTotalAmpHoursFaultLimit" nameView="CMMAnodeTotalAmpHoursFaultLimit" description="CMM Anode Total Amp Hours Fault Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="50" name="CMMCathodeTotalAmpHoursWarningLimit" nameView="CMMCathodeTotalAmpHoursWarningLimit" description="CMM Cathode Total AmpHours Warning Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-			<config default="100" name="CMMCathodeTotalAmpHoursFaultLimit" nameView="CMMCathodeTotalAmpHoursFaultLimit" description="CMM Cathode Total AmpHours Fault Limit" max="100000" min="0" paramter="" tag="" unit="Ah" type="Double" />
-
 			<config default="52" name="ReservoirTotalAmpHoursWarningLimit" nameView="ReservoirTotalAmpHoursWarningLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
 			<config default="102" name="ReservoirTotalAmpHoursFaultLimit" nameView="ReservoirTotalAmpHoursFaultLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />
 			<config default="52" name="BathTotalAmpHoursWarningLimit" nameView="BathTotalAmpHoursWarningLimit"  type="Double" value="0"  min="0" max="100000" paramter="" tag="" unit="" description="" />

CyberX8_RT/Devices/Reservoir/StandardHotReservoirDevice.cs

@@ -65,6 +65,7 @@ namespace CyberX8_RT.Devices.Reservoir
         private const string DI_REPLEN = "DiReplen";
         private const string RESERVOIRDEVICEDATA = "ReservoirDeviceData";
         private const string REPLEN_LEVEL = "ReplenLevel";
+        private const string RESPOWERON = "ResPowerOn";
         private const double PUMP_SPEED_CONVERT = 0.0672;
         private const int ENABLE = 5;
         #endregion
@@ -279,6 +280,7 @@ namespace CyberX8_RT.Devices.Reservoir
             levelSampleCount = levelSampleCount == 0 ? 20 : levelSampleCount;
             _LevelSamples = new Queue<double>(levelSampleCount);
             _periodicJob = new PeriodicJob(100, OnTimer, $"{Module}.OnTimer", true);
+            ResPowerOn();//保持继电器常开
         }
         /// <summary>
         /// 定时器
@@ -1037,6 +1039,20 @@ namespace CyberX8_RT.Devices.Reservoir
             return result;
         }
         /// <summary>
+        /// 打开继电器
+        /// </summary>
+        /// <returns></returns>
+        public bool ResPowerOn()
+        {
+            bool result = false;
+            string ioName = BeckhoffModuleIOManager.Instance.GetIoNameByInnerModuleName($"{Module}.{RESPOWERON}");
+            if (!string.IsNullOrEmpty("ioName"))
+            {
+                result = IOModuleManager.Instance.WriteIoValue(ioName, true);
+            }
+            return result;
+        }
+        /// <summary>
         /// 检验DiReplen前置条件
         /// </summary>
         /// <returns></returns>

CyberX8_RT/Modules/Reservoir/ReservoirEntity.cs

@@ -311,14 +311,14 @@ namespace CyberX8_RT.Modules.Reservoir
                 DATA.Subscribe($"{Module}.ANBathTotalAmpHours.FaultLimit", () => SC.GetValue<double>($"Reservoir.{Module}.ANBathTotalAmpHoursFaultLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
             }
             DATA.Subscribe($"{Module}.MembraneTotalAmpHours", () => ReservoirUsage != null ? ReservoirUsage.MembranceUsage : 0, SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            //DATA.Subscribe($"{Module}.MembraneTotalAmpHours.WarningLimit", () => SC.GetValue<double>($"Reservoir.{Module}.MembraneTotalAmpHoursWarningLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            //DATA.Subscribe($"{Module}.MembraneTotalAmpHours.FaultLimit", () => SC.GetValue<double>($"Reservoir.{Module}.MembraneTotalAmpHoursFaultLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.MembraneTotalAmpHours.WarningLimit", () => SC.GetValue<double>($"Reservoir.{Module}.MembraneTotalAmpHoursWarningLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.MembraneTotalAmpHours.FaultLimit", () => SC.GetValue<double>($"Reservoir.{Module}.MembraneTotalAmpHoursFaultLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.BathTotalDays", () => ReservoirUsage != null ? ReservoirUsage.BathUsageDays : 0, SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            //DATA.Subscribe($"{Module}.BathTotalDays.WarningLimit", () => SC.GetValue<int>($"Reservoir.{Module}.BathTotalDaysWarningLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            //DATA.Subscribe($"{Module}.BathTotalDays.FaultLimit", () => SC.GetValue<int>($"Reservoir.{Module}.BathTotalDaysFaultLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.BathTotalDays.WarningLimit", () => SC.GetValue<int>($"Reservoir.{Module}.BathTotalDaysWarningLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.BathTotalDays.FaultLimit", () => SC.GetValue<int>($"Reservoir.{Module}.BathTotalDaysFaultLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.ReservoirTotalWafers", () => ReservoirUsage != null ? ReservoirUsage.TotalWafers : 0, SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            //DATA.Subscribe($"{Module}.ReservoirTotalWafers.WarningLimit", () => SC.GetValue<int>($"Reservoir.{Module}.ReservoirTotalWafersWarningLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            //DATA.Subscribe($"{Module}.ReservoirTotalWafers.FaultLimit", () => SC.GetValue<int>($"Reservoir.{Module}.ReservoirTotalWafersFaultLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.ReservoirTotalWafers.WarningLimit", () => SC.GetValue<int>($"Reservoir.{Module}.ReservoirTotalWafersWarningLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.ReservoirTotalWafers.FaultLimit", () => SC.GetValue<int>($"Reservoir.{Module}.ReservoirTotalWafersFaultLimit"), SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.Temperature", () => _temperatureController != null ? _temperatureController.TemperatureData.ReserviorTemperature : 0, SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.Temperature.ID", () => _temperatureController != null ? _temperatureController.Module : "", SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.Temperature.Status", () => _temperatureController != null ? _temperatureController.TemperatureData.Status : "", SubscriptionAttribute.FLAG.IgnoreSaveDB);

CyberX8_Simulator/Config/SimulatorIOMapCfg.xml

@@ -22,4 +22,5 @@
 	<SimulatorIOMapItem SourceIOName="c_QDRD4_DI_FILL" TargetIONameA="r_QDRD4_WATER_LEVEL"/>
 	<SimulatorIOMapItem SourceIOName="c_QDRD4_DUMP" TargetIONameA="r_QDRD4_WATER_LEVEL"/>
 	<SimulatorIOMapItem SourceIOName="c_QDRD4_DUMP" TargetIONameA="r_QDRD4_WATER_LEVEL"/>
+	<SimulatorIOMapItem SourceIOName="c_METAL4_PUMP_ON" TargetIONameA="r_PUMP4_FLOW"/>
 </SimulatorIOMapConfig>

CyberX8_Simulator/Config/UILayout.xml

@@ -12,6 +12,7 @@
 		<SubView Id="Wago1" Name="Puf" ViewClass="CyberX8_Simulator.Views.WagoView" Assembly="CyberX8_Simulator" Port ="550"/>
 		<SubView Id="Wago2" Name="Wago2" ViewClass="CyberX8_Simulator.Views.WagoView" Assembly="CyberX8_Simulator" Port ="551"/>
 		<SubView Id="Wago3" Name="Wago3" ViewClass="CyberX8_Simulator.Views.WagoView" Assembly="CyberX8_Simulator" Port ="552"/>
+		<SubView Id="Wago4" Name="Wago4" ViewClass="CyberX8_Simulator.Views.WagoView" Assembly="CyberX8_Simulator" Port ="553"/>
 	</Navigation>
 
 	<Navigation Id="Festo" Name="Festo">
@@ -42,7 +43,7 @@
 		<SubView Id="Power12" Name="Power12" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="832"/>
 		<SubView Id="Power13" Name="Power13" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="833"/>
 		<SubView Id="Power14" Name="Power14" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="834"/>
-		<SubView Id="CMMPower1" Name="CMMPower1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="830"/>
+		<SubView Id="CMMPower1" Name="CMMPower1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="835"/>
 	</Navigation>
 
 	<Navigation Id="Temperature" Name="Temperature" >

CyberX8_Simulator/Devices/WagoSocketSimulator.cs

@@ -11,6 +11,7 @@ using MECF.Framework.Simulator.Core.Driver;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using static MECF.Framework.Common.Simulator.MotorSimulator;
 
 namespace CyberX8_Simulator.Devices
 {
@@ -63,6 +64,7 @@ namespace CyberX8_Simulator.Devices
         /// </summary>
         private PeriodicJob _LoaderPeriodicJob;
         private PeriodicJob _Wago2PeriodicJob;
+        private PeriodicJob _Wago4PeriodicJob;
 
         private bool _rinse1FillValve = false;
         private bool _rinse1DumpValve = false;
@@ -72,12 +74,14 @@ namespace CyberX8_Simulator.Devices
         private bool _rinse3DumpValve = false;
         private bool _rinse4FillValve = false;
         private bool _rinse4DumpValve = false;
+        private bool _reservoir4PumpOn = false;
         private int _srd1currentVacuumValue;
         private int _srd2currentVacuumValue;
         private int _port;
         //delegate
         #region Delegate
         public delegate void VariableValueChanged(object obj);
+        public delegate void UpdateVariableValueWagoDatasChanged(string sourceName, string targetName, bool value,bool invert);
         #endregion
 
         #region 事件
@@ -97,7 +101,6 @@ namespace CyberX8_Simulator.Devices
             InitializeData(port);
             _port = port;
         }  
-        
         private void UpdataDataCausedByOtherModule(string sourceName,string name, bool value, bool invert)
         {
             value = invert ? !value : value;
@@ -154,8 +157,11 @@ namespace CyberX8_Simulator.Devices
                     case "c_QDRD4_DUMP":
                         _rinse4DumpValve = value;
                         break;
-                    default:
+                    case "c_METAL4_PUMP_ON":
+                        _reservoir4PumpOn = value;
                         break;
+                    default:
+                        break; 
                 }
             }
             //DI Data
@@ -311,6 +317,10 @@ namespace CyberX8_Simulator.Devices
                             {
                                 _Wago2PeriodicJob = new PeriodicJob(100, OnTimer1, $"Wago {config.Module} timer", true);
                             }
+                            if (config.Module == "Wago4" && _Wago2PeriodicJob == null)
+                            {
+                                _Wago2PeriodicJob = new PeriodicJob(100, OnTimer3, $"Wago {config.Module} timer", true);
+                            }
                             //加载DO
                             int i = 0;
                             DONameIndexDic = new Dictionary<string, int>();
@@ -428,7 +438,7 @@ namespace CyberX8_Simulator.Devices
             if (AINameIndexDic.ContainsKey("r_PUMP1_FLOW")) AIShorts[AINameIndexDic["r_PUMP1_FLOW"]] = 3277;
 
             //Facility
-            if (AINameIndexDic.ContainsKey("r_DI_WATER_PRESSURE")) AIShorts[AINameIndexDic["r_DI_WATER_PRESSURE"]] = 16000;
+            if (AINameIndexDic.ContainsKey("r_DI_WATER_PRESSURE")) AIShorts[AINameIndexDic["r_DI_WATER_PRESSURE"]] = 12000;
             if (AINameIndexDic.ContainsKey("r_HCW_FLOW")) AIShorts[AINameIndexDic["r_HCW_FLOW"]] = 16300;
             if (AINameIndexDic.ContainsKey("r_N2_1B_PRESSURE")) AIShorts[AINameIndexDic["r_N2_1B_PRESSURE"]] = 5400;
             if (AINameIndexDic.ContainsKey("r_N2_1A_PRESSURE")) AIShorts[AINameIndexDic["r_N2_1A_PRESSURE"]] = 8900;
@@ -438,6 +448,8 @@ namespace CyberX8_Simulator.Devices
             if (AINameIndexDic.ContainsKey("r_CDA_HIGH_PRESSURE")) AIShorts[AINameIndexDic["r_CDA_HIGH_PRESSURE"]] = 10000;
             if (AINameIndexDic.ContainsKey("r_CDA_LOW_PRESSURE")) AIShorts[AINameIndexDic["r_CDA_LOW_PRESSURE"]] = 10000;
             if (AINameIndexDic.ContainsKey("r_CDA_EXTERNAL_PRESSURE")) AIShorts[AINameIndexDic["r_CDA_EXTERNAL_PRESSURE"]] = 10000;
+            if (AINameIndexDic.ContainsKey("r_pH2")) AIShorts[AINameIndexDic["r_pH2"]] = 15000;
+            if (AINameIndexDic.ContainsKey("r_MBS2_FLOW")) AIShorts[AINameIndexDic["r_MBS2_FLOW"]] = 16000;
 
         }
         #region 公共方法
@@ -762,6 +774,15 @@ namespace CyberX8_Simulator.Devices
             PumpFlowSimulator();
             return true;
         }
+        /// <summary>
+        /// Wago4定时器
+        /// </summary>
+        /// <returns></returns>
+        private bool OnTimer3()
+        {
+            Pump4FlowSimulator();
+            return true;
+        }
         #region 模拟方法
         /// <summary>
         /// Loader LeakTest模拟
@@ -846,21 +867,16 @@ namespace CyberX8_Simulator.Devices
             {
                 AIShorts[AINameIndexDic["r_QDRD4_WATER_LEVEL"]] -= 2;
             }
+
+            //reservoir4 pump flow
+            AIShorts[AINameIndexDic["r_PUMP4_FLOW"]] = _reservoir4PumpOn ? (short)6000 : (short)3277;
+        
         }
         /// <summary>
-        /// metal pump流量模拟
+        /// metal1/2/3 pump流量模拟
         /// </summary>
         private void PumpFlowSimulator()
         {
-            if (DOBytes[DONameIndexDic["c_METAL4_PUMP_ON"]] == 1)
-            {
-                AIShorts[AINameIndexDic["r_PUMP4_FLOW"]] = 6000;
-            }
-            else
-            {
-                AIShorts[AINameIndexDic["r_PUMP3_FLOW"]] = 3277;
-            }
-
             if (DOBytes[DONameIndexDic["c_METAL3_PUMP_ON"]] == 1)
             {
                 AIShorts[AINameIndexDic["r_PUMP3_FLOW"]] = 6000;
@@ -887,6 +903,20 @@ namespace CyberX8_Simulator.Devices
             {
                 AIShorts[AINameIndexDic["r_PUMP1_FLOW"]] = 3277;
             }
+        }
+        /// <summary>
+        /// metal4 pump流量模拟
+        /// </summary>
+        private void Pump4FlowSimulator()
+        {
+            if (DONameIndexDic.ContainsKey("c_METAL4_PUMP_ON") && DOBytes[DONameIndexDic["c_METAL4_PUMP_ON"]] == 1)
+            {
+                SimulatorCommManager.Instance.CheckDataChanged("c_METAL4_PUMP_ON",true,false);
+            }
+            else if (DONameIndexDic.ContainsKey("c_METAL4_PUMP_ON") && DOBytes[DONameIndexDic["c_METAL4_PUMP_ON"]] == 0)
+            {
+                SimulatorCommManager.Instance.CheckDataChanged("c_METAL4_PUMP_ON", false, false);
+            }
         }
         #endregion
     }

CyberX8_UI/Config/UIMenu.json

@@ -55,23 +55,23 @@
 				"IsShow": "true",
 				"MenuItem": [
 					{
-						"Id": "Reservoir1",
-						"ModuleName": "Reservoir1",
-						"Name": "Reservoir1",
+						"Id": "Reservoir4",
+						"ModuleName": "Reservoir4",
+						"Name": "Reservoir4",
 						"IsShow": "true",
 						"MultiItem": [
 							{
-								"Id": "Reservoir1",
-								"ModuleName": "Reservoir1",
-								"Name": "Reservoir1",
+								"Id": "Reservoir4",
+								"ModuleName": "Reservoir4",
+								"Name": "Reservoir4",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "StandardHotReservoirsView"
 							},
 							{
-								"Id": "PMCounter1",
-								"ModuleName": "Reservoir1",
-								"Name": "Res1PMCt",
+								"Id": "PMCounter4",
+								"ModuleName": "Reservoir4",
+								"Name": "Res4PMCt",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "PMCounterView"
@@ -79,23 +79,23 @@
 						]
 					},
 					{
-						"Id": "Reservoir2",
-						"ModuleName": "Reservoir2",
-						"Name": "Reservoir2",
+						"Id": "Reservoir3",
+						"ModuleName": "Reservoir3",
+						"Name": "Reservoir3",
 						"IsShow": "true",
 						"MultiItem": [
 							{
-								"Id": "Reservoir2",
-								"ModuleName": "Reservoir2",
-								"Name": "Reservoir2",
+								"Id": "Reservoir3",
+								"ModuleName": "Reservoir3",
+								"Name": "Reservoir3",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "StandardHotReservoirsView"
 							},
 							{
-								"Id": "PMCounter2",
-								"ModuleName": "Reservoir2",
-								"Name": "Res2PMCt",
+								"Id": "PMCounter3",
+								"ModuleName": "Reservoir3",
+								"Name": "Res3PMCt",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "PMCounterView"
@@ -103,23 +103,23 @@
 						]
 					},
 					{
-						"Id": "Reservoir3",
-						"ModuleName": "Reservoir3",
-						"Name": "Reservoir3",
+						"Id": "Reservoir2",
+						"ModuleName": "Reservoir2",
+						"Name": "Reservoir2",
 						"IsShow": "true",
 						"MultiItem": [
 							{
-								"Id": "Reservoir3",
-								"ModuleName": "Reservoir3",
-								"Name": "Reservoir3",
+								"Id": "Reservoir2",
+								"ModuleName": "Reservoir2",
+								"Name": "Reservoir2",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "StandardHotReservoirsView"
 							},
 							{
-								"Id": "PMCounter3",
-								"ModuleName": "Reservoir3",
-								"Name": "Res3PMCt",
+								"Id": "PMCounter2",
+								"ModuleName": "Reservoir2",
+								"Name": "Res2PMCt",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "PMCounterView"
@@ -127,23 +127,23 @@
 						]
 					},
 					{
-						"Id": "Reservoir4",
-						"ModuleName": "Reservoir4",
-						"Name": "Reservoir4",
+						"Id": "Reservoir1",
+						"ModuleName": "Reservoir1",
+						"Name": "Reservoir1",
 						"IsShow": "true",
 						"MultiItem": [
 							{
-								"Id": "Reservoir4",
-								"ModuleName": "Reservoir4",
-								"Name": "Reservoir4",
+								"Id": "Reservoir1",
+								"ModuleName": "Reservoir1",
+								"Name": "Reservoir1",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "StandardHotReservoirsView"
 							},
 							{
-								"Id": "PMCounter4",
-								"ModuleName": "Reservoir4",
-								"Name": "Res4PMCt",
+								"Id": "PMCounter1",
+								"ModuleName": "Reservoir1",
+								"Name": "Res1PMCt",
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "PMCounterView"

Framework/Common/Device/TemperatureController/TemperatureConfigManager.cs

@@ -66,7 +66,7 @@ namespace MECF.Framework.Common.Device.TemperatureController
                 {
                     DATA.Subscribe($"{config.Name}.{TEMPERATURE_DEVICELIST}", () => config, SubscriptionAttribute.FLAG.IgnoreSaveDB);
                     TemperatureSerialDevice temperatureSerialDevice = new TemperatureSerialDevice(config.Name, config.Port, config.BaudRate, (StopBits)config.StopBit,
-                        config.Data,SerialPortUtil.GetParity(config.Parity),true,1000);
+                        config.Data,SerialPortUtil.GetParity(config.Parity),true,2000);
                     temperatureSerialDevice.Initialize();
                     temperatureSerialDevice.OnUpdateVariableValueChanged += TemperatureSerialDevice_OnUpdateVariableValueChanged;
                     InitialtemperatureDevice(config, temperatureSerialDevice);