整理TM界面，添加泵配置

Modules/SicModules/Config/TM/DeviceModelSystem.xml

@@ -91,6 +91,7 @@
   </IoSensors>
   <IoPumps classType="SicModules.Devices.IoPump" assembly="SicModules">
     <IoPump id="TMPump1" module="TM" display="Pump1" schematicId="TMPump1" unit="" diRunning="DI_TMDryPump1Running" diAlarm="DI_TMDryPump1Alarm" diWarning="DI_TMDryPump1Warning" />
+    <IoPump id="TMPump2" module="TM" display="Pump2" schematicId="TMPump2" unit="" diRunning="DI_TMDryPump2Running" diAlarm="DI_TMDryPump2Alarm" diWarning="DI_TMDryPump2Warning"/>
   </IoPumps>
   <IoValves classType="Aitex.Core.RT.Device.Devices.IoValve" assembly="MECF.Framework.RT.EquipmentLibrary">
     <IoValve id="LoadSlowPump" module="TM" display="V84" schematicId="LoadSlowPump" unit="" isNc="true" isDefaultOpen="false" diOpen="DI_LoadSlowPumpFB" doOpen="DO_LoadSlowPump" />

Modules/SicModules/Config/TM/IODefinePlatform.xml

@@ -56,6 +56,9 @@
 			<DI_ITEM Index="73" Name="DI_UnloadStationWaferCYOpened" BufferOffset="73" Addr="73" Description="" Visible="false"/>
 			<DI_ITEM Index="74" Name="DI_UnloadStationLifterCYUp" BufferOffset="74" Addr="74" Description="" Visible="false"/>
 			<DI_ITEM Index="75" Name="DI_UnloadStationLifterCYDown" BufferOffset="75" Addr="75" Description="" Visible="false"/>
+      <DI_ITEM Index="78" Name="DI_TMDryPump2Alarm" BufferOffset="78" Addr="78" Description="" />
+      <DI_ITEM Index="79" Name="DI_TMDryPump2Warning" BufferOffset="79" Addr="79" Description="" />
+      <DI_ITEM Index="86" Name="DI_TMDryPump2Running" BufferOffset="86" Addr="86" Description="" />
 			<DI_ITEM Index="88" Name="DI_TMPressure1ATM" BufferOffset="88" Addr="88" Description="" />
 			<DI_ITEM Index="89" Name="DI_TMPressure1VAC" BufferOffset="89" Addr="89" Description="" />
 			<DI_ITEM Index="90" Name="DI_LoadPressureATM" BufferOffset="90" Addr="90" Description="" />

SicSimulator/Config/IODefinePlatform.xml

@@ -56,6 +56,9 @@
 		  <DI_ITEM Index="73" Name="DI_UnloadStationWaferCYOpened" BufferOffset="73" Addr="73" Description="" Visible="false"/>
 		  <DI_ITEM Index="74" Name="DI_UnloadStationLifterCYUp" BufferOffset="74" Addr="74" Description="" Visible="false"/>
 		  <DI_ITEM Index="75" Name="DI_UnloadStationLifterCYDown" BufferOffset="75" Addr="75" Description="" Visible="false"/>
+      <DI_ITEM Index="78" Name="DI_TMDryPump2Alarm" BufferOffset="78" Addr="78" Description="" />
+      <DI_ITEM Index="79" Name="DI_TMDryPump2Warning" BufferOffset="79" Addr="79" Description="" />
+      <DI_ITEM Index="86" Name="DI_TMDryPump2Running" BufferOffset="86" Addr="86" Description="" />
 		  <DI_ITEM Index="88" Name="DI_TMPressure1ATM" BufferOffset="88" Addr="88" Description="" />
 		  <DI_ITEM Index="89" Name="DI_TMPressure1VAC" BufferOffset="89" Addr="89" Description="" />
 		  <DI_ITEM Index="90" Name="DI_LoadPressureATM" BufferOffset="90" Addr="90" Description="" />

