revise efem/operation view

PunkHPX8_MainPages/ViewModels/SRDMotionViewModel.cs

@@ -153,10 +153,10 @@ namespace PunkHPX8_MainPages.ViewModels
                     CommandMotionData tmp1 = CommonFunction.GetValue<CommandMotionData>(_rtDataValueDic, $"{SRD1RotaionModuleName}.{MOTION_DATA}");
                     if(tmp1 != null)
                     {
-                        tmp1.ActualVelocity = Math.Round(tmp1.ActualVelocity / 6, 2);  //除6是 deg/s--->rpm 单位的转换
-                        tmp1.ProfileVelocity = Math.Round(tmp1.ProfileVelocity / 6, 2);
-                        tmp1.HomingVelocity = Math.Round(tmp1.HomingVelocity / 6, 2);
-                        tmp1.HomingVelocitySlow = Math.Round(tmp1.HomingVelocitySlow / 6, 2);
+                        tmp1.ActualVelocity = Math.Round(tmp1.ActualVelocity , 2);  
+                        tmp1.ProfileVelocity = Math.Round(tmp1.ProfileVelocity , 2);
+                        tmp1.HomingVelocity = Math.Round(tmp1.HomingVelocity , 2);
+                        tmp1.HomingVelocitySlow = Math.Round(tmp1.HomingVelocitySlow, 2);
                         tmp1.ProfileDecel = tmp1.ProfileDecel;
                         tmp1.ProfileAccel = tmp1.ProfileAccel;
                     }                    
@@ -164,10 +164,10 @@ namespace PunkHPX8_MainPages.ViewModels
                     CommandMotionData tmp2 = CommonFunction.GetValue<CommandMotionData>(_rtDataValueDic, $"{SRD2RotaionModuleName}.{MOTION_DATA}");
                     if (tmp2 != null)
                     {
-                        tmp2.ActualVelocity = Math.Round(tmp2.ActualVelocity / 6, 2);
-                        tmp2.ProfileVelocity = Math.Round(tmp2.ProfileVelocity / 6, 2);
-                        tmp2.HomingVelocity = Math.Round(tmp2.HomingVelocity / 6, 2);
-                        tmp2.HomingVelocitySlow = Math.Round(tmp2.HomingVelocitySlow / 6, 2);
+                        tmp2.ActualVelocity = Math.Round(tmp2.ActualVelocity, 2);
+                        tmp2.ProfileVelocity = Math.Round(tmp2.ProfileVelocity, 2);
+                        tmp2.HomingVelocity = Math.Round(tmp2.HomingVelocity, 2);
+                        tmp2.HomingVelocitySlow = Math.Round(tmp2.HomingVelocitySlow, 2);
                         tmp2.ProfileDecel = tmp2.ProfileDecel;
                         tmp2.ProfileAccel = tmp2.ProfileAccel;
                     }

PunkHPX8_MainPages/Views/EfemView.xaml

@@ -68,14 +68,14 @@
         </StackPanel>
         <userControls:SRDFrontView UnitData1="{Binding Srd2ModuleInfo}" UnitData2="{Binding Srd1ModuleInfo}" Title="SRD"  Canvas.Top="67" Canvas.Left="1040" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
-        <userControls:RobotFrontView UnitData="{Binding EFEMModuleInfo}" Canvas.Left="1222" Canvas.Top="99" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        <userControls:RobotFrontView UnitData="{Binding EFEMModuleInfo}" Canvas.Left="1222" Canvas.Top="79" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
         <Canvas Canvas.Top="-150">
-            <TextBlock Canvas.Top="450" Canvas.Left="390" Text="{Binding RtDataValues[LP1.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP1.CassettePlaced], Converter={StaticResource BoolToVisibility2}}"
+            <TextBlock Canvas.Top="500" Canvas.Left="90" Text="{Binding RtDataValues[LP1.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP1.CassettePlaced], Converter={StaticResource BoolToVisibility2}}"
                        HorizontalAlignment="Center" Margin="0,5,0,0" FontSize="16">
             </TextBlock>
