revise UI

CyberX8_MainPages/ViewModels/StandardHotReservoirsViewModel.cs

@@ -698,7 +698,7 @@ namespace CyberX8_MainPages.ViewModels
                 IsDosingSystemEnabled = replenType != "" ? true : false;
                 List<string> strMetals = CommonFunction.GetValue<List<string>>(tmpMetals, $"{Module}.Metals");
                 CellsCount = strMetals.Count;
-                if(strMetals!=null&& CellsCount>= 2)
+                if(strMetals!=null&& CellsCount>= 1)
                 {
                     CellModuleNameCollection.Clear();
                     MetalDataCollection.Clear();
@@ -721,7 +721,6 @@ namespace CyberX8_MainPages.ViewModels
             _rtDataKeys.Add($"{Module}.CurrentRecipe");
             _rtDataKeys.Add($"{Module}.TemperatureControllerData");
             _rtDataKeys.Add($"{Module}.CmmPowerSupplierData");
-            _rtDataKeys.Add($"Safety.SafetyData");
             _rtDataKeys.Add($"{Module}.FsmState");
             _rtDataKeys.Add($"{Module}.ReservoirAverageLevel");
             _rtDataKeys.Add($"{Module}.ReservoirUsage");
@@ -910,7 +909,6 @@ namespace CyberX8_MainPages.ViewModels
                     TemperatureControlData = CommonFunction.GetValue<TemperatureControllerData>(_rtDataValueDic, $"{Module}.TemperatureControllerData");
                     TCEnableStatus = TemperatureControlData.ControlOperationModel == 0 ? "Disable" : "Enable";
                     CmmPowerSupplierData = CommonFunction.GetValue<PowerSupplierData>(_rtDataValueDic, $"{Module}.CmmPowerSupplierData");
-                    CommonSafetyData = CommonFunction.GetValue<SafetyData>(_rtDataValueDic, $"Safety.SafetyData");
                     State = CommonFunction.GetValue<string>(_rtDataValueDic, $"{Module}.FsmState");
                     AvgLevel = CommonFunction.GetValue<double>(_rtDataValueDic, $"{Module}.ReservoirAverageLevel");
                     ReservoirUsage reservoirUsage = CommonFunction.GetValue<ReservoirUsage>(_rtDataValueDic, $"{Module}.ReservoirUsage");

CyberX8_RT/Config/Devices/WagoControllerCfg-Simulator.xml

@@ -319,10 +319,10 @@
 				<AI Name="AI27"  Address="27" Scaling="13=0,150=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="8">
-				<AI Name="r_QDRD1_WATER_LEVEL"  Address="28" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_QDRD2_WATER_LEVEL"  Address="29" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_QDRD3_WATER_LEVEL"  Address="30" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_QDRD4_WATER_LEVEL"  Address="31" Scaling="0=3276.7,100=32767" DataType="short"/>
+				<AI Name="r_QDRD1_WATER_LEVEL"  Address="28" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_QDRD2_WATER_LEVEL"  Address="29" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_QDRD3_WATER_LEVEL"  Address="30" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_QDRD4_WATER_LEVEL"  Address="31" Scaling="0=0,100=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="9">
 				<AI Name="AI32"  Address="32" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>

CyberX8_RT/Config/Devices/WagoControllerCfg.xml

@@ -319,10 +319,10 @@
 				<AI Name="AI27"  Address="27" Scaling="13=0,150=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="8">
-				<AI Name="r_QDRD1_WATER_LEVEL"  Address="28" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_QDRD2_WATER_LEVEL"  Address="29" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_QDRD3_WATER_LEVEL"  Address="30" Scaling="0=3276.7,100=32767" DataType="short"/>
-				<AI Name="r_QDRD4_WATER_LEVEL"  Address="31" Scaling="0=3276.7,100=32767" DataType="short"/>
+				<AI Name="r_QDRD1_WATER_LEVEL"  Address="28" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_QDRD2_WATER_LEVEL"  Address="29" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_QDRD3_WATER_LEVEL"  Address="30" Scaling="0=0,100=32767" DataType="short"/>
+				<AI Name="r_QDRD4_WATER_LEVEL"  Address="31" Scaling="0=0,100=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="9">
 				<AI Name="AI32"  Address="32" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>

CyberX8_RT/Config/Layout/ToolLayoutConfiguration.xml

@@ -380,60 +380,38 @@
 		<Item i:type="Reservoir">
 			<Installed>true</Installed>
 			<ReservoirID>1</ReservoirID>
-			<Size>3</Size>
+			<Size>1</Size>
 			<TCID>TC1-1</TCID>
-			<SubType>Gen3ChemEXx</SubType>
+			<SubType>Stratus</SubType>
 			<PHProbeChannelNumber>1</PHProbeChannelNumber>
-			<PlannedInitialChemistry>Cu</PlannedInitialChemistry>
+			<PlannedInitialChemistry>Ni</PlannedInitialChemistry>
 			<MetalCells>
 				<Item i:type="Metal">
 					<Installed>true</Installed>
 					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>2</CellID>
-					<NominalGantryPositionInMilliMeters>3930</NominalGantryPositionInMilliMeters>
+					<CellID>7</CellID>
+					<NominalGantryPositionInMilliMeters>2219</NominalGantryPositionInMilliMeters>
 					<MetalID>1</MetalID>
 					<PlatingPowerSupplyAID>Power1-1</PlatingPowerSupplyAID>
 					<PlatingPowerSupplyBID>Power2-1</PlatingPowerSupplyBID>
 					<LinmotID>LNM1-1</LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>		
-				<Item i:type="Metal">
-					<Installed>true</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>3</CellID>
-					<NominalGantryPositionInMilliMeters>3772</NominalGantryPositionInMilliMeters>
-					<MetalID>2</MetalID>
-					<PlatingPowerSupplyAID>Power3-1</PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID>Power4-1</PlatingPowerSupplyBID>
-					<LinmotID>LNM1-2</LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>	
-				<Item i:type="Metal">
-					<Installed>true</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>4</CellID>
-					<NominalGantryPositionInMilliMeters>3607</NominalGantryPositionInMilliMeters>
-					<MetalID>3</MetalID>
-					<PlatingPowerSupplyAID>Power5-1</PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID>Power6-1</PlatingPowerSupplyBID>
-					<LinmotID>LNM1-3</LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>	
+					<SubType>Stratus</SubType>
+				</Item>
 			</MetalCells>
-			<CellPosition>2</CellPosition>
-			<PositionInMilliMeters>3410</PositionInMilliMeters>
-			<LengthInMilliMeters>610</LengthInMilliMeters>	  
+			<CellPosition>11</CellPosition>
+			<PositionInMilliMeters>2000</PositionInMilliMeters>
+			<LengthInMilliMeters>340</LengthInMilliMeters>
 			<ChemicalReplenishmentEnable>true</ChemicalReplenishmentEnable>
 			<DIReplenType>Level</DIReplenType>
 			<ANDIReplenType>Level</ANDIReplenType>
-			<PHProbeType>None</PHProbeType>
+			<PHProbeType>Standard</PHProbeType>
 			<CrossDoseType>None</CrossDoseType>
-			<ChemReplenType>RDS</ChemReplenType>
-			<ChemReplenPumps>0</ChemReplenPumps>
+			<ChemReplenType>Peristaltic</ChemReplenType>
+			<ChemReplenPumps>2</ChemReplenPumps>
 			<AutoDrainsInstalled>false</AutoDrainsInstalled>
-			<SlipstreamType>RDS</SlipstreamType>
-			<CMMType>None</CMMType>
-			<CMMSupplyID>None</CMMSupplyID>
+			<SlipstreamType>None</SlipstreamType>
+			<CMMType>Standard</CMMType>
+			<CMMSupplyID>CMMPower1-1</CMMSupplyID>
 			<EvaporatorType>STD</EvaporatorType>
 		</Item>
 
@@ -449,7 +427,7 @@
 		<Item i:type="Reservoir">
 			<Installed>true</Installed>
 			<ReservoirID>2</ReservoirID>
-			<Size>2</Size>
+			<Size>1</Size>
 			<TCID>TC1-2</TCID>
 			<SubType>Stratus</SubType>
 			<PHProbeChannelNumber>1</PHProbeChannelNumber>
@@ -458,27 +436,16 @@
 				<Item i:type="Metal">
 					<Installed>true</Installed>
 					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>7</CellID>
-					<NominalGantryPositionInMilliMeters>2219</NominalGantryPositionInMilliMeters>
-					<MetalID>4</MetalID>
-					<PlatingPowerSupplyAID>Power7-1</PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID>Power8-1</PlatingPowerSupplyBID>
-					<LinmotID>LNM1-4</LinmotID>
-					<SubType>Stratus</SubType>
-				</Item>
-				<Item i:type="Metal">
-					<Installed>true</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
 					<CellID>8</CellID>
-					<NominalGantryPositionInMilliMeters>2029</NominalGantryPositionInMilliMeters>
-					<MetalID>5</MetalID>
-					<PlatingPowerSupplyAID>Power9-1</PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID>Power10-1</PlatingPowerSupplyBID>
-					<LinmotID>LNM2-1</LinmotID>
+					<NominalGantryPositionInMilliMeters>2219</NominalGantryPositionInMilliMeters>
+					<MetalID>2</MetalID>
+					<PlatingPowerSupplyAID>Power3-1</PlatingPowerSupplyAID>
+					<PlatingPowerSupplyBID>Power4-1</PlatingPowerSupplyBID>
+					<LinmotID>LNM1-2</LinmotID>
 					<SubType>Stratus</SubType>
 				</Item>
 			</MetalCells>
-			<CellPosition>13</CellPosition>
+			<CellPosition>14</CellPosition>
 			<PositionInMilliMeters>2000</PositionInMilliMeters>
 			<LengthInMilliMeters>340</LengthInMilliMeters>	  
 			<ChemicalReplenishmentEnable>true</ChemicalReplenishmentEnable>
@@ -516,151 +483,79 @@
 		<Item i:type="Reservoir">
 			<Installed>true</Installed>
 			<ReservoirID>3</ReservoirID>
-			<Size>2</Size>
+			<Size>1</Size>
 			<TCID>TC1-3</TCID>
-			<SubType>Gen3ChemEXx</SubType>
-			<PHProbeChannelNumber>2</PHProbeChannelNumber>
-			<PlannedInitialChemistry>Cu</PlannedInitialChemistry>
+			<SubType>Stratus</SubType>
+			<PHProbeChannelNumber>1</PHProbeChannelNumber>
+			<PlannedInitialChemistry>Ni</PlannedInitialChemistry>
 			<MetalCells>
 				<Item i:type="Metal">
 					<Installed>true</Installed>
 					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>11</CellID>
-					<NominalGantryPositionInMilliMeters>3028</NominalGantryPositionInMilliMeters>
-					<MetalID>6</MetalID>
-					<PlatingPowerSupplyAID>Power11-1</PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID>Power12-1</PlatingPowerSupplyBID>
-					<LinmotID>LNM2-1</LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>		
-				<Item i:type="Metal">
-					<Installed>true</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>12</CellID>
-					<NominalGantryPositionInMilliMeters>2869</NominalGantryPositionInMilliMeters>
-					<MetalID>7</MetalID>
-					<PlatingPowerSupplyAID>Power13-1</PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID>Power14-1</PlatingPowerSupplyBID>
-					<LinmotID>LNM2-2</LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>	
+					<CellID>9</CellID>
+					<NominalGantryPositionInMilliMeters>2219</NominalGantryPositionInMilliMeters>
+					<MetalID>3</MetalID>
+					<PlatingPowerSupplyAID>Power5-1</PlatingPowerSupplyAID>
+					<PlatingPowerSupplyBID>Power6-1</PlatingPowerSupplyBID>
+					<LinmotID>LNM1-3</LinmotID>
+					<SubType>Stratus</SubType>
+				</Item>
 			</MetalCells>
-			<CellPosition>8</CellPosition>
-			<PositionInMilliMeters>2480</PositionInMilliMeters>
-			<LengthInMilliMeters>630</LengthInMilliMeters>	  
+			<CellPosition>15</CellPosition>
+			<PositionInMilliMeters>2000</PositionInMilliMeters>
+			<LengthInMilliMeters>340</LengthInMilliMeters>
 			<ChemicalReplenishmentEnable>true</ChemicalReplenishmentEnable>
 			<DIReplenType>Level</DIReplenType>
 			<ANDIReplenType>Level</ANDIReplenType>
-			<PHProbeType>None</PHProbeType>
-			<CrossDoseType>true</CrossDoseType>
-			<ChemReplenType>RDS</ChemReplenType>
-			<ChemReplenPumps>0</ChemReplenPumps>
+			<PHProbeType>Standard</PHProbeType>
+			<CrossDoseType>None</CrossDoseType>
+			<ChemReplenType>Peristaltic</ChemReplenType>
+			<ChemReplenPumps>2</ChemReplenPumps>
 			<AutoDrainsInstalled>false</AutoDrainsInstalled>
-			<SlipstreamType>RDS</SlipstreamType>
-			<CMMType>None</CMMType>
-			<CMMSupplyID>None</CMMSupplyID>
-			<EvaporatorType></EvaporatorType>
-		</Item>
-
-		<Item i:type="Rinse">
-			<Installed>true</Installed>
-			<CellID>14</CellID>
-			<NominalGantryPositionInMilliMeters>1866</NominalGantryPositionInMilliMeters>
-			<RinseID>5</RinseID>
-			<SubType>QDR</SubType>
-			<ResistivityID>RP2-1</ResistivityID>
-		</Item>
-		
-		<Item i:type="Rinse">
-			<Installed>false</Installed>
-			<CellID>19</CellID>
-			<NominalGantryPositionInMilliMeters>1244</NominalGantryPositionInMilliMeters>
-			<RinseID>6</RinseID>
-			<SubType>QDR</SubType>
-			<ResistivityID>RP2-2</ResistivityID>
+			<SlipstreamType>None</SlipstreamType>
+			<CMMType>Standard</CMMType>
+			<CMMSupplyID>CMMPower1-1</CMMSupplyID>
+			<EvaporatorType>STD</EvaporatorType>
 		</Item>
 
 		<Item i:type="Reservoir">
-			<Installed>false</Installed>
+			<Installed>true</Installed>
 			<ReservoirID>4</ReservoirID>
-			<Size>5</Size>
+			<Size>1</Size>
 			<TCID>TC1-4</TCID>
-			<SubType>Gen3ChemEXx</SubType>
-			<PHProbeChannelNumber>2</PHProbeChannelNumber>
-			<PlannedInitialChemistry>Cu</PlannedInitialChemistry>
+			<SubType>Stratus</SubType>
+			<PHProbeChannelNumber>1</PHProbeChannelNumber>
+			<PlannedInitialChemistry>Ni</PlannedInitialChemistry>
 			<MetalCells>
 				<Item i:type="Metal">
-					<Installed>false</Installed>
+					<Installed>true</Installed>
 					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
 					<CellID>10</CellID>
-					<NominalGantryPositionInMilliMeters>3028</NominalGantryPositionInMilliMeters>
-					<MetalID>8</MetalID>
-					<PlatingPowerSupplyAID></PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID></PlatingPowerSupplyBID>
-					<LinmotID></LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>
-				<Item i:type="Metal">
-					<Installed>false</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>11</CellID>
-					<NominalGantryPositionInMilliMeters>2869</NominalGantryPositionInMilliMeters>
-					<MetalID>9</MetalID>
-					<PlatingPowerSupplyAID></PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID></PlatingPowerSupplyBID>
-					<LinmotID></LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>
-				<Item i:type="Metal">
-					<Installed>false</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>12</CellID>
-					<NominalGantryPositionInMilliMeters>2869</NominalGantryPositionInMilliMeters>
-					<MetalID>10</MetalID>
-					<PlatingPowerSupplyAID></PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID></PlatingPowerSupplyBID>
-					<LinmotID></LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>
-				<Item i:type="Metal">
-					<Installed>false</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>13</CellID>
-					<NominalGantryPositionInMilliMeters>2869</NominalGantryPositionInMilliMeters>
-					<MetalID>11</MetalID>
-					<PlatingPowerSupplyAID></PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID></PlatingPowerSupplyBID>
-					<LinmotID></LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
-				</Item>
-				<Item i:type="Metal">
-					<Installed>false</Installed>
-					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
-					<CellID>14</CellID>
-					<NominalGantryPositionInMilliMeters>2869</NominalGantryPositionInMilliMeters>
-					<MetalID>12</MetalID>
-					<PlatingPowerSupplyAID></PlatingPowerSupplyAID>
-					<PlatingPowerSupplyBID></PlatingPowerSupplyBID>
-					<LinmotID></LinmotID>
-					<SubType>Gen3ChemEXx</SubType>
+					<NominalGantryPositionInMilliMeters>2219</NominalGantryPositionInMilliMeters>
+					<MetalID>4</MetalID>
+					<PlatingPowerSupplyAID>Power7-1</PlatingPowerSupplyAID>
+					<PlatingPowerSupplyBID>Power8-1</PlatingPowerSupplyBID>
+					<LinmotID>LNM1-4</LinmotID>
+					<SubType>Stratus</SubType>
 				</Item>
 			</MetalCells>
-			<CellPosition>8</CellPosition>
-			<PositionInMilliMeters>2480</PositionInMilliMeters>
-			<LengthInMilliMeters>630</LengthInMilliMeters>
+			<CellPosition>16</CellPosition>
+			<PositionInMilliMeters>2000</PositionInMilliMeters>
+			<LengthInMilliMeters>340</LengthInMilliMeters>
 			<ChemicalReplenishmentEnable>true</ChemicalReplenishmentEnable>
 			<DIReplenType>Level</DIReplenType>
 			<ANDIReplenType>Level</ANDIReplenType>
-			<PHProbeType>None</PHProbeType>
+			<PHProbeType>Standard</PHProbeType>
 			<CrossDoseType>None</CrossDoseType>
-			<ChemReplenType>RDS</ChemReplenType>
-			<ChemReplenPumps>0</ChemReplenPumps>
+			<ChemReplenType>Peristaltic</ChemReplenType>
+			<ChemReplenPumps>2</ChemReplenPumps>
 			<AutoDrainsInstalled>false</AutoDrainsInstalled>
-			<SlipstreamType>RDS</SlipstreamType>
-			<CMMType>None</CMMType>
-			<CMMSupplyID>None</CMMSupplyID>
+			<SlipstreamType>None</SlipstreamType>
+			<CMMType>Standard</CMMType>
+			<CMMSupplyID>CMMPower1-1</CMMSupplyID>
 			<EvaporatorType>STD</EvaporatorType>
 		</Item>
+
 		
 		<!-- PREWET -->
 
@@ -833,7 +728,7 @@
 		<!-- SRDs -->
 
 		<Item i:type="SRD">
-			<Installed>false</Installed>
+			<Installed>true</Installed>
 			<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
 			<ResourceID>SRD1</ResourceID>
 			<Type>SRD</Type>
@@ -841,7 +736,7 @@
 			<SubType>VacuumChuckWithFan</SubType>
 		</Item>
 		<Item i:type="SRD">
-			<Installed>false</Installed>
+			<Installed>true</Installed>
 			<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
 			<ResourceID>SRD2</ResourceID>
 			<Type>SRD</Type>

CyberX8_RT/Config/System.sccfg

@@ -9,7 +9,7 @@
 		<config default="" name="LSType" nameView="Lis Seal Type" description="Lip Seal类型" max="" min="" paramter="" tag="" unit="" type="String" visible="true"/>
 		<config default="200" name="WaferSize" nameView="Wafer Size" description="Wafer尺寸" max="300" min="0" paramter="" tag="" unit="" type="Integer" visible="true"/>
 		<config default="0.1" name="Increment" nameView="Increment" description="步进" max="100" min="0" paramter="" tag="" unit="" type="Double" visible="true"/>
-		<config default="True" name="IsSimulatorMode" nameView="Simulator Mode" description="仿真模式" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
+		<config default="true" name="IsSimulatorMode" nameView="Simulator Mode" description="仿真模式" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		<config default="true" name="DisplayPopDialogWhenJobComplete" nameView="Pop Dialog When Job Complete" description="是否弹出Job结束对话框" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		<config default="2" name="MaxInternalWaferCount" nameView="Max Internal wafer count" description="系统可允许进入的wafer数" max="8" min="1" paramter="" tag="" unit="" visible="true" type="Integer" />
 		<config default="00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000" name="COMLogFlag" description="Flag for print COM data log" max="" min="" paramter="" tag="" unit="" visible="false" type="String" />
@@ -429,24 +429,16 @@
 			<config default="16" name="DIValveMaxOnTime" nameView="DIValveMaxOnTime" description="DI Valve Max Time in period " max="50" min="0" paramter="" tag="" unit="minute" type="Double" />
 			<config default="5" name="DIValveMaxOnTimePerFill" nameView="DIValveMaxOnTimePerFill" description="DI Valve Max Time per fill " max="50" min="0" paramter="" tag="" unit="minute" type="Double" />
 			<config default="24" name="DIValveMaxOnTimePeriod" nameView="DIValveMaxOnTimePeriod" description="DI Valve Max Time in period " max="48" min="0" paramter="" tag="" unit="hour" type="Double" />
-			<config default="95" name="CAHighLevel" nameView="CAHighLevel" description="CA High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="0,0,1.5022,94.782" name="CALevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
-			<config default="0,0,0.4,2.6" name="ANLevelCurve" nameView="ANLevelCurve" description="AN Level Curve " max="" min="" paramter="" tag="" unit="" type="String" />
-			<config default="95" name="ANHighLevel" nameView="ANHighLevel" description="AN High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="5" name="ANLowLevel" nameView="ANLowLevel" description="AN Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="10" name="CALowLevel" nameView="CALowLevel" description="CA Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="5.0" name="CAMainFlowFaultLow" nameView="CAMainFlowFaultLow" description="CA Main Flow Fault Low" max="30" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="10000" name="FlowFaultHoldOffTime" nameView="FlowFaultHoldOffTime" description="CA Flow Fault Hold Off Time" max="50000" min="0" paramter="" tag="" unit="ms" type="Integer"></config>
-			<config default="3.0" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Low Limit" max="30" min="0" paramter="" tag="" unit="" type="Double"></config>			
-			<config default="1.0" name="ANFastLeakLevelTolerance" nameView="ANFastLeakLevelTolerance" description="AN FastLeakLevel Tolerance Volue" max="30" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="3" name="ANLeakOperatingUpdateTime" nameView="ANLeakOperatingUpdateTime" description="AN LeakOperating Update Time" max="30" min="0" paramter="" tag="" unit="min" type="Integer"></config>
-			<config default="1.0" name="MaxLeakVolume" nameView="MaxLeakVolume" description="MaxLeakVolume" max="5" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="0.3" name="MaxFlowDelta" nameView="MaxFlowDelta" description="MaxFlowDelta" max="5" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="0.2" name="ByPassMetalTotalFlowMinLimit" nameView="ByPassMetalTotalFlowMinLimit" description="Open CA Pump Safety detected used" max="5" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="3" name="CleraLeakVolumeTime" nameView="CleraLeakVolumeTime" description="Clera LeakVolume Time" max="30" min="0" paramter="" tag="" unit="min" type="Integer"></config>
-			<config default="1" name="ANBypassMinCellCount" nameView="ANBypassMinCellCount" description="AN Bypass Min Cell Count" max="5" min="1" paramter="" tag="" unit="" type="Integer"></config>			
-			<config default="100" name="CAMaxTankVolume" nameView="CAMaxTankVolume" description="CA Max Tank Volume" max="200" min="1" paramter="" tag="" unit="L" type="Integer"></config>
-			<config default="1000" name="DIValveMaxAccumulation" nameView="DIValveMaxAccumulation" description="DI Valve Max Accumulation" max="10000" min="1" paramter="" tag="" unit="mL" type="Integer"></config>
+			<config default="10000" name="DIReplenMaxAccumulation" nameView="DIReplenMaxAccumulation" description="DI Valve Max Time in period " max="20000" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<config default="95" name="HighLevel" nameView="HighLevel" description="High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="0,0,1.5022,94.782" name="LevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="260" name="MaxTankVolume" nameView="MaxTankVolume" description="Maximum Tank volume" max="300" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="3" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Limit" max="30" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="0.56" name="InitialDosingSpeed" nameView="InitialDosingSpeed" description="Initial Dosing Speed" max="0.672" min="0" paramter="" tag="" unit="mL/min" type="Double" />
+			<config default="0.14" name="MinDoseAmount" nameView="MinDoseAmount" description="Minimum Dose Amount" max="200" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<config default="1" name="BottleReserveVolume1" nameView="BottleReserveVolume1" description="Bottle Reserve Volume of Replen1" max="5000" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<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" />
 		</configs>
 		<configs name="Reservoir2" nameView="Reservoir2">
 			<config default="16" name="DIValveMaxOnTime" nameView="DIValveMaxOnTime" description="DI Valve Max Time in period " max="50" min="0" paramter="" tag="" unit="minute" type="Double" />
@@ -467,29 +459,31 @@
 			<config default="16" name="DIValveMaxOnTime" nameView="DIValveMaxOnTime" description="DI Valve Max Time in period " max="50" min="0" paramter="" tag="" unit="minute" type="Double" />
 			<config default="5" name="DIValveMaxOnTimePerFill" nameView="DIValveMaxOnTimePerFill" description="DI Valve Max Time per fill " max="50" min="0" paramter="" tag="" unit="minute" type="Double" />
 			<config default="24" name="DIValveMaxOnTimePeriod" nameView="DIValveMaxOnTimePeriod" description="DI Valve Max Time in period " max="48" min="0" paramter="" tag="" unit="hour" type="Double" />
-			<config default="95" name="CAHighLevel" nameView="CAHighLevel" description="CA High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="0,0,1.5022,94.782" name="CALevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
-			<config default="0,0,0.4,2.6" name="ANLevelCurve" nameView="ANLevelCurve" description="AN Level Curve " max="" min="" paramter="" tag="" unit="" type="String" />
-			<config default="95" name="ANHighLevel" nameView="ANHighLevel" description="AN High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="5" name="ANLowLevel" nameView="ANLowLevel" description="AN Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="10" name="CALowLevel" nameView="CALowLevel" description="CA Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
-			<config default="5.0" name="CAMainFlowFaultLow" nameView="CAMainFlowFaultLow" description="CA Main Flow Fault Low" max="30" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="10000" name="FlowFaultHoldOffTime" nameView="FlowFaultHoldOffTime" description="CA Flow Fault Hold Off Time" max="50000" min="0" paramter="" tag="" unit="ms" type="Integer"></config>
-			<config default="3.0" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Low Limit" max="30" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="1.0" name="ANFastLeakLevelTolerance" nameView="ANFastLeakLevelTolerance" description="AN FastLeakLevel Tolerance Volue" max="30" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="1" name="ANLeakOperatingUpdateTime" nameView="ANLeakOperatingUpdateTime" description="AN LeakOperating Update Time" max="5" min="0" paramter="" tag="" unit="min" type="Integer"></config>
-			<config default="1.0" name="MaxLeakVolume" nameView="MaxLeakVolume" description="MaxLeakVolume" max="5" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="3" name="CleraLeakVolumeTime" nameView="CleraLeakVolumeTime" description="Clera LeakVolume Time" max="30" min="0" paramter="" tag="" unit="min" type="Integer"></config>
-			<config default="1" name="ANBypassMinCellCount" nameView="ANBypassMinCellCount" description="AN Bypass Min Cell Count" max="5" min="1" paramter="" tag="" unit="" type="Integer"></config>
-			<config default="0.3" name="MaxFlowDelta" nameView="MaxFlowDelta" description="MaxFlowDelta" max="5" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="0.2" name="ByPassMetalTotalFlowMinLimit" nameView="ByPassMetalTotalFlowMinLimit" description="Open CA Pump Safety detected used" max="5" min="0" paramter="" tag="" unit="" type="Double"></config>
-			<config default="2000" name="ANTransferPumpAcceleration" nameView="ANTransferPumpAcceleration" description="ANTransferPump Acceleration" max="5000" min="0" paramter="" tag="" unit="ms" type="Integer"></config>
-			<config default="2000" name="ANTransferPumpDeceleration" nameView="ANTransferPumpDeceleration" description="ANTransferPump Deceleration" max="5000" min="0" paramter="" tag="" unit="ms" type="Integer"></config>
-			<config default="5000" name="ANTransferPumpSpeed" nameView="ANTransferPumpSpeed" description="ANTransferPump Speed" max="5000" min="100" paramter="" tag="" unit="count" type="Integer"></config>
-			<config default="0" name="FlowRateMin" nameView="FlowRateMin" description="Minimum Flow Rate of Cross Dose" max="50" min="0" paramter="" tag="" unit="mL/min" type="Double"></config>
-			<config default="10000" name="StartUpHoldOffTime" nameView="StartUpHoldOffTime" description="Start Up Hold Off Time" max="50000" min="0" paramter="" tag="" unit="ms" type="Integer"></config>
-			<config default="100" name="CAMaxTankVolume" nameView="CAMaxTankVolume" description="CA Max Tank Volume" max="200" min="1" paramter="" tag="" unit="L" type="Integer"></config>
-			<config default="1000" name="DIValveMaxAccumulation" nameView="DIValveMaxAccumulation" description="DI Valve Max Accumulation" max="10000" min="1" paramter="" tag="" unit="mL" type="Integer"></config>
+			<config default="10000" name="DIReplenMaxAccumulation" nameView="DIReplenMaxAccumulation" description="DI Valve Max Time in period " max="20000" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<config default="95" name="HighLevel" nameView="HighLevel" description="High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="0,0,1.5022,94.782" name="LevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="260" name="MaxTankVolume" nameView="MaxTankVolume" description="Maximum Tank volume" max="300" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="3" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Limit" max="30" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="0.56" name="InitialDosingSpeed" nameView="InitialDosingSpeed" description="Initial Dosing Speed" max="0.672" min="0" paramter="" tag="" unit="mL/min" type="Double" />
+			<config default="0.14" name="MinDoseAmount" nameView="MinDoseAmount" description="Minimum Dose Amount" max="200" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<config default="1" name="BottleReserveVolume1" nameView="BottleReserveVolume1" description="Bottle Reserve Volume of Replen1" max="5000" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<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" />
+		</configs>
+		<configs name="Reservoir4" nameView="Reservoir4">
+			<config default="16" name="DIValveMaxOnTime" nameView="DIValveMaxOnTime" description="DI Valve Max Time in period " max="50" min="0" paramter="" tag="" unit="minute" type="Double" />
+			<config default="5" name="DIValveMaxOnTimePerFill" nameView="DIValveMaxOnTimePerFill" description="DI Valve Max Time per fill " max="50" min="0" paramter="" tag="" unit="minute" type="Double" />
+			<config default="24" name="DIValveMaxOnTimePeriod" nameView="DIValveMaxOnTimePeriod" description="DI Valve Max Time in period " max="48" min="0" paramter="" tag="" unit="hour" type="Double" />
+			<config default="10000" name="DIReplenMaxAccumulation" nameView="DIReplenMaxAccumulation" description="DI Valve Max Time in period " max="20000" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<config default="95" name="HighLevel" nameView="HighLevel" description="High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="0,0,1.5022,94.782" name="LevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
+			<config default="260" name="MaxTankVolume" nameView="MaxTankVolume" description="Maximum Tank volume" max="300" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="3" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Limit" max="30" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="0.56" name="InitialDosingSpeed" nameView="InitialDosingSpeed" description="Initial Dosing Speed" max="0.672" min="0" paramter="" tag="" unit="mL/min" type="Double" />
+			<config default="0.14" name="MinDoseAmount" nameView="MinDoseAmount" description="Minimum Dose Amount" max="200" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<config default="1" name="BottleReserveVolume1" nameView="BottleReserveVolume1" description="Bottle Reserve Volume of Replen1" max="5000" min="0" paramter="" tag="" unit="mL" type="Double" />
+			<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" />
 		</configs>
 	</configs>
 	<configs name="Linmot" nameView="Linmot">

CyberX8_UI/Config/UIMenu.json

@@ -64,8 +64,9 @@
 								"Id": "Reservoir1",
 								"ModuleName": "Reservoir1",
 								"Name": "Reservoir1",
+								"IsInit": "true",
 								"IsShow": "true",
-								"View": "ReservoirsView"
+								"View": "StandardHotReservoirsView"
 							},
 							{
 								"Id": "PMCounter1",
@@ -74,22 +75,6 @@
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "PMCounterView"
-							},
-							{
-								"Id": "Catholyte1",
-								"ModuleName": "Reservoir1",
-								"Name": "Res1CA",
-								"IsInit": "true",
-								"IsShow": "false",
-								"View": "ReservoirsCatholyteView"
-							},
-							{
-								"Id": "Anolyte1",
-								"ModuleName": "Reservoir1",
-								"Name": "Res1AN",
-								"IsInit": "true",
-								"IsShow": "false",
-								"View": "ReservoirsAnolyteView"
 							}
 						]
 					},