SicUI/Controls/Mainframe/M2C4EFEMView3.xaml

@@ -76,48 +76,7 @@
                         </TransformGroup>
                     </unitControls:Door.RenderTransform>
                 </unitControls:Door>
-                <!--  Tray和晶圆  -->
-                <Canvas Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}">
-                    <Image
-                        Canvas.Left="248"
-                        Canvas.Top="182"
-                        Width="80"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        Source="Images/pm52.png"
-                        Visibility="{Binding PM1HaveTray}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="262"
-                        Canvas.Top="192"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM1EnableWaferClick}"
-                        IsRotary="{Binding IsPm1WaferRotary}"
-                        WaferData="{Binding PM1Wafer}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="292"
-                        Canvas.Top="202"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM1EnableWaferClick}"
-                        IsRotary="{Binding IsPm1WaferRotary}"
-                        WaferData="{Binding PM1Wafer}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="266"
-                        Canvas.Top="224"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM1EnableWaferClick}"
-                        IsRotary="{Binding IsPm1WaferRotary}"
-                        WaferData="{Binding PM1Wafer}" />
               
-                </Canvas>
             </Canvas>
             <Canvas Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}">
                 <TextBlock
@@ -164,47 +123,7 @@
                     </unitControls:Door.RenderTransform>
                 </unitControls:Door>
                 <!--  Tray和晶圆  -->
-                <Canvas Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}">
-                    <Image
-                        Canvas.Left="431"
-                        Canvas.Top="185"
-                        Width="80"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Source="Images/pm52.png"
-                        Visibility="{Binding PM2HaveTray}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="444"
-                        Canvas.Top="195"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        IsEnabled="{Binding PM2EnableWaferClick}"
-                        IsRotary="{Binding IsPm2WaferRotary}"
-                        WaferData="{Binding PM2Wafer}" />
               
-                    <controls:WaferCtrl
-                        Canvas.Left="475"
-                        Canvas.Top="205"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM2EnableWaferClick}"
-                        IsRotary="{Binding IsPm2WaferRotary}"
-                        WaferData="{Binding PM2Wafer}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="449"
-                        Canvas.Top="227"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM2EnableWaferClick}"
-                        IsRotary="{Binding IsPm2WaferRotary}"
-                        WaferData="{Binding PM2Wafer}" />
-                </Canvas>
             </Canvas>
 
             <Canvas Visibility="{Binding IsLoadLockInstalled, Converter={StaticResource BoolVisibilityConverter}}">
@@ -314,7 +233,7 @@
                     Visibility="{Binding PM1HaveTray}" />
                 <controls:WaferCtrl
                     Canvas.Left="258"
-                    Canvas.Top="191"
+                    Canvas.Top="192"
                     Width="60"
                     Height="60"
                     IsEnabled="{Binding PM1EnableWaferClick}"
@@ -330,8 +249,8 @@
                     Source="Images/pm52.png"
                     Visibility="{Binding PM2HaveTray}" />
                 <controls:WaferCtrl
-                    Canvas.Left="442"
+                    Canvas.Left="441"
-                    Canvas.Top="195"
+                    Canvas.Top="196"
                     Width="60"
                     Height="60"
                     IsEnabled="{Binding PM2EnableWaferClick}"
@@ -350,7 +269,7 @@
                     Source="Images/pm52.png"
                     Visibility="{Binding LoadLockHaveTray}" />
                 <controls:WaferCtrl
-                    Canvas.Left="464"
+                    Canvas.Left="460"
                     Canvas.Top="446"
                     Width="60"
                     Height="60"

SicUI/Models/Operations/Overviews/OverViewView.xaml

@@ -89,7 +89,7 @@
                 Canvas.Left="250"
                 Canvas.Top="-80"
                 Width="600"
-                Height="600" />
+                Height="620" />
 
             <StackPanel Canvas.Left="456" Canvas.Top="637">
                 <Grid>