-            
-            <TextBlock Canvas.Top="650" Canvas.Left="390" Text="{Binding RtDataValues[LP2.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP2.CassettePlaced], Converter={StaticResource BoolToVisibility2}}"
+
+            <TextBlock Canvas.Top="650" Canvas.Left="90" Text="{Binding RtDataValues[LP2.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP2.CassettePlaced], Converter={StaticResource BoolToVisibility2}}"
                        HorizontalAlignment="Center" Margin="0,5,0,0" FontSize="16">
             </TextBlock>
             <userControls:CellChamber x:Name="efem1" Width="924" Height="733" Canvas.Left="58" Canvas.Top="150" 
@@ -263,15 +263,13 @@
 
         </StackPanel>
 
-        <StackPanel Orientation="Horizontal" Canvas.Bottom="10" Canvas.Left="100">
-            <Grid  Width="470" Visibility="{Binding IsLP1Installed, Converter={StaticResource bool2VisibilityConverter}}" IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}">
+        <StackPanel Orientation="Horizontal" Canvas.Bottom="150" Canvas.Left="100">
+            <Grid  Width="470" Height="120" Visibility="{Binding IsLP1Installed, Converter={StaticResource bool2VisibilityConverter}}" IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
@@ -315,60 +313,14 @@
                     </StackPanel>
                 </Border>
 
-                <!--<Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="3" Padding="5,1,0,1">
-                    <TextBlock Text="Carrier ID" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1" Padding="5,1">
-                    <TextBlock Text="{Binding RtDataValues[LP1.CarrierId]}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="2" Padding="5,1">
-                    <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" >
-                        <Button IsEnabled="{Binding RtDataValues[LP1.CassettePlaced]}" Content="ReadID" Width="80" Height="25" Margin="10,0" Command="{Binding LPReadIDCommand}" CommandParameter="LP1"/>
-                        <Button IsEnabled="{Binding RtDataValues[LP1.CassettePlaced]}" Content="WriteID " Width="80" Height="25" Margin="10,0" Command="{Binding LP1WriteIDCommand}" CommandParameter="LP1"/>
-                        <TextBox IsEnabled="{Binding RtDataValues[LP1.CassettePlaced]}" Text="{Binding SetLP1IDValue, Mode=TwoWay}" Width="80" Height="25" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  FontSize="15"/>
-                    </StackPanel>
-                </Border>-->
-
-
-
 
                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="3" Padding="5,1,0,1">
-                    <TextBlock Text="Is Clamped" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1" Padding="5,1,0,1">
-                    <!--<deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsLP1Clamped}"></deviceControl:AITSensor>-->
-                    <TextBlock Text="{Binding RtDataValues[LP1.IsClamped]}" TextAlignment="Center"/>
-
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="2" Padding="5,1">
-                    <StackPanel   Orientation="Horizontal">
-                        <!--<Button IsEnabled="{Binding IsLP1ClampEnable}" Margin="10,0"  Content="Clamp" Width="80" Height="25" Command="{Binding LPClampCommand}" CommandParameter="LP1"/>-->
-                        <!--<Button IsEnabled="{Binding IsLP1UnclampEnable}" Margin="10,0" Content="Unclamp" Width="80" Height="25" Command="{Binding LPUnClampCommand}" CommandParameter="LP1"/>-->
-                    </StackPanel>
-                </Border>
-
-
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="4" Padding="5,1,0,1">
-                    <TextBlock Text="Is Docked" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="1" Padding="5,1,0,1">
-                    <!--<deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsLP1Docked}"></deviceControl:AITSensor>-->
-                    <TextBlock Text="{Binding RtDataValues[LP1.IsDocked]}" TextAlignment="Center"/>
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="2" Padding="5,1">
-                    <StackPanel Orientation="Horizontal">
-                    </StackPanel>
-                </Border>
-
-
-
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="5" Padding="5,1,0,1">
                     <TextBlock Text="Is Door Open" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
                 </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="5" Grid.Column="1" Padding="5,1,0,1">
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1" Padding="5,1,0,1">
                     <TextBlock Text="{Binding RtDataValues[LP1.IsDoorOpened]}" TextAlignment="Center"/>
                 </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="5" Grid.Column="2" Padding="5,1">
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="2" Padding="5,1">
                     <StackPanel Orientation="Horizontal">
 
                     </StackPanel>
@@ -383,9 +335,6 @@
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
@@ -429,67 +378,13 @@
                     </StackPanel>
                 </Border>
 