@@ -114,14 +99,6 @@
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "PMCounterView"
-							},
-							{
-								"Id": "DosingSystem1",
-								"ModuleName": "Reservoir2",
-								"Name": "DosingSystem1",
-								"IsInit": "true",
-								"IsShow": "true",
-								"View": "DosingSystemView"
 							}
 						]
 					},
@@ -137,7 +114,7 @@
 								"Name": "Reservoir3",
 								"IsInit": "true",
 								"IsShow": "true",
-								"View": "ReservoirsView"
+								"View": "StandardHotReservoirsView"
 							},
 							{
 								"Id": "PMCounter3",
@@ -146,22 +123,30 @@
 								"IsInit": "true",
 								"IsShow": "true",
 								"View": "PMCounterView"
-							},
+							}
+						]
+					},
+					{
+						"Id": "Reservoir4",
+						"ModuleName": "Reservoir4",
+						"Name": "Reservoir4",
+						"IsShow": "true",
+						"MultiItem": [
 							{
-								"Id": "Catholyte3",
-								"ModuleName": "Reservoir3",
-								"Name": "Res3CA",
+								"Id": "Reservoir4",
+								"ModuleName": "Reservoir4",
+								"Name": "Reservoir4",
 								"IsInit": "true",
 								"IsShow": "true",
-								"View": "ReservoirsCatholyteView"
+								"View": "StandardHotReservoirsView"
 							},
 							{
-								"Id": "Anolyte3",
-								"ModuleName": "Reservoir3",
-								"Name": "Res3AN",
+								"Id": "PMCounter4",
+								"ModuleName": "Reservoir4",
+								"Name": "Res4PMCt",
 								"IsInit": "true",
 								"IsShow": "true",
-								"View": "ReservoirsAnolyteView"
+								"View": "PMCounterView"
 							}
 						]
 					}
