update vpw motion view

PunkHPX8_RT/Config/Layout/ToolLayoutConfiguration.xml

@@ -154,6 +154,55 @@
 				</Item>
 			</Cells>
 		</Item>
+
+		<Item i:type="Reservoir">
+			<Installed>true</Installed>
+			<ReservoirID>1</ReservoirID>
+			<Size>2</Size>
+			<TCID>TC1-1</TCID>
+			<SubType>Stratus</SubType>
+			<PHProbeChannelNumber>1</PHProbeChannelNumber>
+			<PlannedInitialChemistry>Ni</PlannedInitialChemistry>
+			<MetalCells>
+				<Item i:type="Metal">
+					<Installed>true</Installed>
+					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
+					<CellID>10</CellID>
+					<NominalGantryPositionInMilliMeters>2219</NominalGantryPositionInMilliMeters>
+					<MetalID>7</MetalID>
+					<PlatingPowerSupplyAID>Power13-1</PlatingPowerSupplyAID>
+					<PlatingPowerSupplyBID>Power14-1</PlatingPowerSupplyBID>
+					<LinmotID>LNM3-2</LinmotID>
+					<SubType>Stratus</SubType>
+				</Item>
+				<Item i:type="Metal">
+					<Installed>true</Installed>
+					<PermittedWaferSizeInMM>300</PermittedWaferSizeInMM>
+					<CellID>11</CellID>
+					<NominalGantryPositionInMilliMeters>2029</NominalGantryPositionInMilliMeters>
+					<MetalID>8</MetalID>
+					<PlatingPowerSupplyAID>Power15-1</PlatingPowerSupplyAID>
+					<PlatingPowerSupplyBID>Power16-1</PlatingPowerSupplyBID>
+					<LinmotID>LNM3-3</LinmotID>
+					<SubType>Stratus</SubType>
+				</Item>
+			</MetalCells>
+			<CellPosition>13</CellPosition>
+			<PositionInMilliMeters>2000</PositionInMilliMeters>
+			<LengthInMilliMeters>340</LengthInMilliMeters>
+			<ChemicalReplenishmentEnable>true</ChemicalReplenishmentEnable>
+			<DIReplenType>Level</DIReplenType>
+			<ANDIReplenType>Level</ANDIReplenType>
+			<PHProbeType>Standard</PHProbeType>
+			<CrossDoseType>None</CrossDoseType>
+			<ChemReplenType>Peristaltic</ChemReplenType>
+			<ChemReplenPumps>2</ChemReplenPumps>
+			<AutoDrainsInstalled>false</AutoDrainsInstalled>
+			<SlipstreamType>None</SlipstreamType>
+			<CMMType>Standard</CMMType>
+			<CMMSupplyID>CMMPower1-1</CMMSupplyID>
+			<EvaporatorType></EvaporatorType>
+		</Item>
 		<!-- SRDs -->
 
 		<Item i:type="SRD">

PunkHPX8_RT/Devices/DeviceManager.cs

@@ -20,14 +20,12 @@ using PunkHPX8_RT.Devices.SRD;
 using PunkHPX8_RT.Devices.Temperature;
 using PunkHPX8_RT.Devices.VpwCell;
 using PunkHPX8_RT.Devices.VpwMain;
-using SecsGem.Core.ItemModel;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Threading;
 using System.Windows.Media.Imaging;
-using static Mono.Security.X509.X520;
 
 namespace PunkHPX8_RT.Instances
 {
@@ -127,6 +125,13 @@ namespace PunkHPX8_RT.Instances
             AddCustomDevice(vpwDeviceTimer);
         }
         /// <summary>
+        /// 初始化Reservoir
+        /// </summary>
+        private void InitializeReservoir()
+        {
+
+        }
+        /// <summary>
         /// 初始化LinMotAxis
         /// </summary>
         private void InitLinMotAxis()

PunkHPX8_RT/PunkHPX8_RT.csproj

@@ -233,6 +233,10 @@
     <Compile Include="Devices\PowerSupplier\PowerSupplierStepRoutine.cs" />
     <Compile Include="Devices\Dose\CrossDoseHelper.cs" />
     <Compile Include="Devices\Dose\DosingSystemHelper.cs" />
+    <Compile Include="Devices\Reservoir\DIReservoirDevice.cs" />
+    <Compile Include="Devices\Reservoir\DMReservoirDevice.cs" />
+    <Compile Include="Devices\Reservoir\HSReservoirDevice.cs" />
+    <Compile Include="Devices\Reservoir\ReservoirDevice.cs" />
     <Compile Include="Devices\Safety\SafetyNewAllOnRoutine.cs" />
     <Compile Include="Devices\Safety\SafetyAllOnRoutine.cs" />
     <Compile Include="Devices\Safety\SafetyArmResetRoutine.cs" />

PunkHPX8_Themes/UserControls/VPWMotionControl.xaml

@@ -103,8 +103,10 @@
                                      KeyOperation="{Binding ElementName=self,Path=KeyDownCommand}"/>
                     <TextBlock Grid.Column="2" Margin="0,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  
                        Text="{Binding ElementName=self,Path=MotionData.ProfileVelocity,StringFormat=\{0:F2\}}" Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold"/>
-                    <TextBlock Text="rpm" Grid.Row="0" Grid.Column="3" TextAlignment="Center"  VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
-
+                    <TextBlock Grid.Row="0" Grid.Column="3" TextAlignment="Center"  VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
+                        <TextBlock.Text>
+                            <Binding ElementName="self" Path="ModuleUnit" StringFormat=" {0}/sec" />
+                        </TextBlock.Text>
                     </TextBlock>
 
                     <Label Grid.Row="1" Grid.Column="0" Content="Acceleration" FontSize="16" FontWeight="Bold"/>
@@ -137,7 +139,10 @@
                                      KeyOperation="{Binding ElementName=self,Path=KeyDownCommand}"/>
                     <TextBlock Grid.Row="3" Grid.Column="2" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center" 
                        Text="{Binding MotionData.HomingVelocity, ElementName=self, StringFormat=\{0:F2\}}" Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold"/>
-                    <TextBlock Grid.Row="3" Text="rpm"  Grid.Column="3" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
+                    <TextBlock Grid.Row="3"  Grid.Column="3" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
+                        <TextBlock.Text>
+                            <Binding ElementName="self" Path="ModuleUnit" StringFormat=" {0}/sec" />
+                        </TextBlock.Text>
                     </TextBlock>
 
                     <Label Grid.Row="4" Grid.Column="0" Content="Home Speed Index" FontSize="16" FontWeight="Bold"/>
@@ -146,7 +151,10 @@
                                      KeyOperation="{Binding ElementName=self,Path=KeyDownCommand}"/>
                     <TextBlock Grid.Row="4" Grid.Column="2" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  
                        Text="{Binding MotionData.HomingVelocitySlow, ElementName=self, StringFormat=\{0:F2\}}" Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold"/>
-                    <TextBlock Grid.Row="4" Text="rpm"  Grid.Column="3" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
+                    <TextBlock Grid.Row="4" Grid.Column="3" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
+                        <TextBlock.Text>
+                            <Binding ElementName="self" Path="ModuleUnit" StringFormat=" {0}/sec" />
+                        </TextBlock.Text>
                     </TextBlock>
 
                     <Label Grid.Row="5" Grid.Column="0" Content="Home Accel" FontSize="16" FontWeight="Bold"/>