-                <!--<Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="3" Padding="5,1,0,1">
-                    <TextBlock Text="Carrier ID" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1" Padding="5,1">
-                    <TextBlock Text="{Binding RtDataValues[LP2.CarrierId]}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="2" Padding="5,1">
-                    <StackPanel  Orientation="Horizontal" HorizontalAlignment="Left" >
-                        <Button IsEnabled="{Binding RtDataValues[LP2.CassettePlaced]}" Content="ReadID" Width="80" Height="25" Margin="10,0" Command="{Binding LPReadIDCommand}" CommandParameter="LP2"/>
-                        <Button IsEnabled="{Binding RtDataValues[LP2.CassettePlaced]}" Content="WriteID " Width="80" Height="25" Margin="10,0" Command="{Binding LP2WriteIDCommand}" CommandParameter="LP2"/>
-                        <TextBox IsEnabled="{Binding RtDataValues[LP2.CassettePlaced]}" Text="{Binding SetLP2IDValue, Mode=TwoWay}" Width="80" Height="25" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  FontSize="15"/>
-                    </StackPanel>
-                </Border>-->
-
-
-
-
                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="3" Padding="5,1,0,1">
-                    <TextBlock Text="Is Clamped" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1" Padding="5,1,0,1">
-                    <!--<deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsLP1Clamped}"></deviceControl:AITSensor>-->
-                    <TextBlock Text="{Binding RtDataValues[LP2.IsClamped]}" TextAlignment="Center"/>
-
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="2" Padding="5,1">
-                    <StackPanel   Orientation="Horizontal"  >
-                        <!--<Button IsEnabled="{Binding IsLP1ClampEnable}" Margin="10,0"  Content="Clamp" Width="80" Height="25" Command="{Binding LPClampCommand}" CommandParameter="LP2"/>
-                        <Button IsEnabled="{Binding IsLP1UnclampEnable}" Margin="10,0" Content="Unclamp" Width="80" Height="25" Command="{Binding LPUnClampCommand}" CommandParameter="LP2"/>-->
-                    </StackPanel>
-                </Border>
-
-
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="4" Padding="5,1,0,1">
-                    <TextBlock Text="Is Docked" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="1" Padding="5,1,0,1">
-                    <!--<deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsLP1Docked}"></deviceControl:AITSensor>-->
-                    <TextBlock Text="{Binding RtDataValues[LP2.IsDocked]}" TextAlignment="Center"/>
-
-                </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="2" Padding="5,1">
-                    <StackPanel Orientation="Horizontal">
-                        <!--<Button IsEnabled="{Binding IsLP1DockEnable}" Margin="10,0"  Content="Dock" Width="80" Height="25" Command="{Binding LPDockCommand}" CommandParameter="LP2">
-
-                        </Button>
-                        <Button IsEnabled="{Binding IsLP1UndockEnable}" Margin="10,0" Content="Undock" Width="80" Height="25" Command="{Binding LPUnDockCommand}" CommandParameter="LP2">
-
-                        </Button>-->
-                    </StackPanel>
-                </Border>
-
-
-
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="5" Padding="5,1,0,1">
                     <TextBlock Text="Is Door Open" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
                 </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="5" Grid.Column="1" Padding="5,1,0,1">
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="1" Padding="5,1,0,1">
                     <TextBlock Text="{Binding RtDataValues[LP2.IsDoorOpened]}" TextAlignment="Center"/>
                 </Border>
-                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="5" Grid.Column="2" Padding="5,1">
+                <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="3" Grid.Column="2" Padding="5,1">
                     <StackPanel Orientation="Horizontal">
                         <!--<TextBox IsEnabled="{Binding RtDataValues[LP2.CassettePlaced]}" Margin="10,0" Text="{Binding SetLP2CycleValue, Mode=TwoWay}" Width="80" Height="25" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"  FontSize="15"/>
                         <Button IsEnabled="{Binding RtDataValues[LP2.CassettePlaced]}" Content="Cycle Load/Unload " Width="150" Height="25" Margin="10,0" Command="{Binding LP2CycleCommand}" CommandParameter="LP2"/>-->

PunkHPX8_MainPages/Views/OperationOverNewView.xaml