@@ -328,33 +313,33 @@
 						"View": "PowerSupplierView"
 					},
 					{
-						"Id": "MetalCellPowerSupplier05",
-						"ModuleName": "Metal5",
-						"Name": "Metal5",
+						"Id": "ReservoirCmmPowerSupplier01",
+						"ModuleName": "Reservoir1",
+						"Name": "Reservoir1",
 						"IsInit": "true",
 						"IsShow": "true",
-						"View": "PowerSupplierView"
+						"View": "CMMPowerSupplierView"
 					},
 					{
-						"Id": "MetalCellPowerSupplier06",
-						"ModuleName": "Metal6",
-						"Name": "Metal6",
+						"Id": "ReservoirCmmPowerSupplier02",
+						"ModuleName": "Reservoir2",
+						"Name": "Reservoir2",
 						"IsInit": "true",
 						"IsShow": "true",
-						"View": "PowerSupplierView"
+						"View": "CMMPowerSupplierView"
 					},
 					{
-						"Id": "MetalCellPowerSupplier07",
-						"ModuleName": "Metal7",
-						"Name": "Metal7",
+						"Id": "ReservoirCmmPowerSupplier03",
+						"ModuleName": "Reservoir3",
+						"Name": "Reservoir3",
 						"IsInit": "true",
 						"IsShow": "true",
-						"View": "PowerSupplierView"
+						"View": "CMMPowerSupplierView"
 					},
 					{
-						"Id": "ReservoirCmmPowerSupplier02",
-						"ModuleName": "Reservoir2",
-						"Name": "Reservoir2",
+						"Id": "ReservoirCmmPowerSupplier04",
+						"ModuleName": "Reservoir4",
+						"Name": "Reservoir4",
 						"IsInit": "true",
 						"IsShow": "true",
 						"View": "CMMPowerSupplierView"
@@ -470,28 +455,12 @@
 						"View": "PrewetHomePageView"
 					},
 					{
-						"Id": "Rinse5",
-						"ModuleName": "Rinse5",
-						"Name": "Rinse5",
-						"IsInit": "true",
-						"IsShow": "true",
-						"View": "RinseHomePageView"
-					},
-					{
-						"Id": "Metal7",
-						"ModuleName": "Metal7",
-						"Name": "Metal7",
-						"IsInit": "true",
-						"IsShow": "true",
-						"View": "MetalCMHomePageView"
-					},
-					{
-						"Id": "Metal6",
-						"ModuleName": "Metal6",
-						"Name": "Metal6",
+						"Id": "Metal4",
+						"ModuleName": "Metal4",
+						"Name": "Metal4",
 						"IsInit": "true",
 						"IsShow": "true",
-						"View": "MetalCMHomePageView"
+						"View": "MetalSHHomePageView"
 					},
 					{
 						"Id": "Rinse4",
@@ -502,25 +471,25 @@
 						"View": "RinseHomePageView"
 					},
 					{
-						"Id": "Rinse3",
-						"ModuleName": "Rinse3",
-						"Name": "Rinse3",
+						"Id": "Metal3",
+						"ModuleName": "Metal3",
+						"Name": "Metal3",
 						"IsInit": "true",
 						"IsShow": "true",
-						"View": "RinseHomePageView"
+						"View": "MetalSHHomePageView"
 					},
 					{
-						"Id": "Metal5",
-						"ModuleName": "Metal5",
-						"Name": "Metal5",
+						"Id": "Rinse3",
+						"ModuleName": "Rinse3",
+						"Name": "Rinse3",
 						"IsInit": "true",
 						"IsShow": "true",
-						"View": "MetalSHHomePageView"
+						"View": "RinseHomePageView"
 					},
 					{
-						"Id": "Metal4",
-						"ModuleName": "Metal4",
-						"Name": "Metal4",
+						"Id": "Metal2",
+						"ModuleName": "Metal2",
+						"Name": "Metal2",
 						"IsInit": "true",
 						"IsShow": "true",
 						"View": "MetalSHHomePageView"
@@ -534,28 +503,12 @@
 						"View": "RinseHomePageView"
 					},
 					{
-						"Id": "Metal3",
-						"ModuleName": "Metal3",
-						"Name": "Metal3",
-						"IsInit": "true",
-						"IsShow": "true",
-						"View": "MetalCMHomePageView"
-					},
-					{
-						"Id": "Metal2",
-						"ModuleName": "Metal2",
-						"Name": "Metal2",
-						"IsInit": "true",
-						"IsShow": "true",
-						"View": "MetalCMHomePageView"
-					},
-					{
 						"Id": "Metal1",
 						"ModuleName": "Metal1",
 						"Name": "Metal1",
 						"IsInit": "true",
 						"IsShow": "true",
-						"View": "MetalCMHomePageView"
+						"View": "MetalSHHomePageView"
 					},
 					{
 						"Id": "Rinse1",
@@ -573,13 +526,6 @@
 				"IsShow": "true",
 				"IsInit": "true",
 				"View": "SystemFacilitiesView"
-			},
-			{
-				"Id": "SystemSafety",
-				"Name": "Safety",
-				"IsShow": "true",
-				"IsInit": "true",
-				"View": "SystemSafetyView"
 			}
 		]
 	},

