Przeglądaj źródła

update cassete place io

chenkui 2 tygodni temu
rodzic
commit
c48d398268

+ 2 - 2
PunkHPX8_MainPages/Views/OperationOverNewView.xaml

@@ -77,8 +77,8 @@
                                 </TextBlock.Text>
                             </TextBlock>
 
-                            <StackPanel Orientation="Horizontal" IsEnabled="{Binding IsLP1HasNoJob}" Visibility="{Binding RtDataValues[LP1.CassettePlaced],Converter={StaticResource boolToVisibility2}}">
-                                <customControls:PathButton Content="Map"   HorizontalAlignment="Center" Margin="25,5,0,5" Width="75" Height="30" Command="{Binding MapCommand}"   CommandParameter="LP1"   IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}"/>
+                            <StackPanel VerticalAlignment="Bottom" Orientation="Horizontal" IsEnabled="{Binding IsLP1HasNoJob}" Visibility="{Binding RtDataValues[LP1.CassettePlaced],Converter={StaticResource boolToVisibility2}}">
+                                <customControls:PathButton Content="Map"  HorizontalAlignment="Center" Margin="25,5,0,5" Width="75" Height="30" Command="{Binding MapCommand}"   CommandParameter="LP1"   IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}"/>
 
                             </StackPanel>
 

+ 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="10.4.6.75.1.1" PortAddress="851">
+	<Controller Name="MASTER" IPAddress="192.168.0.200.1.1" PortAddress="851">
 
 		<!-- Need to have at least one input and one output before Axis stuff -->
 

+ 6 - 19
PunkHPX8_RT/Config/Devices/ModuleIOCfg.xml

@@ -6,19 +6,14 @@
 		<IO Name="EFEM.DoorLocked" IOName="r_Door_Locked"/>
 	</Module>
 	<Module Name="LP1">
-		<IO Name="LP1.Cassete200Present" IOName="r_Cassette_1_200"/>
-		<IO Name="LP1.Cassete150Present" IOName="r_Cassette_1_150"/>
-		<IO Name="LP1.Cassete100Present" IOName="r_Cassette_1_100"/>
+		<IO Name="LP1.Cassete200Present" IOName="r_Cassette_A_100MM"/>
+		<IO Name="LP1.Cassete150Present" IOName="r_Cassette_A_Present"/>
+		<IO Name="LP1.Cassete100Present" IOName="r_Cassette_A_200MM"/>
 	</Module>
 	<Module Name="LP2">
-		<IO Name="LP2.Cassete200Present" IOName="r_Cassette_2_200"/>
-		<IO Name="LP2.Cassete150Present" IOName="r_Cassette_2_150"/>
-		<IO Name="LP2.Cassete100Present" IOName="r_Cassette_2_100"/>
-	</Module>
-	<Module Name="LP3">
-		<IO Name="LP3.Cassete200Present" IOName="r_Cassette_3_200"/>
-		<IO Name="LP3.Cassete150Present" IOName="r_Cassette_3_150"/>
-		<IO Name="LP3.Cassete100Present" IOName="r_Cassette_3_100"/>
+		<IO Name="LP2.Cassete200Present" IOName="r_Cassette_B_100MM"/>
+		<IO Name="LP2.Cassete150Present" IOName="r_Cassette_B_Present"/>
+		<IO Name="LP2.Cassete100Present" IOName="r_Cassette_B_200MM"/>
 	</Module>
 	<Module Name="LightTower">
 		<IO Name="LightTower.Buzzer" IOName="c_System_Alarm"/>
@@ -37,14 +32,6 @@
 		<IO Name="Facilities.FFULoaderPressure" IOName="r_FFUPressureLoader"/>
 		<IO Name="Facilities.FFUProcessPressure" IOName="r_FFUPressureProcess"/>
 		<IO Name="Facilities.ArsFluidDetect" IOName="r_SLIPSTREAM_FLUID_PRESENT"/>
-		
-	
-		<IO Name="Facilities.CassetteAPlaced" IOName="r_Cassette_A_Present"/>
-		<IO Name="Facilities.CassetteA100M" IOName="r_Cassette_A_100MM"/>
-		<IO Name="Facilities.CassetteA200M" IOName="r_Cassette_A_200MM"/>
-		<IO Name="Facilities.CassetteBPlaced" IOName="r_Cassette_B_Present"/>
-		<IO Name="Facilities.CassetteB100M" IOName="r_Cassette_B_100MM"/>
-		<IO Name="Facilities.CassetteB200M" IOName="r_Cassette_B_200MM"/>
 		<IO Name="Facilities.PH3" IOName="r_pH3"/>
 		<IO Name="Facilities.DiwReturnFlow" IOName="r_DIWRETURN_FLOW"/>
 		<IO Name="Facilities.HouseChilledWaterFlow" IOName="r_HCW_FLOW"/>