@@ -76,13 +76,13 @@
                     Srd2Wafer="{Binding Srd2Wafer}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
         </Canvas>
         <Canvas Canvas.Left="160" Canvas.Top="-165">
-            <TextBlock Canvas.Top="530" Canvas.Left="-60" Text="{Binding RtDataValues[LP1.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP2.CassettePlaced], Converter={StaticResource boolToVisibility2}}"
+            <TextBlock Canvas.Top="620" Canvas.Left="-100" Text="{Binding RtDataValues[LP1.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP2.CassettePlaced], Converter={StaticResource boolToVisibility2}}"
       HorizontalAlignment="Center" Margin="0,5,0,0" FontSize="16">
             </TextBlock>
-            <TextBlock Canvas.Top="700" Canvas.Left="-60" Text="{Binding RtDataValues[LP2.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP2.CassettePlaced], Converter={StaticResource boolToVisibility2}}"
+            <TextBlock Canvas.Top="760" Canvas.Left="-100" Text="{Binding RtDataValues[LP2.WaferSize], StringFormat=({0})}" Visibility="{Binding RtDataValues[LP2.CassettePlaced], Converter={StaticResource boolToVisibility2}}"
                  HorizontalAlignment="Center" Margin="0,5,0,0" FontSize="16">
             </TextBlock>
-            <TabPanel  Canvas.Left="1170"  Canvas.Top="140" Visibility="{Binding ElementName=CarrierRadioButton,Path=IsChecked,Converter={StaticResource boolToVisibility2}}">
+            <TabPanel  Canvas.Left="1170"  Canvas.Top="180" Visibility="{Binding ElementName=CarrierRadioButton,Path=IsChecked,Converter={StaticResource boolToVisibility2}}">
                 <Border BorderBrush="Gray" BorderThickness="1" Width="310" Height="480">
                     <StackPanel Orientation="Horizontal" >
                         <StackPanel>
@@ -135,7 +135,7 @@
             </TabPanel>
         </Canvas>
         <Canvas Canvas.Left="160" Canvas.Top="335">
-            <TabPanel  Canvas.Left="1170"  Canvas.Top="140" Visibility="{Binding ElementName=CarrierRadioButton,Path=IsChecked,Converter={StaticResource boolToVisibility2}}">
+            <TabPanel  Canvas.Left="1170"  Canvas.Top="170" Visibility="{Binding ElementName=CarrierRadioButton,Path=IsChecked,Converter={StaticResource boolToVisibility2}}">
                 <Border BorderBrush="Gray" BorderThickness="1" Width="310" Height="280">
                     <StackPanel Orientation="Horizontal" >
                         <StackPanel >

PunkHPX8_MainPages/Views/PlatingCellHomePageView.xaml

@@ -233,11 +233,6 @@
                                      
             />
 
-
-
-
-
-
         </Grid>
     </Canvas>
 </UserControl>

PunkHPX8_RT/Config/Devices/AxisProviderCfg.xml

@@ -4,12 +4,8 @@
     <Driver>Beckhoff</Driver>
     <!-- <Driver>Sim</Driver> -->
     <Units>deg</Units>
-	<!-- 5294 X 4 counts/rev * 1/360 rev/deg = 58.822222 counts/deg -->
     <ScaleFactor>91</ScaleFactor>
     <JogLimit>1000000</JogLimit>
-    <!--Units>rev</Units-->
-	<!-- 5294 X 4 counts/rev = 21176 counts/rev -->
-    <!--ScaleFactor>21176</ScaleFactor-->
 	<MinMoveTime>0.5</MinMoveTime>
 	<MotorPositionRate>1</MotorPositionRate>
 	<VelocityRate>64</VelocityRate>
@@ -20,7 +16,7 @@
     <Units>deg</Units>
 	<!-- 5294 X 4 counts/rev * 1/360 rev/deg = 58.822222 counts/deg -->
     <ScaleFactor>91</ScaleFactor>
-    <JogLimit>5</JogLimit>
+    <JogLimit>1000000</JogLimit>
     <!--Units>rev</Units-->
 	<!-- 5294 X 4 counts/rev = 21176 counts/rev -->
     <!--ScaleFactor>21176</ScaleFactor-->

PunkHPX8_Themes/UserControls/RobotFrontView.xaml