CyberX8_UI/Config/UIMenu_permission.json

@@ -49,14 +49,6 @@
 									{
 										"MenuName": "Res1PMCt",
 										"Permission": 2
-									},
-									{
-										"MenuName": "Res1CA",
-										"Permission": 2
-									},
-									{
-										"MenuName": "Res1AN",
-										"Permission": 2
 									}
 								]
 							},
@@ -70,10 +62,6 @@
 									{
 										"MenuName": "Res2PMCt",
 										"Permission": 2
-									},
-									{										
-										"MenuName": "DosingSystem1",
-										"Permission": 2
 									}
 								]
 							},
@@ -87,13 +75,18 @@
 									{
 										"MenuName": "Res3PMCt",
 										"Permission": 2
-									},
+									}
+								]
+							},
+							{
+								"MenuName": "Reservoir4",
+								"Menus": [
 									{
-										"MenuName": "Res3CA",
+										"MenuName": "Reservoir4",
 										"Permission": 2
 									},
 									{
-										"MenuName": "Res3AN",
+										"MenuName": "Res4PMCt",
 										"Permission": 2
 									}
 								]
@@ -197,19 +190,19 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
+								"MenuName": "Reservoir1",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal6",
+								"MenuName": "Reservoir2",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal7",
+								"MenuName": "Reservoir3",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Reservoir2",
+								"MenuName": "Reservoir4",
 								"Permission": 2
 							}
 						]
