Преглед на файлове

1 revise lp wafersize io,add wafersize releated
2 add robot pick/place cartoon in lp

chenzk преди 2 седмици
родител
ревизия
301233e909

+ 6 - 0
PunkHPX8_MainPages/Views/OperationOverNewView.xaml

@@ -75,6 +75,12 @@
                                         Srd2Wafer="{Binding Srd2Wafer}" HorizontalAlignment="Left" VerticalAlignment="Top" RenderTransformOrigin="0.476,0.525"></userControls:CellChamber>
         </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}}"
+      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}}"
+                 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}}">
                 <Border BorderBrush="Gray" BorderThickness="1" Width="310" Height="480">
                     <StackPanel Orientation="Horizontal" >

+ 1 - 1
PunkHPX8_RT/Config/Devices/Beckhoffcfg - plctask.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BeckhoffCfg>
-	<Controller Name="MASTER" IPAddress="192.168.0.200.1.1" PortAddress="851">
+	<Controller Name="MASTER" IPAddress="10.4.6.75.1.1" PortAddress="851">
 
 		<!-- Need to have at least one input and one output before Axis stuff -->
 

+ 4 - 4
PunkHPX8_RT/Config/Devices/ModuleIOCfg.xml

@@ -6,14 +6,14 @@
 		<IO Name="EFEM.DoorLocked" IOName="r_Door_Locked"/>
 	</Module>
 	<Module Name="LP1">
-		<IO Name="LP1.Cassete200Present" IOName="r_Cassette_A_100MM"/>
+		<IO Name="LP1.Cassete100Present" IOName="r_Cassette_A_100MM"/>
 		<IO Name="LP1.Cassete150Present" IOName="r_Cassette_A_Present"/>
-		<IO Name="LP1.Cassete100Present" IOName="r_Cassette_A_200MM"/>
+		<IO Name="LP1.Cassete200Present" IOName="r_Cassette_A_200MM"/>
 	</Module>
 	<Module Name="LP2">
-		<IO Name="LP2.Cassete200Present" IOName="r_Cassette_B_100MM"/>
+		<IO Name="LP2.Cassete100Present" IOName="r_Cassette_B_100MM"/>
 		<IO Name="LP2.Cassete150Present" IOName="r_Cassette_B_Present"/>
-		<IO Name="LP2.Cassete100Present" IOName="r_Cassette_B_200MM"/>
+		<IO Name="LP2.Cassete200Present" IOName="r_Cassette_B_200MM"/>
 	</Module>
 	<Module Name="LightTower">
 		<IO Name="LightTower.Buzzer" IOName="c_System_Alarm"/>

+ 16 - 5
PunkHPX8_Themes/Themes/Generic.xaml

@@ -1336,14 +1336,20 @@
                                     <VisualTransition To="LP1">
                                         <Storyboard FillBehavior="HoldEnd">
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRotateAct" Storyboard.TargetProperty="Angle">
-                                                <LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.5"/>
+                                                <LinearDoubleKeyFrame Value="30" KeyTime="0:0:0.5"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRightLeftAct" Storyboard.TargetProperty="X">
+                                                <LinearDoubleKeyFrame Value="-50" KeyTime="0:0:0.5"/>
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualTransition>
                                     <VisualTransition To="LP2">
                                         <Storyboard FillBehavior="HoldEnd">
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRotateAct" Storyboard.TargetProperty="Angle">
-                                                <LinearDoubleKeyFrame Value="0" KeyTime="0:0:0.5"/>
+                                                <LinearDoubleKeyFrame Value="-10" KeyTime="0:0:0.5"/>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRightLeftAct" Storyboard.TargetProperty="X">
+                                                <LinearDoubleKeyFrame Value="-30" KeyTime="0:0:0.5"/>
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualTransition>
@@ -1475,16 +1481,21 @@
                                 <VisualState Name="LP1">
                                     <Storyboard FillBehavior="HoldEnd">
                                         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRotateAct" Storyboard.TargetProperty="Angle">
-                                            <LinearDoubleKeyFrame Value="0" KeyTime="0:0:0"/>
+                                            <LinearDoubleKeyFrame Value="30" KeyTime="0:0:0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRightLeftAct" Storyboard.TargetProperty="X">
+                                            <LinearDoubleKeyFrame Value="-50" KeyTime="0:0:0"/>
                                         </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState Name="LP2">
                                     <Storyboard FillBehavior="HoldEnd">
                                         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRotateAct" Storyboard.TargetProperty="Angle">
-                                            <LinearDoubleKeyFrame Value="0" KeyTime="0:0:0"/>
+                                            <LinearDoubleKeyFrame Value="-10" KeyTime="0:0:0"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="robotRightLeftAct" Storyboard.TargetProperty="X">
+                                            <LinearDoubleKeyFrame Value="-30" KeyTime="0:0:0"/>
                                         </DoubleAnimationUsingKeyFrames>
-                                        
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState Name="Aligner1">