@@ -13,22 +13,11 @@
 
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
-            <RowDefinition />
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Canvas x:Name="canvas"  PreviewDrop="Canvas_Drop" AllowDrop="True" Background="Transparent" Grid.RowSpan="2"/>
 
-        <TextBlock Text="{Binding ElementName=self,Path=Title1}" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" VerticalAlignment="Center" HorizontalAlignment="Center">
-            <TextBlock.Style>
-                <Style>
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding ShowTitle1,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="False">
-                            <Setter Property="TextBlock.Visibility" Value="Collapsed" />
-                        </DataTrigger>
-                    </Style.Triggers>
-                </Style>
-            </TextBlock.Style>
-        </TextBlock>
-        <Border Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource FOUP_OuterBD}" Background="{DynamicResource FOUP_OuterBG}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150"  CornerRadius="4" Height="35">
+        <Border Grid.Row="0" BorderThickness="1" BorderBrush="{DynamicResource FOUP_OuterBD}" Background="{DynamicResource FOUP_OuterBG}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150"  CornerRadius="4" Height="35">
             <Grid Height="33">
                 <Rectangle Fill="{DynamicResource FOUP_InnerBG}" Margin="3,3,3,3" RadiusX="2" RadiusY="2"/>
 
@@ -40,7 +29,7 @@
                         <ColumnDefinition Width="47"/>
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="Robot" FontFamily="Arial" FontSize="12" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,5,5,0"/>
+                    <TextBlock Text="RobotA" FontFamily="Arial" FontSize="12" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,5,0,0"/>
                     <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="0,5,5,0">
                         <ctrl:Slot ViewType="Front" AllowDrop="True" Cursor="Hand" DataContext="{Binding UnitData.WaferManager.Wafers[0], ElementName=self}" WaferStatus="{Binding WaferStatus}" SlotID="{Binding SlotID}" ModuleID="{Binding ModuleID}" SourceName="{Binding SourceName}" SlotMouseButtonDown="Slot_SlotMouseButtonDown" WaferTransferStarted="Slot_WaferTransferStarted"/>
                     </StackPanel>
@@ -49,5 +38,26 @@
             </Grid>
         </Border>
 
+        <Border Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource FOUP_OuterBD}" Background="{DynamicResource FOUP_OuterBG}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150"  CornerRadius="4" Height="35">
+            <Grid Height="33">
+                <Rectangle Fill="{DynamicResource FOUP_InnerBG}" Margin="3,3,3,3" RadiusX="2" RadiusY="2"/>
+
+                <Grid Margin="0,5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="30"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="47"/>
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="RobotB" FontFamily="Arial" FontSize="12" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,5,0,0"/>
+                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="0,5,5,0">
+                        <ctrl:Slot ViewType="Front" AllowDrop="True" Cursor="Hand" DataContext="{Binding UnitData.WaferManager.Wafers[1], ElementName=self}" WaferStatus="{Binding WaferStatus}" SlotID="{Binding SlotID}" ModuleID="{Binding ModuleID}" SourceName="{Binding SourceName}" SlotMouseButtonDown="Slot_SlotMouseButtonDown" WaferTransferStarted="Slot_WaferTransferStarted"/>
+                    </StackPanel>
+
+                </Grid>
+            </Grid>
+        </Border>
+
     </Grid>
 </UserControl>

PunkHPX8_Themes/UserControls/SRDMotionControl.xaml

@@ -103,7 +103,7 @@
                                          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 Text="deg/s" Grid.Row="0" Grid.Column="3" TextAlignment="Center"  VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
                         
                     </TextBlock>
 
@@ -137,7 +137,7 @@
                                          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" Text="deg/s"  Grid.Column="3" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
                     </TextBlock>
 
                     <Label Grid.Row="4" Grid.Column="0" Content="Home Speed Index" FontSize="16" FontWeight="Bold"/>
@@ -146,7 +146,7 @@
                                          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" Text="deg/s"  Grid.Column="3" Margin="2,0,2,0" TextAlignment="Center" VerticalAlignment="Center"  Background="Black" Foreground="Lime" FontSize="16" FontWeight="Bold">
                     </TextBlock>
 
                     <Label Grid.Row="5" Grid.Column="0" Content="Home Accel" FontSize="16" FontWeight="Bold"/>