@@ -273,18 +266,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Rinse5",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal7",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal6",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Rinse4",
 								"Permission": 2
 							},
@@ -293,10 +274,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Metal4",
 								"Permission": 2
 							},
@@ -325,10 +302,6 @@
 					{
 						"MenuName": "Facilities",
 						"Permission": 2
-					},
-					{
-						"MenuName": "Safety",
-						"Permission": 2
 					}
 				]
 			},
@@ -485,14 +458,6 @@
 									{
 										"MenuName": "Res1PMCt",
 										"Permission": 2
-									},
-									{
-										"MenuName": "Res1CA",
-										"Permission": 2
-									},
-									{
-										"MenuName": "Res1AN",
-										"Permission": 2
 									}
 								]
 							},
@@ -506,10 +471,6 @@
 									{
 										"MenuName": "Res2PMCt",
 										"Permission": 2
-									},
-									{										
-										"MenuName": "DosingSystem1",
-										"Permission": 2
 									}
 								]
 							},
@@ -523,17 +484,23 @@
 									{
 										"MenuName": "Res3PMCt",
 										"Permission": 2
-									},
+									}
+								]
+							},
+							{
+								"MenuName": "Reservoir4",
+								"Menus": [
 									{
-										"MenuName": "Res3CA",
+										"MenuName": "Reservoir4",
 										"Permission": 2
 									},
 									{
-										"MenuName": "Res3AN",
+										"MenuName": "Res4PMCt",
 										"Permission": 2
 									}
 								]
 							}
+
 						]
 					},
 					{
@@ -633,19 +600,19 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
+								"MenuName": "Reservoir1",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal6",
+								"MenuName": "Reservoir2",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal7",
+								"MenuName": "Reservoir3",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Reservoir2",
+								"MenuName": "Reservoir4",
 								"Permission": 2
 							}
 						]
@@ -709,18 +676,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Rinse5",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal7",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal6",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Rinse4",
 								"Permission": 2
 							},
@@ -729,10 +684,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Metal4",
 								"Permission": 2
 							},
@@ -917,14 +868,6 @@
 									{
 										"MenuName": "Res1PMCt",
 										"Permission": 2
-									},
-									{
-										"MenuName": "Res1CA",
-										"Permission": 2
-									},
-									{
-										"MenuName": "Res1AN",
-										"Permission": 2
 									}
 								]
 							},
@@ -938,10 +881,6 @@
 									{
 										"MenuName": "Res2PMCt",
 										"Permission": 2
-									},
-									{										
-										"MenuName": "DosingSystem1",
-										"Permission": 2
 									}
 								]
 							},
@@ -955,13 +894,18 @@
 									{
 										"MenuName": "Res3PMCt",
 										"Permission": 2
-									},
+									}
+								]
+							},
+							{
+								"MenuName": "Reservoir4",
+								"Menus": [
 									{
-										"MenuName": "Res3CA",
+										"MenuName": "Reservoir4",
 										"Permission": 2
 									},
 									{
-										"MenuName": "Res3AN",
+										"MenuName": "Res4PMCt",
 										"Permission": 2
 									}
 								]
@@ -1065,19 +1009,19 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
+								"MenuName": "Reservoir1",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal6",
+								"MenuName": "Reservoir2",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal7",
+								"MenuName": "Reservoir3",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Reservoir2",
+								"MenuName": "Reservoir4",
 								"Permission": 2
 							}
 						]
@@ -1141,18 +1085,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Rinse5",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal7",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal6",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Rinse4",
 								"Permission": 2
 							},
@@ -1161,10 +1093,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Metal4",
 								"Permission": 2
 							},
@@ -1193,10 +1121,6 @@
 					{
 						"MenuName": "Facilities",
 						"Permission": 2
-					},
-					{
-						"MenuName": "Safety",
-						"Permission": 2
 					}
 				]
 			},
@@ -1349,14 +1273,6 @@
 									{
 										"MenuName": "Res1PMCt",
 										"Permission": 2
-									},
-									{
-										"MenuName": "Res1CA",
-										"Permission": 2
-									},
-									{
-										"MenuName": "Res1AN",
-										"Permission": 2
 									}
 								]
 							},
@@ -1370,10 +1286,6 @@
 									{
 										"MenuName": "Res2PMCt",
 										"Permission": 2
-									},
-									{										
-										"MenuName": "DosingSystem1",
-										"Permission": 2
 									}
 								]
 							},
@@ -1387,13 +1299,18 @@
 									{
 										"MenuName": "Res3PMCt",
 										"Permission": 2
-									},
+									}
+								]
+							},
+							{
+								"MenuName": "Reservoir4",
+								"Menus": [
 									{
-										"MenuName": "Res3CA",
+										"MenuName": "Reservoir4",
 										"Permission": 2
 									},
 									{
-										"MenuName": "Res3AN",
+										"MenuName": "Res4PMCt",
 										"Permission": 2
 									}
 								]
@@ -1497,19 +1414,19 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
+								"MenuName": "Reservoir1",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal6",
+								"MenuName": "Reservoir2",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal7",
+								"MenuName": "Reservoir3",
 								"Permission": 2
 							},
 							{
-								"MenuName": "Reservoir2",
+								"MenuName": "Reservoir4",
 								"Permission": 2
 							}
 						]
@@ -1573,18 +1490,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Rinse5",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal7",
-								"Permission": 2
-							},
-							{
-								"MenuName": "Metal6",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Rinse4",
 								"Permission": 2
 							},
@@ -1593,10 +1498,6 @@
 								"Permission": 2
 							},
 							{
-								"MenuName": "Metal5",
-								"Permission": 2
-							},
-							{
 								"MenuName": "Metal4",
 								"Permission": 2
 							},
@@ -1625,10 +1526,6 @@
 					{
 						"MenuName": "Facilities",
 						"Permission": 2
-					},
-					{
-						"MenuName": "Safety",
-						"Permission": 2
 					}
 				]
 			},